-
Notifications
You must be signed in to change notification settings - Fork 3
feat: improve Docker e2e test framework and implement sequencer switching in the test #315
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jonastheis
wants to merge
31
commits into
main
Choose a base branch
from
feat/improve-docker-e2e-test
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+468
−98
Open
Changes from all commits
Commits
Show all changes
31 commits
Select commit
Hold shift + click to select a range
290202b
feat: add CLAUDE.md file
jonastheis d6a3109
fix: use correct function to recover signer
yiweichi 13a8c89
Merge remote-tracking branch 'origin/fix-persist-signature-recover-si…
jonastheis 49d5606
Merge remote-tracking branch 'origin/main' into feat/improve-docker-e…
jonastheis 30d3079
enable gossip to all on l2geth nodes and make gaslimit the same as RN…
jonastheis eef09ed
do not statically connect peers, disable discovery and make block tim…
jonastheis feaee36
dump logs before cleanup and provide convenience functions for nodes …
jonastheis 8bbc5e2
fix: use sig_encode_hash to calculate block hash
yiweichi 2df3745
Revert "fix: use sig_encode_hash to calculate block hash"
yiweichi 31fbefb
fix: use sig_encode_hash to calculate block hash
yiweichi 20a00d1
fix: ci
yiweichi a15e0dd
rename value
yiweichi 7dbfc26
Merge branch 'main' into fix-persist-signature-recover-signer
yiweichi c1b7c34
Merge remote-tracking branch 'origin/fix-persist-signature-recover-si…
jonastheis 0db5561
fix using wrong hash when computing signature and loading signature f…
jonastheis 31b23cb
add caching to Dockerfile.test to speed up consecutive builds
jonastheis d141c22
add test_heterogeneous_client_sync_and_sequencer_handoff
jonastheis 5ab3286
fix: correctly encode signature when handling block import
yiweichi f32a549
move all reth dependencies to workspace Cargo.toml and reference fix …
jonastheis c61058a
restore initial network topology after reth broadcast to all is enabled
jonastheis e57ee93
add more verbose logs
jonastheis ed95405
Merge remote-tracking branch 'origin/main' into feat/improve-docker-e…
jonastheis 73599a3
Merge remote-tracking branch 'origin/main' into feat/improve-docker-e…
jonastheis 9552ce4
update reth dependency
jonastheis 5f4f03c
Merge remote-tracking branch 'origin/main' into feat/improve-docker-e…
jonastheis 8d47314
fix issues after merge
jonastheis aaf4500
fix issues after merge
jonastheis b3a0501
build docker image by default
jonastheis d4edd0d
Merge remote-tracking branch 'origin/main' into feat/improve-docker-e…
jonastheis 5afc355
fix typo
jonastheis 17fb709
Merge branch 'main' into feat/improve-docker-e2e-test
jonastheis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ ARG CARGO_FEATURES="" | |
|
||
# Install basic packages | ||
RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config | ||
RUN cargo install cargo-chef --locked --version 0.1.71 | ||
RUN cargo install cargo-chef sccache --locked | ||
|
||
FROM chef AS planner | ||
WORKDIR /app | ||
|
@@ -23,17 +23,18 @@ RUN mkdir -p tests/src && \ | |
echo 'name = "tests"' >> tests/Cargo.toml && \ | ||
echo 'path = "src/lib.rs"' >> tests/Cargo.toml && \ | ||
echo 'pub fn dummy() {}' > tests/src/lib.rs | ||
RUN --mount=type=cache,target=/usr/local/cargo/registry \ | ||
cargo chef prepare --recipe-path /recipe.json | ||
RUN cargo chef prepare --recipe-path /recipe.json | ||
|
||
FROM chef AS builder | ||
WORKDIR /app | ||
COPY --from=planner /recipe.json recipe.json | ||
RUN --mount=type=cache,target=/usr/local/cargo/registry \ | ||
--mount=type=cache,target=/usr/local/cargo/git \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add sccache:
|
||
cargo chef cook --release --recipe-path recipe.json | ||
|
||
COPY . . | ||
RUN --mount=type=cache,target=/usr/local/cargo/registry \ | ||
--mount=type=cache,target=/usr/local/cargo/git \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add sccache:
|
||
cargo build ${CARGO_FEATURES:+--features $CARGO_FEATURES} --release --target-dir=/app-target | ||
|
||
# Release | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,17 @@ | ||
#!/usr/bin/env bash | ||
set -e | ||
|
||
export RUST_LOG=sqlx=off,scroll=trace,reth=trace,rollup=trace,info | ||
export RUST_LOG=sqlx=off,scroll=trace,reth=trace,rollup=trace,trace | ||
|
||
exec rollup-node node --chain /l2reth/l2reth-genesis-e2e.json --datadir=/l2reth --metrics=0.0.0.0:6060 --network.scroll-wire --network.bridge \ | ||
exec rollup-node node --chain /l2reth/l2reth-genesis-e2e.json --datadir=/l2reth --metrics=0.0.0.0:6060 \ | ||
--network.scroll-wire --network.bridge --disable-discovery \ | ||
--network.valid_signer "0xb674ff99cca262c99d3eab5b32796a99188543da" \ | ||
--http --http.addr=0.0.0.0 --http.port=8545 --http.corsdomain "*" --http.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \ | ||
--ws --ws.addr=0.0.0.0 --ws.port=8546 --ws.api admin,debug,eth,net,trace,txpool,web3,rpc,reth,ots,flashbots,miner,mev \ | ||
--log.stdout.format log-fmt -vvv \ | ||
--txpool.pending-max-count=1000 \ | ||
--builder.gaslimit=30000000 \ | ||
--rpc.max-connections=5000 \ | ||
--trusted-peers enode://8fc4f6dfd0a2ebf56560d0b0ef5e60ad7bcb01e13f929eae53a4c77086d9c1e74eb8b8c8945035d25c6287afdd871f0d41b3fd7e189697decd0f13538d1ac620@l2geth-sequencer:30303,enode://e7f7e271f62bd2b697add14e6987419758c97e83b0478bd948f5f2d271495728e7edef5bd78ad65258ac910f28e86928ead0c42ee51f2a0168d8ca23ba939766@rollup-node-sequencer:30303 \ | ||
--engine.sync-at-startup false \ | ||
--l1.url http://l1-node:8545 \ | ||
--blob.mock |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You also need to configure cargo to use sccache; currently, it's not being used.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed it bc it caused some problems after Greg's upstream changes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ahh ok, shall we remove the installation of sccache entirely then?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yep I will remove it