fix: L1 consolidation (#216)

* test: move sync test from pure CI to e2e

* test: increase time out and fix integration

* feat: only run sync on push to main

Author: greged93

.github/workflows/sync.yaml

@@ -0,0 +1,32 @@
+name: sync
+
+on:
+  push:
+    branches: [main]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    env:
+      RUST_BACKTRACE: 1
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rui314/setup-mold@v1
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+      - name: Run consolidation test
+        env:
+          ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
+          RUST_LOG: "sqlx=off,info,scroll::engine=debug"
+        run: |
+          cargo test --release -p rollup-node test_should_consolidate_to_block_15k

.github/workflows/test.yaml

@@ -51,40 +51,7 @@ jobs:
         with:
           tool: [email protected]
       - name: Run integration tests
-        run: cargo nextest run --all-features --workspace --locked --no-tests=pass -E 'kind(test)'
-
-  sync:
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    env:
-      RUST_BACKTRACE: 1
-    steps:
-      - uses: actions/checkout@v4
-      - uses: rui314/setup-mold@v1
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-        with:
-          cache-on-failure: true
-      - uses: foundry-rs/foundry-toolchain@v1
-      - name: Start rollup node
-        env:
-          ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }}
-        run: |
-          cargo run --bin rollup-node --release -- \
-            node --chain scroll-sepolia --datadir=./l2reth --disable-discovery \
-            --http --http.addr=0.0.0.0 --http.port=8545 --http.api eth \
-            --trusted-peers enode://29cee709c400533ae038a875b9ca975c8abef9eade956dcf3585e940acd5c0ae916968f514bd37d1278775aad1b7db30f7032a70202a87fd7365bd8de3c9f5fc@44.242.39.33:30303 \
-            --log.stdout.format log-fmt -vvv \
-            --l1.url "https://eth-sepolia.g.alchemy.com/v2/$ALCHEMY_KEY"  --l1.cups 500 \
-            --beacon.url https://eth-beacon-chain.drpc.org/rest/ --beacon.cups 100 --engine.en-sync-trigger 10000000000 \
-            --engine.sync-at-startup=false --engine.always-process-payload-attributes-on-canonical-head &
-      - name: Get hash for block 50000
         run: |
-          echo "Waiting for block 50000..."
-          while ! cast block 50000 --rpc-url http://localhost:8545 2>/dev/null | grep -q hash; do
-            sleep 10
-          done
-          echo "Block 50000 found!"
-          
-          EXPECTED_HASH="0x8333d8cd1274d49dcf9b130971d1b485a01f2a2604e73ea7caf9d721fbdf5859"
-          cast block 50000 --rpc-url http://localhost:8545 | grep -q "$EXPECTED_HASH"
+          cargo nextest run --all-features --workspace --locked \
+            --no-tests=pass -E 'kind(test)' \
+            -- --skip test_should_consolidate_to_block_15k

crates/node/tests/sync.rs

@@ -1,19 +1,76 @@
 //! Contains tests related to RN and EN sync.
 
+use alloy_primitives::b256;
 use alloy_provider::{Provider, ProviderBuilder};
 use futures::StreamExt;
+use reqwest::Url;
 use reth_e2e_test_utils::NodeHelperType;
-use reth_scroll_chainspec::SCROLL_DEV;
+use reth_provider::{BlockIdReader, BlockReader};
+use reth_scroll_chainspec::{SCROLL_DEV, SCROLL_SEPOLIA};
 use rollup_node::{
     test_utils::{
         default_sequencer_test_scroll_rollup_node_config, default_test_scroll_rollup_node_config,
         setup_engine,
     },
-    ScrollRollupNode,
+    BeaconProviderArgs, DatabaseArgs, EngineDriverArgs, L1ProviderArgs, NetworkArgs,
+    ScrollRollupNode, ScrollRollupNodeConfig, SequencerArgs,
 };
 use rollup_node_manager::{RollupManagerCommand, RollupManagerEvent};
 use tokio::sync::oneshot;
 
+#[tokio::test]
+async fn test_should_consolidate_to_block_15k() -> eyre::Result<()> {
+    reth_tracing::init_test_tracing();
+
+    // Prepare the config for a L1 consolidation.
+    let alchemy_key = std::env::var("ALCHEMY_KEY")?;
+    let node_config = ScrollRollupNodeConfig {
+        test: false,
+        network_args: NetworkArgs {
+            enable_eth_scroll_wire_bridge: false,
+            enable_scroll_wire: false,
+        },
+        database_args: DatabaseArgs::default(),
+        l1_provider_args: L1ProviderArgs {
+            url: Some(Url::parse(&format!("https://eth-sepolia.g.alchemy.com/v2/{alchemy_key}"))?),
+            compute_units_per_second: 500,
+            max_retries: 10,
+            initial_backoff: 100,
+        },
+        engine_driver_args: EngineDriverArgs {
+            en_sync_trigger: 10000000000,
+            sync_at_startup: false,
+        },
+        sequencer_args: SequencerArgs { sequencer_enabled: false, ..Default::default() },
+        beacon_provider_args: BeaconProviderArgs {
+            url: Some(Url::parse("https://eth-beacon-chain.drpc.org/rest/")?),
+            compute_units_per_second: 100,
+            max_retries: 10,
+            initial_backoff: 100,
+        },
+        signer_args: Default::default(),
+    };
+
+    let chain_spec = (*SCROLL_SEPOLIA).clone();
+    let (mut nodes, _tasks, _) = setup_engine(node_config, 1, chain_spec.clone(), false).await?;
+    let node = nodes.pop().unwrap();
+
+    // We perform consolidation up to block 15k. This allows us to capture a batch revert event at
+    // block 11419 (batch 1653).
+    while node.inner.provider.safe_block_num_hash()?.map(|x| x.number).unwrap_or_default() < 15000 {
+        tokio::time::sleep(tokio::time::Duration::from_secs(5)).await
+    }
+
+    let block_hash_15k = node.inner.provider.block(15000.into())?.unwrap();
+
+    assert_eq!(
+        block_hash_15k.hash_slow(),
+        b256!("86901ebce1840ee45c1d5c70bf85ce6924f7a066ef11575d0f381858c83845d4")
+    );
+
+    Ok(())
+}
+
 /// We test if the syncing of the RN is correctly triggered and released when the EN reaches sync.
 #[allow(clippy::large_stack_frames)]
 #[tokio::test]