feat(docker tests): add L1 messages to testing

crates/chain-orchestrator/src/lib.rs

@@ -69,7 +69,7 @@ mod retry;
 pub use retry::Retry;
 
 mod sync;
-pub use sync::SyncState;
+pub use sync::{SyncMode, SyncState};
 
 mod status;
 pub use status::ChainOrchestratorStatus;

crates/chain-orchestrator/src/status.rs

@@ -2,7 +2,7 @@ use crate::sync::{SyncMode, SyncState};
 use scroll_engine::ForkchoiceState;
 
 /// The current status of the chain orchestrator.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct ChainOrchestratorStatus {
     /// The chain status for L1.
@@ -33,7 +33,7 @@ impl ChainOrchestratorStatus {
 }
 
 /// The status of the L1 chain.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct L1ChainStatus {
     /// The sync mode of the chain.
@@ -47,7 +47,7 @@ pub struct L1ChainStatus {
 }
 
 /// The status of the L2 chain.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct L2ChainStatus {
     /// The sync mode of the chain.

crates/chain-orchestrator/src/sync.rs

@@ -42,7 +42,7 @@ impl SyncState {
 }
 
 /// The sync mode of the chain orchestrator.
-#[derive(Debug, Default, Clone)]
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub enum SyncMode {
     /// Syncing mode.

crates/engine/src/fcs.rs

@@ -14,7 +14,7 @@ use scroll_alloy_network::Scroll;
 ///
 /// The state is composed of the [`BlockInfo`] for `head`, `safe` block, and the `finalized`
 /// blocks.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct ForkchoiceState {
     head: BlockInfo,

tests/Cargo.toml

@@ -12,12 +12,15 @@ alloy-primitives = { workspace = true }
 alloy-network = { workspace = true }
 alloy-provider = { workspace = true, features = ["reqwest", "ws"] }
 alloy-rpc-types-eth = { workspace = true }
+alloy-signer-local = { workspace = true }
+alloy-sol-types = { workspace = true }
 scroll-alloy-network = { workspace = true }
+rollup-node-chain-orchestrator = { path = "../crates/chain-orchestrator", features = ["serde"] }
 tokio = { workspace = true, features = ["rt", "time", "process"] }
 eyre = { workspace = true }
 getrandom = { workspace = true }
 tracing = { workspace = true }
 reth-tracing = { workspace = true }
 serde = { workspace = true }
-serde_json = "1.0"
+serde_json = { workspace = true }
 reth-e2e-test-utils.workspace = true

tests/anvil.env

@@ -0,0 +1,66 @@
+CHAIN_ID_L2=938471
+NETWORK=sepolia
+L1_DEPLOYER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80
+L1_PROXY_ADMIN_ADDR=0x5FbDB2315678afecb367f032d93F642f64180aa3
+L1_PROXY_IMPLEMENTATION_PLACEHOLDER_ADDR=0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512
+L1_SYSTEM_CONFIG_PROXY_ADDR=0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0
+L1_MESSAGE_QUEUE_V1_PROXY_ADDR=0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9
+L1_MESSAGE_QUEUE_V2_PROXY_ADDR=0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9
+L1_SCROLL_CHAIN_PROXY_ADDR=0x5FC8d32690cc91D4c39d9d3abcBD16989F875707
+L1_ETH_GATEWAY_PROXY_ADDR=0x0165878A594ca255338adfa4d48449f69242Eb8F
+L1_WETH_GATEWAY_PROXY_ADDR=0xa513E6E4b8f2a923D98304ec87F64353C4D5C853
+L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR=0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6
+L1_SCROLL_MESSENGER_PROXY_ADDR=0x8A791620dd6260079BF849Dc5567aDC3F2FdC318
+L1_CUSTOM_ERC20_GATEWAY_PROXY_ADDR=0x610178dA211FEF7D417bC0e6FeD39F05609AD788
+L1_ERC721_GATEWAY_PROXY_ADDR=0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e
+L1_ERC1155_GATEWAY_PROXY_ADDR=0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0
+L1_WETH_ADDR=0x0000000000000000000000000000000000000001
+L2_WETH_ADDR=0x0000000000000000000000000000000000000001
+L1_PLONK_VERIFIER_ADDR=0x0000000000000000000000000000000000000001
+VERIFIER_DIGEST_1=0x0000000000000000000000000000000000000000000000000000000000000001
+VERIFIER_DIGEST_2=0x0000000000000000000000000000000000000000000000000000000000000001
+L1_FEE_VAULT_ADDR=0x0000000000000000000000000000000000000001
+L2_SCROLL_MESSENGER_PROXY_ADDR=0x0000000000000000000000000000000000000001
+L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR=0x0000000000000000000000000000000000000001
+L2_ERC721_GATEWAY_PROXY_ADDR=0x0000000000000000000000000000000000000001
+L2_ERC1155_GATEWAY_PROXY_ADDR=0x0000000000000000000000000000000000000001
+L2_ETH_GATEWAY_PROXY_ADDR=0x0000000000000000000000000000000000000001
+L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR=0x0000000000000000000000000000000000000001
+L2_WETH_GATEWAY_PROXY_ADDR=0x0000000000000000000000000000000000000001
+L2_SCROLL_STANDARD_ERC20_ADDR=0x0000000000000000000000000000000000000001
+L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR=0x0000000000000000000000000000000000000001
+L1_SCROLL_MULTISIG_ADDR=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+L1_SECURITY_COUNCIL_ADDR=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+L1_PROPOSAL_EXECUTOR_ADDR=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+L1_SCROLL_OWNER_ADDR=0x9E545E3C0baAB3E08CdfD552C960A1050f373042
+L1_1D_TIMELOCK_ADDR=0xa82fF9aFd8f496c3d6ac40E2a0F282E47488CFc9
+L1_7D_TIMELOCK_ADDR=0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8
+L1_14D_TIMELOCK_ADDR=0x851356ae760d987E095750cCeb3bC6014560891C
+MAX_TX_IN_CHUNK=100
+MAX_L1_MESSAGE_GAS_LIMIT=2000000
+FINALIZE_BATCH_DEADLINE_SEC=86400
+RELAY_MESSAGE_DEADLINE_SEC=86400
+L2GETH_SIGNER_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+L1_COMMIT_SENDER_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+L1_FINALIZE_SENDER_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+L1_ZKEVM_VERIFIER_V1_ADDR=0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82
+L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR=0x9A676e781A523b5d0C0e43731313A708CB607508
+L1_WHITELIST_ADDR=0x0B306BF915C4d645ff596e518fAf3F9669b97016
+L1_SYSTEM_CONFIG_IMPLEMENTATION_ADDR=0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1
+L1_ENFORCED_TX_GATEWAY_IMPLEMENTATION_ADDR=0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE
+L1_ENFORCED_TX_GATEWAY_PROXY_ADDR=0x68B1D87F95878fE05B998F19b66F4baba5De1aed
+L1_MESSAGE_QUEUE_V1_IMPLEMENTATION_ADDR=0x3Aa5ebB10DC797CAC828524e59A333d0A371443c
+L1_MESSAGE_QUEUE_V2_IMPLEMENTATION_ADDR=0xc6e7DF5E7b4f2A278906862b61205850344D4e7d
+L2_GAS_PRICE_ORACLE_IMPLEMENTATION_ADDR=0x59b670e9fA9D0A427751Af201D676719a970857b
+L2_GAS_PRICE_ORACLE_PROXY_ADDR=0x4ed7c70F96B99c776995fB64377f0d4aB3B0e1C1
+L1_SCROLL_CHAIN_IMPLEMENTATION_ADDR=0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44
+L1_SCROLL_MESSENGER_IMPLEMENTATION_ADDR=0xa85233C63b9Ee964Add6F2cffe00Fd84eb32338f
+L1_GATEWAY_ROUTER_IMPLEMENTATION_ADDR=0x4A679253410272dd5232B3Ff7cF5dbB88f295319
+L1_GATEWAY_ROUTER_PROXY_ADDR=0x7a2088a1bFc9d81c55368AE168C2C02570cB814F
+L1_ETH_GATEWAY_IMPLEMENTATION_ADDR=0x09635F643e140090A9A8Dcd712eD6285858ceBef
+L1_WETH_GATEWAY_IMPLEMENTATION_ADDR=0xc5a5C42992dECbae36851359345FE25997F5C42d
+L1_STANDARD_ERC20_GATEWAY_IMPLEMENTATION_ADDR=0x67d269191c92Caf3cD7723F116c85e6E9bf55933
+L1_CUSTOM_ERC20_GATEWAY_IMPLEMENTATION_ADDR=0xE6E340D132b5f46d1e472DebcD681B2aBc16e57E
+L1_ERC721_GATEWAY_IMPLEMENTATION_ADDR=0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690
+L1_ERC1155_GATEWAY_IMPLEMENTATION_ADDR=0x84eA74d481Ee0A5332c457a4d796187F6Ba67fEB
+L1_CONSENSUS_ADDRESS=0xb674Ff99cca262c99D3eAb5B32796a99188543dA

tests/docker-compose.test.yml

@@ -1,13 +1,15 @@
 services:
   l1-node:
     image: ghcr.io/foundry-rs/foundry:latest
-    entrypoint: [ "bash", "/launch_l1.bash" ]
+    entrypoint: ["bash", "/launch_l1.bash"]
     ports:
       - "8544:8545"
     volumes:
       - ./launch_l1.bash:/launch_l1.bash:ro
+      - ./anvil.env:/anvil.env:ro
+      - ./anvil_state.json:/anvil_state.json:ro
     healthcheck:
-      test: ["CMD", "bash", "-c", "[ \"$(cast storage 0x55B150d210356452e4E79cCb6B778b4e1B167091 0x67 --rpc-url http://localhost:8545)\" = \"0x000000000000000000000000b674ff99cca262c99d3eab5b32796a99188543da\" ]"]
+      test: ["CMD", "bash", "-c", "[ \"$(cast storage 0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0 0x67 --rpc-url http://localhost:8545)\" = \"0x000000000000000000000000b674ff99cca262c99d3eab5b32796a99188543da\" ]"]
       interval: 3s
       timeout: 10s
       retries: 30
@@ -50,7 +52,7 @@ services:
         condition: service_healthy
 
   l2geth-sequencer:
-    image: scrolltech/l2geth:scroll-v5.9.4
+    image: scrolltech/l2geth:scroll-v5.9.5
     platform: linux/amd64
     entrypoint: ["bash", "/launch_l2geth.bash"]
     ports:
@@ -65,7 +67,7 @@ services:
         condition: service_healthy
 
   l2geth-follower:
-    image: scrolltech/l2geth:scroll-v5.9.4
+    image: scrolltech/l2geth:scroll-v5.9.5
     platform: linux/amd64
     entrypoint: ["bash", "/launch_l2geth.bash"]
     ports:

tests/l2geth-genesis-e2e.json

@@ -24,7 +24,7 @@
     "systemContract": {
       "period": 1,
       "blocks_per_second": 2,
-      "system_contract_address": "0x55B150d210356452e4E79cCb6B778b4e1B167091",
+      "system_contract_address": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",
       "system_contract_slot": "0x0000000000000000000000000000000000000000000000000000000000000067"
     },
     "scroll": {
@@ -35,7 +35,7 @@
       "l1Config": {
         "l1ChainId": "22222222",
         "l1MessageQueueAddress": "0x0000000000000000000000000000000000000001",
-        "l1MessageQueueV2Address": "0x160dd98613ba6C6E0a14086a87cf36244558422E",
+        "l1MessageQueueV2Address": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
         "l1MessageQueueV2DeploymentBlock": 0,
         "scrollChainAddress": "0x84044d3a645843bAF0752eA591E1EAB643beD904",
         "l2SystemConfigAddress": "0x2E48aC0df81f1fa57722e115e807C9dB1819bA13",

tests/l2reth-genesis-e2e.json

@@ -27,9 +27,9 @@
       "l1Config": {
         "l1ChainId": 22222222,
         "l1MessageQueueAddress": "0x0000000000000000000000000000000000000001",
-        "l1MessageQueueV2Address": "0x160dd98613ba6C6E0a14086a87cf36244558422E",
+        "l1MessageQueueV2Address": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9",
         "scrollChainAddress": "0x84044d3a645843bAF0752eA591E1EAB643beD904",
-        "systemContractAddress": "0x55B150d210356452e4E79cCb6B778b4e1B167091",
+        "systemContractAddress": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0",
         "l2SystemConfigAddress": "0x2E48aC0df81f1fa57722e115e807C9dB1819bA13",
         "numL1MessagesPerBlock": 10,
         "startL1Block": 0

tests/launch_l1.bash

@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 set -e
 
+# Source environment variables
+source "/anvil.env"
+
 # Start anvil in background
-anvil --host 0.0.0.0 --port 8545 --chain-id 22222222 --accounts 10 --balance 10000 --code-size-limit 100000000 &
+anvil --host 0.0.0.0 --port 8545 --chain-id 22222222 --accounts 10 --balance 10000 --code-size-limit 100000000 --load-state anvil_state.json --block-time 1 --slots-in-an-epoch 4 &
 ANVIL_PID=$!
 
 # Wait for anvil to start (with retry)
@@ -16,24 +19,24 @@ for i in {1..10}; do
   echo "Waiting ($i/10)..."
 done
 
-# Check if anvil is running
-if ! cast rpc eth_blockNumber --rpc-url http://localhost:8545 > /dev/null 2>&1; then
-  echo "Error: anvil failed to start"
-  exit 1
-fi
+# # Check if anvil is running
+# if ! cast rpc eth_blockNumber --rpc-url http://localhost:8545 > /dev/null 2>&1; then
+#   echo "Error: anvil failed to start"
+#   exit 1
+# fi
 
 # Set L1 system contract consensus address
-echo "Setting system contract consensus address..."
-cast rpc anvil_setStorageAt \
-  0x55B150d210356452e4E79cCb6B778b4e1B167091 \
-  0x0000000000000000000000000000000000000000000000000000000000000067 \
-  0x000000000000000000000000b674Ff99cca262c99D3eAb5B32796a99188543dA \
-  --rpc-url http://localhost:8545
+# echo "Setting system contract consensus address..."
+# cast rpc anvil_setStorageAt \
+#   0x55B150d210356452e4E79cCb6B778b4e1B167091 \
+#   0x0000000000000000000000000000000000000000000000000000000000000067 \
+#   0x000000000000000000000000b674Ff99cca262c99D3eAb5B32796a99188543dA \
+#   --rpc-url http://localhost:8545
 
 # Verify that storage was set correctly
 echo "Verifying storage..."
-storage_value=$(cast storage 0x55B150d210356452e4E79cCb6B778b4e1B167091 0x67 --rpc-url http://localhost:8545)
-expected_value="0x000000000000000000000000b674ff99cca262c99d3eab5b32796a99188543da"
+storage_value=$(cast storage "$L1_SYSTEM_CONFIG_PROXY_ADDR" 0x67 --rpc-url http://localhost:8545)
+expected_value="0x000000000000000000000000$(echo "$L1_CONSENSUS_ADDRESS" | sed 's/0x//' | tr '[:upper:]' '[:lower:]')"
 
 if [ "$storage_value" != "$expected_value" ]; then
   echo "Error: Storage verify failed"

tests/launch_l2geth_follower.bash

@@ -9,7 +9,7 @@ exec geth --datadir=/l2geth \
   --http --http.addr 0.0.0.0 --http.port 8545 --http.vhosts "*" --http.corsdomain "*" --http.api "admin,eth,scroll,net,web3,debug" \
   --ws --ws.addr 0.0.0.0 --ws.port 8546 --ws.api "admin,eth,scroll,net,web3,debug" \
   --pprof --pprof.addr 0.0.0.0 --pprof.port 6060 --metrics --verbosity 5 --log.debug \
-  --l1.endpoint "http://l1-node:8545" --l1.confirmations finalized --l1.sync.startblock 0 \
+  --l1.endpoint "http://l1-node:8545" --l1.confirmations finalized --l1.sync.startblock 0 --l1.sync.interval 1s \
   --gcmode archive --cache.noprefetch --cache.snapshot=0 --snapshot=false \
   --gossip.enablebroadcasttoall \
   --nat extip:0.0.0.0

tests/launch_l2geth_sequencer.bash

@@ -19,7 +19,7 @@ exec geth --datadir=/l2geth \
   --http --http.addr 0.0.0.0 --http.port 8545 --http.vhosts "*" --http.corsdomain "*" --http.api "admin,eth,scroll,net,web3,debug,miner" \
   --ws --ws.addr 0.0.0.0 --ws.port 8546 --ws.api "admin,eth,scroll,net,web3,debug,miner" \
   --pprof --pprof.addr 0.0.0.0 --pprof.port 6060 --metrics --verbosity 5 --log.debug \
-  --l1.endpoint "http://l1-node:8545" --l1.confirmations finalized --l1.sync.startblock 0 \
+  --l1.endpoint "http://l1-node:8545" --l1.confirmations finalized --l1.sync.startblock 0 --l1.sync.interval 1s \
   --gcmode archive --cache.noprefetch --cache.snapshot=0 --snapshot=false \
   --nat extip:0.0.0.0 \
   --gossip.enablebroadcasttoall \