feat: add test l1 reorg

Author: yiweichi

crates/node/src/args.rs

@@ -341,7 +341,7 @@ impl ScrollRollupNodeConfig {
         let consensus = self.consensus_args.consensus(authorized_signer)?;
 
         let (l1_notification_tx, l1_notification_rx): (Option<Sender<Arc<L1Notification>>>, _) =
-            if let Some(provider) = l1_provider.filter(|_| !self.test) {
+            if let Some(provider) = l1_provider.filter(|_| !self.test||self.blob_provider_args.anvil_url.is_some()) {
                 tracing::info!(target: "scroll::node::args", ?l1_block_startup_info, "Starting L1 watcher");
                 (
                     None,

crates/node/src/test_utils/fixture.rs

@@ -520,20 +520,26 @@ impl TestFixtureBuilder {
 
         // Start Anvil if requested
         let anvil = if self.enable_anvil {
-            let anvil = Some(
-                Self::spawn_anvil(
-                    self.anvil_state_path.as_deref(),
-                    self.anvil_chain_id,
-                    self.anvil_block_time,
-                )
-                .await?,
-            );
-            if let Some(ref handle) = anvil {
-                let endpoint = handle.http_endpoint();
-                config.l1_provider_args.url = endpoint.parse::<reqwest::Url>().ok();
-                config.blob_provider_args.anvil_url = endpoint.parse::<reqwest::Url>().ok();
-            }
-            anvil
+            let handle = Self::spawn_anvil(
+                self.anvil_state_path.as_deref(),
+                self.anvil_chain_id,
+                self.anvil_block_time,
+            )
+            .await?;
+
+            // Parse endpoint URL once and reuse
+            let endpoint_url = handle
+                .http_endpoint()
+                .parse::<reqwest::Url>()
+                .map_err(|e| eyre::eyre!("Failed to parse Anvil endpoint URL: {}", e))?;
+
+            // Configure L1 provider and blob provider to use Anvil
+            config.l1_provider_args.url = Some(endpoint_url.clone());
+            config.l1_provider_args.logs_query_block_range = 500;
+            config.blob_provider_args.anvil_url = Some(endpoint_url);
+            config.blob_provider_args.mock = false;
+
+            Some(handle)
         } else {
             None
         };
@@ -603,6 +609,8 @@ impl TestFixtureBuilder {
         if let Some(id) = chain_id {
             config.chain_id = Some(id);
         }
+        
+        config.port = 8544;
 
         // Configure block time
         if let Some(time) = block_time {

crates/node/tests/l1_multi_mode.rs

@@ -101,10 +101,6 @@ async fn test_batch_commit_while_synced() -> eyre::Result<()> {
         .build()
         .await?;
 
-    // First, send L1Synced notification
-    fixture.l1().sync().await?;
-    fixture.expect_event().l1_synced().await?;
-
     // Get initial status
     let initial_status = fixture.get_sequencer_status().await?;
     let initial_safe = initial_status.l2.fcs.safe_block_info().number;
@@ -116,8 +112,19 @@ async fn test_batch_commit_while_synced() -> eyre::Result<()> {
     let commit_batch_1_tx = read_test_transaction("commitBatch", "1")?;
     fixture.anvil_send_raw_transaction(commit_batch_1_tx).await?;
 
+    let commit_batch_1_tx = read_test_transaction("commitBatch", "2")?;
+    fixture.anvil_send_raw_transaction(commit_batch_1_tx).await?;
+
+    // Give it some time to process
+    tokio::time::sleep(tokio::time::Duration::from_millis(10000)).await;
+
+    // First, send L1Synced notification
+    // fixture.l1().sync().await?;
+    // fixture.expect_event().l1_synced().await?;
+    // fixture.expect_event().batch_consolidated().await?;
+
     // Give it some time to process
-    tokio::time::sleep(tokio::time::Duration::from_millis(1000)).await;
+    // tokio::time::sleep(tokio::time::Duration::from_millis(10000)).await;
 
     // Check that safe head was updated
     let new_status = fixture.get_sequencer_status().await?;