From 9e29d4559c61a448ffc72e05523126249dd5a9c6 Mon Sep 17 00:00:00 2001 From: 0xOsiris Date: Thu, 17 Oct 2024 08:31:32 -0700 Subject: [PATCH 1/7] add devnet CI --- .github/workflows/devnet-ci.yml | 28 ++++++++++++++++++++++++++++ Justfile | 5 +++++ world-chain-builder/Justfile | 4 ++++ 3 files changed, 37 insertions(+) create mode 100644 .github/workflows/devnet-ci.yml diff --git a/.github/workflows/devnet-ci.yml b/.github/workflows/devnet-ci.yml new file mode 100644 index 00000000..fcebde8e --- /dev/null +++ b/.github/workflows/devnet-ci.yml @@ -0,0 +1,28 @@ +name: Block Building CI +on: + pull_request: + branches: [main] + types: [review_requested, ready_for_review] + +jobs: + tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: taiki-e/install-action@just + - uses: dtolnay/rust-toolchain@stable + - name: Setup Kurtosis + run: | + echo "deb [trusted=yes] https://apt.fury.io/kurtosis-tech/ /" | sudo tee /etc/apt/sources.list.d/kurtosis.list + sudo apt update + sudo apt install kurtosis-cli + kurtosis analytics disable + - name: Run Devnet + run: | + just devnet-up + - name: Build + run: | + just assertor -b + - name: Fallback' + run: | + just assertor -f diff --git a/Justfile b/Justfile index 15d4316f..2effe290 100644 --- a/Justfile +++ b/Justfile @@ -23,3 +23,8 @@ test: # Formats the world-chain-builder fmt: @just ./world-chain-builder/fmt + +# Runs the block building assertions +# NOTE: The devnet needs to be running for this to work +assertor *args='': + @just ./world-chain-builder/assertor $@ \ No newline at end of file diff --git a/world-chain-builder/Justfile b/world-chain-builder/Justfile index d1717b5b..c2930785 100644 --- a/world-chain-builder/Justfile +++ b/world-chain-builder/Justfile @@ -7,3 +7,7 @@ test: # Formats the world-chain-builder fmt: cargo fmt + +# Runs the block building assertions +assertor *args='': + cargo run --package assertor -- $@ \ No newline at end of file From 560c2217de6e9ef8b044a4c428858d6b84ef39f7 Mon Sep 17 00:00:00 2001 From: 0xOsiris Date: Thu, 17 Oct 2024 09:06:32 -0700 Subject: [PATCH 2/7] fix: feature flags --- world-chain-builder/Cargo.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/world-chain-builder/Cargo.toml b/world-chain-builder/Cargo.toml index 0cb153da..fce45bfa 100644 --- a/world-chain-builder/Cargo.toml +++ b/world-chain-builder/Cargo.toml @@ -14,7 +14,9 @@ reth = { git = "https://github.com/paradigmxyz/reth", rev = "c35b8be" } reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "c35b8be" } reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "c35b8be" } reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "c35b8be" } -reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "c35b8be" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "c35b8be", features = [ + "test-utils", +] } reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "c35b8be" } reth-prune-types = { git = "https://github.com/paradigmxyz/reth", rev = "c35b8be" } reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "c35b8be" } From 7aa13de66d4007ad35f030241c7426f36e335415 Mon Sep 17 00:00:00 2001 From: 0xOsiris Date: Thu, 17 Oct 2024 09:08:54 -0700 Subject: [PATCH 3/7] trigger ci --- .github/workflows/devnet-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/devnet-ci.yml b/.github/workflows/devnet-ci.yml index fcebde8e..dab759f5 100644 --- a/.github/workflows/devnet-ci.yml +++ b/.github/workflows/devnet-ci.yml @@ -2,7 +2,7 @@ name: Block Building CI on: pull_request: branches: [main] - types: [review_requested, ready_for_review] + # types: [review_requested, ready_for_review] jobs: tests: From 1f6ce8814a17c1d93b38b51bf3985ca4bde4e680 Mon Sep 17 00:00:00 2001 From: 0xOsiris Date: Thu, 17 Oct 2024 11:19:04 -0700 Subject: [PATCH 4/7] cleanup ci namespace --- .github/workflows/devnet-ci.yml | 4 +-- devnet/src/contracts/contract_deployer.star | 2 +- .../el/world-chain/world_chain_launcher.star | 1 - devnet/src/el_cl_launcher.star | 34 +++++++++++-------- .../rollup-boost/rollup_boost_launcher.star | 9 ++--- devnet/src/package_io/input_parser.star | 3 +- world-chain-builder/Justfile | 2 +- 7 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.github/workflows/devnet-ci.yml b/.github/workflows/devnet-ci.yml index dab759f5..4df1ea9b 100644 --- a/.github/workflows/devnet-ci.yml +++ b/.github/workflows/devnet-ci.yml @@ -20,9 +20,9 @@ jobs: - name: Run Devnet run: | just devnet-up - - name: Build + - name: Build PBH Block run: | just assertor -b - - name: Fallback' + - name: Sequencer Fallback run: | just assertor -f diff --git a/devnet/src/contracts/contract_deployer.star b/devnet/src/contracts/contract_deployer.star index dd918c53..46343b37 100644 --- a/devnet/src/contracts/contract_deployer.star +++ b/devnet/src/contracts/contract_deployer.star @@ -94,7 +94,7 @@ def deploy_l2_contracts( 'jq \'. + {"fundDevAccounts": true, "useInterop": true}\' $DEPLOY_CONFIG_PATH > tmp.$$.json && mv tmp.$$.json $DEPLOY_CONFIG_PATH', "forge script scripts/deploy/Deploy.s.sol:Deploy --private-key $GS_ADMIN_PRIVATE_KEY --broadcast --rpc-url $L1_RPC_URL", "CONTRACT_ADDRESSES_PATH=$DEPLOYMENT_OUTFILE forge script scripts/L2Genesis.s.sol:L2Genesis --sig 'runWithStateDump()' --chain-id $L2_CHAIN_ID", - "cat $STATE_DUMP_PATH | jq '. |= . + {\"0x4e59b44847b379578588920ca78fbf26c0b4956c\": {\"nonce\": \"0x0\",\"balance\": \"0x0\",\"code\": \"0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3\",\"storage\": {}},\"0x42ff98c4e85212a5d31358acbfe76a621b50fc02\": {\"nonce\": \"0x2\",\"balance\": \"0x0\",\"code\": \"0x608060405234801561001057600080fd5b50600436106100d45760003560e01c8063b242e53411610081578063f1c621ee1161005b578063f1c621ee146101c9578063f2fde38b1461021c578063fbde929b1461022f57600080fd5b8063b242e5341461019b578063c70aa727146101ae578063d7b0fef1146101c157600080fd5b80638da5cb5b116100b25780638da5cb5b146101305780638e5cdd5014610158578063b0d690791461018957600080fd5b80630ee04629146100d9578063354ca12014610113578063715018a614610128575b600080fd5b6004546100fe9074010000000000000000000000000000000000000000900460ff1681565b60405190151581526020015b60405180910390f35b610126610121366004610afe565b610242565b005b6101266102f9565b60045460405173ffffffffffffffffffffffffffffffffffffffff909116815260200161010a565b60405160ff7f000000000000000000000000000000000000000000000000000000000000001e16815260200161010a565b6000545b60405190815260200161010a565b6101266101a9366004610b73565b61030d565b6101266101bc366004610bb1565b61048c565b61018d6104a0565b6101fb6101d7366004610bb1565b6002602052600090815260409020546fffffffffffffffffffffffffffffffff1681565b6040516fffffffffffffffffffffffffffffffff909116815260200161010a565b61012661022a366004610bca565b6104e5565b61012661023d366004610bb1565b610599565b61024b856105d1565b60035460408051608081018252878152602081018690528082018790526060810185905290517f2357251100000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff909216916323572511916102c291859190600401610bee565b60006040518083038186803b1580156102da57600080fd5b505afa1580156102ee573d6000803e3d6000fd5b505050505050505050565b610301610693565b61030b6000610964565b565b610315610693565b73ffffffffffffffffffffffffffffffffffffffff82166103bd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603260248201527f43726f7373446f6d61696e4f776e61626c65333a206e6577206f776e6572206960448201527f7320746865207a65726f2061646472657373000000000000000000000000000060648201526084015b60405180910390fd5b60006103de60045473ffffffffffffffffffffffffffffffffffffffff1690565b90506103e983610964565b6004805483151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff90911617905560405173ffffffffffffffffffffffffffffffffffffffff80851691908316907f7fdc2a4b6eb39ec3363d710d188620bd1e97b3c434161f187b4d0dc0544faa589061047f90861515815260200190565b60405180910390a3505050565b610494610693565b61049d816109db565b50565b60006001546000036104de576040517f5b8dabb700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5060015490565b6104ed610693565b73ffffffffffffffffffffffffffffffffffffffff8116610590576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084016103b4565b61049d81610964565b6105a1610693565b61049d81610a16565b60006010602060ff841682118015906105c957508060ff168460ff1611155b949350505050565b60015481036105dd5750565b6000818152600260205260408120546fffffffffffffffffffffffffffffffff1690819003610638576040517fddae3b7100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000546106576fffffffffffffffffffffffffffffffff831642610c2e565b111561068f576040517f3ae7359e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5050565b60045474010000000000000000000000000000000000000000900460ff161561077957336106d660045473ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff161461030b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602c60248201527f43726f7373446f6d61696e4f776e61626c65333a2063616c6c6572206973206e60448201527f6f7420746865206f776e6572000000000000000000000000000000000000000060648201526084016103b4565b73420000000000000000000000000000000000000733811461081d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603060248201527f43726f7373446f6d61696e4f776e61626c65333a2063616c6c6572206973206e60448201527f6f7420746865206d657373656e6765720000000000000000000000000000000060648201526084016103b4565b8073ffffffffffffffffffffffffffffffffffffffff16636e296e456040518163ffffffff1660e01b8152600401602060405180830381865afa158015610868573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061088c9190610c6c565b73ffffffffffffffffffffffffffffffffffffffff166108c160045473ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff161461049d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602c60248201527f43726f7373446f6d61696e4f776e61626c65333a2063616c6c6572206973206e60448201527f6f7420746865206f776e6572000000000000000000000000000000000000000060648201526084016103b4565b6004805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b60008190556040518181527f147b815b6a3a8dd5d49310410e089f6b5e9f3782e944772edc938c8bb48ef1219060200160405180910390a150565b6000818152600260205260409020546fffffffffffffffffffffffffffffffff168015610a6f576040517f6650c4d100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600182905560008281526002602090815260409182902080547fffffffffffffffffffffffffffffffff0000000000000000000000000000000016426fffffffffffffffffffffffffffffffff8116918217909255835186815292830152917fe97c89cbb137505b36f55ebfc9732fd6c4c73ff43d49db239fc25f6e7a534145910160405180910390a1505050565b6000806000806000610180808789031215610b1857600080fd5b86359550602087013594506040870135935060608701359250878188011115610b4057600080fd5b506080860190509295509295909350565b73ffffffffffffffffffffffffffffffffffffffff8116811461049d57600080fd5b60008060408385031215610b8657600080fd5b8235610b9181610b51565b915060208301358015158114610ba657600080fd5b809150509250929050565b600060208284031215610bc357600080fd5b5035919050565b600060208284031215610bdc57600080fd5b8135610be781610b51565b9392505050565b610180810161010080858437600090830181815284915b6004811015610c24578251825260209283019290910190600101610c05565b5050509392505050565b600082821015610c67577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b500390565b600060208284031215610c7e57600080fd5b8151610be781610b5156fea164736f6c634300080f000a\",\"storage\": {\"0x0000000000000000000000000000000000000000000000000000000000000000\": \"0x0000000000000000000000000000000000000000000000000000000000093a80\",\"0x0000000000000000000000000000000000000000000000000000000000000001\": \"0x133DBDEE27C5F1171B0417DDDF26D9664B775CC41F5676693D9C5184F42097C9\",\"0x0000000000000000000000000000000000000000000000000000000000000003\": \"0x000000000000000000000000a16e02e87b7454126e5e10d957a927a7f5b5d2be\",\"0x0000000000000000000000000000000000000000000000000000000000000004\": \"0x000000000000000000000001f39fd6e51aad88f6f4ce6ab8827279cfffb92266\"}}}' > tmp.$$.json && mv tmp.$$.json $STATE_DUMP_PATH", + 'cat $STATE_DUMP_PATH | jq \'. |= . + {"0x4e59b44847b379578588920ca78fbf26c0b4956c": {"nonce": "0x0","balance": "0x0","code": "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3","storage": {}},"0x42ff98c4e85212a5d31358acbfe76a621b50fc02": {"nonce": "0x2","balance": "0x0","code": "0x608060405234801561001057600080fd5b50600436106100d45760003560e01c8063b242e53411610081578063f1c621ee1161005b578063f1c621ee146101c9578063f2fde38b1461021c578063fbde929b1461022f57600080fd5b8063b242e5341461019b578063c70aa727146101ae578063d7b0fef1146101c157600080fd5b80638da5cb5b116100b25780638da5cb5b146101305780638e5cdd5014610158578063b0d690791461018957600080fd5b80630ee04629146100d9578063354ca12014610113578063715018a614610128575b600080fd5b6004546100fe9074010000000000000000000000000000000000000000900460ff1681565b60405190151581526020015b60405180910390f35b610126610121366004610afe565b610242565b005b6101266102f9565b60045460405173ffffffffffffffffffffffffffffffffffffffff909116815260200161010a565b60405160ff7f000000000000000000000000000000000000000000000000000000000000001e16815260200161010a565b6000545b60405190815260200161010a565b6101266101a9366004610b73565b61030d565b6101266101bc366004610bb1565b61048c565b61018d6104a0565b6101fb6101d7366004610bb1565b6002602052600090815260409020546fffffffffffffffffffffffffffffffff1681565b6040516fffffffffffffffffffffffffffffffff909116815260200161010a565b61012661022a366004610bca565b6104e5565b61012661023d366004610bb1565b610599565b61024b856105d1565b60035460408051608081018252878152602081018690528082018790526060810185905290517f2357251100000000000000000000000000000000000000000000000000000000815273ffffffffffffffffffffffffffffffffffffffff909216916323572511916102c291859190600401610bee565b60006040518083038186803b1580156102da57600080fd5b505afa1580156102ee573d6000803e3d6000fd5b505050505050505050565b610301610693565b61030b6000610964565b565b610315610693565b73ffffffffffffffffffffffffffffffffffffffff82166103bd576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603260248201527f43726f7373446f6d61696e4f776e61626c65333a206e6577206f776e6572206960448201527f7320746865207a65726f2061646472657373000000000000000000000000000060648201526084015b60405180910390fd5b60006103de60045473ffffffffffffffffffffffffffffffffffffffff1690565b90506103e983610964565b6004805483151574010000000000000000000000000000000000000000027fffffffffffffffffffffff00ffffffffffffffffffffffffffffffffffffffff90911617905560405173ffffffffffffffffffffffffffffffffffffffff80851691908316907f7fdc2a4b6eb39ec3363d710d188620bd1e97b3c434161f187b4d0dc0544faa589061047f90861515815260200190565b60405180910390a3505050565b610494610693565b61049d816109db565b50565b60006001546000036104de576040517f5b8dabb700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5060015490565b6104ed610693565b73ffffffffffffffffffffffffffffffffffffffff8116610590576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201527f646472657373000000000000000000000000000000000000000000000000000060648201526084016103b4565b61049d81610964565b6105a1610693565b61049d81610a16565b60006010602060ff841682118015906105c957508060ff168460ff1611155b949350505050565b60015481036105dd5750565b6000818152600260205260408120546fffffffffffffffffffffffffffffffff1690819003610638576040517fddae3b7100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000546106576fffffffffffffffffffffffffffffffff831642610c2e565b111561068f576040517f3ae7359e00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5050565b60045474010000000000000000000000000000000000000000900460ff161561077957336106d660045473ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff161461030b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602c60248201527f43726f7373446f6d61696e4f776e61626c65333a2063616c6c6572206973206e60448201527f6f7420746865206f776e6572000000000000000000000000000000000000000060648201526084016103b4565b73420000000000000000000000000000000000000733811461081d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152603060248201527f43726f7373446f6d61696e4f776e61626c65333a2063616c6c6572206973206e60448201527f6f7420746865206d657373656e6765720000000000000000000000000000000060648201526084016103b4565b8073ffffffffffffffffffffffffffffffffffffffff16636e296e456040518163ffffffff1660e01b8152600401602060405180830381865afa158015610868573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061088c9190610c6c565b73ffffffffffffffffffffffffffffffffffffffff166108c160045473ffffffffffffffffffffffffffffffffffffffff1690565b73ffffffffffffffffffffffffffffffffffffffff161461049d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260206004820152602c60248201527f43726f7373446f6d61696e4f776e61626c65333a2063616c6c6572206973206e60448201527f6f7420746865206f776e6572000000000000000000000000000000000000000060648201526084016103b4565b6004805473ffffffffffffffffffffffffffffffffffffffff8381167fffffffffffffffffffffffff0000000000000000000000000000000000000000831681179093556040519116919082907f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e090600090a35050565b60008190556040518181527f147b815b6a3a8dd5d49310410e089f6b5e9f3782e944772edc938c8bb48ef1219060200160405180910390a150565b6000818152600260205260409020546fffffffffffffffffffffffffffffffff168015610a6f576040517f6650c4d100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600182905560008281526002602090815260409182902080547fffffffffffffffffffffffffffffffff0000000000000000000000000000000016426fffffffffffffffffffffffffffffffff8116918217909255835186815292830152917fe97c89cbb137505b36f55ebfc9732fd6c4c73ff43d49db239fc25f6e7a534145910160405180910390a1505050565b6000806000806000610180808789031215610b1857600080fd5b86359550602087013594506040870135935060608701359250878188011115610b4057600080fd5b506080860190509295509295909350565b73ffffffffffffffffffffffffffffffffffffffff8116811461049d57600080fd5b60008060408385031215610b8657600080fd5b8235610b9181610b51565b915060208301358015158114610ba657600080fd5b809150509250929050565b600060208284031215610bc357600080fd5b5035919050565b600060208284031215610bdc57600080fd5b8135610be781610b51565b9392505050565b610180810161010080858437600090830181815284915b6004811015610c24578251825260209283019290910190600101610c05565b5050509392505050565b600082821015610c67577f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b500390565b600060208284031215610c7e57600080fd5b8151610be781610b5156fea164736f6c634300080f000a","storage": {"0x0000000000000000000000000000000000000000000000000000000000000000": "0x0000000000000000000000000000000000000000000000000000000000093a80","0x0000000000000000000000000000000000000000000000000000000000000001": "0x133DBDEE27C5F1171B0417DDDF26D9664B775CC41F5676693D9C5184F42097C9","0x0000000000000000000000000000000000000000000000000000000000000003": "0x000000000000000000000000a16e02e87b7454126e5e10d957a927a7f5b5d2be","0x0000000000000000000000000000000000000000000000000000000000000004": "0x000000000000000000000001f39fd6e51aad88f6f4ce6ab8827279cfffb92266"}}}\' > tmp.$$.json && mv tmp.$$.json $STATE_DUMP_PATH', "cd /workspace/optimism/op-node/bin", "./op-node genesis l2 \ --l1-rpc $L1_RPC_URL \ diff --git a/devnet/src/el/world-chain/world_chain_launcher.star b/devnet/src/el/world-chain/world_chain_launcher.star index 34884834..09653bc4 100644 --- a/devnet/src/el/world-chain/world_chain_launcher.star +++ b/devnet/src/el/world-chain/world_chain_launcher.star @@ -207,4 +207,3 @@ def new_world_chain_launcher( network=network, network_id=network_id, ) - \ No newline at end of file diff --git a/devnet/src/el_cl_launcher.star b/devnet/src/el_cl_launcher.star index 7407141b..055484e3 100644 --- a/devnet/src/el_cl_launcher.star +++ b/devnet/src/el_cl_launcher.star @@ -142,7 +142,7 @@ def launch( el_builder_type = participant.el_builder_type cl_builder_type = participant.cl_builder_type - # engine relay + # engine relay engine_relay_type = participant.engine_relay_type if el_type not in el_launchers: @@ -151,35 +151,35 @@ def launch( el_type, ",".join(el_launchers.keys()) ) ) - + if cl_type not in cl_launchers: fail( "Unsupported launcher '{0}', need one of '{1}'".format( cl_type, ",".join(cl_launchers.keys()) ) ) - + if el_builder_type not in el_launchers: fail( "Unsupported launcher '{0}', need one of '{1}'".format( el_builder_type, ",".join(el_launchers.keys()) ) ) - + if cl_builder_type not in cl_launchers: fail( "Unsupported launcher '{0}', need one of '{1}'".format( cl_builder_type, ",".join(cl_launchers.keys()) ) ) - + if engine_relay_type not in engine_relay_launchers: fail( "Unsupported launcher '{0}', need one of '{1}'".format( engine_relay_type, ",".join(engine_relay_launchers.keys()) ) ) - + el_launcher, el_launch_method = ( el_launchers[el_type]["launcher"], el_launchers[el_type]["launch_method"], @@ -204,9 +204,11 @@ def launch( engine_relay_launchers[engine_relay_type]["launcher"], engine_relay_launchers[engine_relay_type]["launch_method"], ) - + # Zero-pad the index using the calculated zfill value - index_str = shared_utils.zfill_custom(index + 1, len(str(len(participants)))) + index_str = shared_utils.zfill_custom( + index + 1, len(str(len(participants))) + ) el_service_name = "wc-admin-{0}".format(el_type) @@ -216,8 +218,10 @@ def launch( cl_builder_service_name = "wc-admin-{0}-builder".format(cl_builder_type) - engine_relayer_service_name = "wc-admin-{0}-engine".format(engine_relay_type) - + engine_relayer_service_name = "wc-admin-{0}-engine".format( + engine_relay_type + ) + # First launch the Sequencer, and the Builder el_builder_context = el_builder_launch_method( plan, @@ -225,7 +229,7 @@ def launch( el_builder_service_name, participant.el_builder_image, all_el_contexts, - False, # sequencer disabled + False, # sequencer disabled None, # sequencer context ) @@ -235,7 +239,7 @@ def launch( el_service_name, participant.el_image, all_el_contexts, - True, # sequencer enabled + True, # sequencer enabled None, # sequencer context ) @@ -250,7 +254,7 @@ def launch( el_builder_context, ) - # Launch op-node pointing to the Engine Relay + # Launch op-node pointing to the Engine Relay cl_context = cl_launch_method( plan, cl_launcher, @@ -311,7 +315,9 @@ def launch( ) # Zero-pad the index using the calculated zfill value - index_str = shared_utils.zfill_custom(index + 1, len(str(len(participants)))) + index_str = shared_utils.zfill_custom( + index + 1, len(str(len(participants))) + ) el_service_name = "op-el-{0}-{1}-{2}{3}".format( index_str, el_type, cl_type, l2_services_suffix diff --git a/devnet/src/engine/rollup-boost/rollup_boost_launcher.star b/devnet/src/engine/rollup-boost/rollup_boost_launcher.star index 69fba5f9..754cd376 100644 --- a/devnet/src/engine/rollup-boost/rollup_boost_launcher.star +++ b/devnet/src/engine/rollup-boost/rollup_boost_launcher.star @@ -16,6 +16,7 @@ WS_PORT_NUM = 8546 DISCOVERY_PORT_NUM = 30303 RPC_PORT_ID = "rpc" + def launch( plan, launcher, @@ -24,7 +25,7 @@ def launch( existing_el_clients, sequencer_context, builder_context, -): +): network_name = shared_utils.get_network_name(launcher.network) config = get_config( @@ -37,7 +38,7 @@ def launch( service_name, existing_el_clients, sequencer_context, - builder_context + builder_context, ) service = plan.add_service(service_name, config) @@ -88,7 +89,7 @@ def get_config( "--builder-url={0}".format(BUILDER_EXECUTION_ENGINE_ENDPOINT), "--rpc-port={0}".format(RPC_PORT_NUM), "--boost-sync", - "--log-level=debug" + "--log-level=debug", ] files = { @@ -116,4 +117,4 @@ def new_rollup_boost_launcher( jwt_file=jwt_file, network=network, network_id=network_id, - ) \ No newline at end of file + ) diff --git a/devnet/src/package_io/input_parser.star b/devnet/src/package_io/input_parser.star index a6bfd3f6..726723aa 100644 --- a/devnet/src/package_io/input_parser.star +++ b/devnet/src/package_io/input_parser.star @@ -15,7 +15,7 @@ DEFAULT_EL_IMAGES = { } DEFAULT_ENGINE_IMAGES = { - "rollup-boost": "leytont/rollup-boost:latest", + "rollup-boost": "docker.io/leytont/rollup-boost:latest", } DEFAULT_CL_IMAGES = { @@ -179,6 +179,7 @@ def world_chain_admin_participant(): "count": 1, } + def default_participant(): return { "admin": False, diff --git a/world-chain-builder/Justfile b/world-chain-builder/Justfile index c2930785..20759ed2 100644 --- a/world-chain-builder/Justfile +++ b/world-chain-builder/Justfile @@ -10,4 +10,4 @@ fmt: # Runs the block building assertions assertor *args='': - cargo run --package assertor -- $@ \ No newline at end of file + cargo run --package assertor -- $@ From ec4547cd2e65f4772c4c1bd76b8bc6a86eba7c2f Mon Sep 17 00:00:00 2001 From: 0xOsiris Date: Thu, 17 Oct 2024 11:22:21 -0700 Subject: [PATCH 5/7] chore: update dispatch types --- .github/workflows/devnet-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/devnet-ci.yml b/.github/workflows/devnet-ci.yml index 4df1ea9b..3742a645 100644 --- a/.github/workflows/devnet-ci.yml +++ b/.github/workflows/devnet-ci.yml @@ -2,7 +2,7 @@ name: Block Building CI on: pull_request: branches: [main] - # types: [review_requested, ready_for_review] + types: [review_requested, ready_for_review] jobs: tests: From 0fd7882f2bd3d06b278045e0f9ff9f814f113a1a Mon Sep 17 00:00:00 2001 From: 0xOsiris Date: Thu, 17 Oct 2024 11:28:16 -0700 Subject: [PATCH 6/7] add manual worlkflow dispatch --- .github/workflows/devnet-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/devnet-ci.yml b/.github/workflows/devnet-ci.yml index 3742a645..f6934c0f 100644 --- a/.github/workflows/devnet-ci.yml +++ b/.github/workflows/devnet-ci.yml @@ -3,6 +3,7 @@ on: pull_request: branches: [main] types: [review_requested, ready_for_review] + workflow_dispatch: jobs: tests: From f49341391c099d9b3aced042b20ec4aaad6be1aa Mon Sep 17 00:00:00 2001 From: 0xOsiris Date: Thu, 17 Oct 2024 11:43:20 -0700 Subject: [PATCH 7/7] chore: update environment --- .github/workflows/devnet-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/devnet-ci.yml b/.github/workflows/devnet-ci.yml index f6934c0f..15b63af4 100644 --- a/.github/workflows/devnet-ci.yml +++ b/.github/workflows/devnet-ci.yml @@ -5,6 +5,10 @@ on: types: [review_requested, ready_for_review] workflow_dispatch: +env: + CARGO_TERM_COLOR: always + RUST_LOG: INFO + jobs: tests: runs-on: ubuntu-latest