test: l1 reorg

Cargo.toml

@@ -129,6 +129,7 @@ alloy-consensus = { version = "1.0.37", default-features = false }
 alloy-eips = { version = "1.0.37", default-features = false }
 alloy-json-rpc = { version = "1.0.37", default-features = false }
 alloy-network = { version = "1.0.37", default-features = false }
+alloy-node-bindings = { version = "1.0.37", default-features = false }
 alloy-primitives = { version = "1.4.1", default-features = false }
 alloy-provider = { version = "1.0.37", default-features = false }
 alloy-rpc-client = { version = "1.0.37", default-features = false }

crates/node/Cargo.toml

@@ -77,6 +77,7 @@ aws-sdk-kms = "1.76.0"
 
 # test-utils
 alloy-eips = { workspace = true, optional = true }
+anvil = { git = "https://github.com/foundry-rs/foundry.git", rev = "2c84e1c970d11ef5023a77d8002a1cb70b143888", default-features = false, optional = true }
 alloy-rpc-types-eth = { workspace = true, optional = true }
 alloy-rpc-types-engine = { workspace = true, optional = true }
 reth-e2e-test-utils = { workspace = true, optional = true }
@@ -156,6 +157,7 @@ test-utils = [
     "rollup-node-chain-orchestrator/test-utils",
     "scroll-network/test-utils",
     "alloy-eips",
+    "anvil",
     "reth-storage-api",
     "alloy-rpc-types-eth",
 ]

crates/node/src/args.rs

@@ -53,12 +53,23 @@ use scroll_network::ScrollNetworkManager;
 use scroll_wire::ScrollWireEvent;
 use tokio::sync::mpsc::{Sender, UnboundedReceiver};
 
-/// A struct that represents the arguments for the rollup node.
-#[derive(Debug, Clone, clap::Args)]
-pub struct ScrollRollupNodeConfig {
+/// Test-related configuration arguments.
+#[derive(Debug, Clone, Default, clap::Args)]
+pub struct TestArgs {
     /// Whether the rollup node should be run in test mode.
     #[arg(long)]
     pub test: bool,
+    /// Test mode: skip L1 watcher Synced notifications.
+    #[arg(long, default_value = "false")]
+    pub skip_l1_synced: bool,
+}
+
+/// A struct that represents the arguments for the rollup node.
+#[derive(Debug, Clone, clap::Args)]
+pub struct ScrollRollupNodeConfig {
+    /// Test-related arguments
+    #[command(flatten)]
+    pub test_args: TestArgs,
     /// Consensus args
     #[command(flatten)]
     pub consensus_args: ConsensusArgs,
@@ -226,7 +237,7 @@ impl ScrollRollupNodeConfig {
         // Run the database migrations
         if let Some(named) = chain_spec.chain().named() {
             named
-                .migrate(db.inner().get_connection(), self.test)
+                .migrate(db.inner().get_connection(), self.test_args.test)
                 .await
                 .expect("failed to perform migration");
         } else {
@@ -341,20 +352,19 @@ 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_args.test || self.blob_provider_args.anvil_url.is_some())
+            {
                 tracing::info!(target: "scroll::node::args", ?l1_block_startup_info, "Starting L1 watcher");
-                (
-                    None,
-                    Some(
-                        L1Watcher::spawn(
-                            provider,
-                            l1_block_startup_info,
-                            node_config,
-                            self.l1_provider_args.logs_query_block_range,
-                        )
-                        .await,
-                    ),
-                )
+                    let (tx, rx) = L1Watcher::spawn(
+                        provider,
+                        l1_block_startup_info,
+                        node_config,
+                        self.l1_provider_args.logs_query_block_range,
+                        self.test_args.test && self.test_args.skip_l1_synced,
+                    )
+                    .await;
+                    (Some(tx), Some(rx))
             } else {
                 // Create a channel for L1 notifications that we can use to inject L1 messages for
                 // testing
@@ -410,7 +420,7 @@ impl ScrollRollupNodeConfig {
         let signer = if let Some(configured_signer) = self.signer_args.signer(chain_id).await? {
             // Use the signer configured by SignerArgs
             Some(rollup_node_signer::Signer::spawn(configured_signer))
-        } else if self.test {
+        } else if self.test_args.test {
             // Use a random private key signer for testing
             Some(rollup_node_signer::Signer::spawn(PrivateKeySigner::random()))
         } else {
@@ -887,7 +897,7 @@ mod tests {
     #[test]
     fn test_validate_sequencer_enabled_without_any_signer_fails() {
         let config = ScrollRollupNodeConfig {
-            test: false,
+            test_args: TestArgs::default(),
             sequencer_args: SequencerArgs { sequencer_enabled: true, ..Default::default() },
             signer_args: SignerArgs { key_file: None, aws_kms_key_id: None, private_key: None },
             database_args: RollupNodeDatabaseArgs::default(),
@@ -915,7 +925,7 @@ mod tests {
     #[test]
     fn test_validate_sequencer_enabled_with_both_signers_fails() {
         let config = ScrollRollupNodeConfig {
-            test: false,
+            test_args: TestArgs::default(),
             sequencer_args: SequencerArgs { sequencer_enabled: true, ..Default::default() },
             signer_args: SignerArgs {
                 key_file: Some(PathBuf::from("/path/to/key")),
@@ -945,7 +955,7 @@ mod tests {
     #[test]
     fn test_validate_sequencer_enabled_with_key_file_succeeds() {
         let config = ScrollRollupNodeConfig {
-            test: false,
+            test_args: TestArgs::default(),
             sequencer_args: SequencerArgs { sequencer_enabled: true, ..Default::default() },
             signer_args: SignerArgs {
                 key_file: Some(PathBuf::from("/path/to/key")),
@@ -970,7 +980,7 @@ mod tests {
     #[test]
     fn test_validate_sequencer_enabled_with_aws_kms_succeeds() {
         let config = ScrollRollupNodeConfig {
-            test: false,
+            test_args: TestArgs::default(),
             sequencer_args: SequencerArgs { sequencer_enabled: true, ..Default::default() },
             signer_args: SignerArgs {
                 key_file: None,
@@ -995,7 +1005,7 @@ mod tests {
     #[test]
     fn test_validate_sequencer_disabled_without_any_signer_succeeds() {
         let config = ScrollRollupNodeConfig {
-            test: false,
+            test_args: TestArgs::default(),
             sequencer_args: SequencerArgs { sequencer_enabled: false, ..Default::default() },
             signer_args: SignerArgs { key_file: None, aws_kms_key_id: None, private_key: None },
             database_args: RollupNodeDatabaseArgs::default(),

crates/node/src/test_utils/event_utils.rs

@@ -143,6 +143,15 @@ impl<'a> EventWaiter<'a> {
         Ok(())
     }
 
+    /// Wait for batch finalized event on all specified nodes.
+    pub async fn batch_finalized(self) -> eyre::Result<()> {
+        self.wait_for_event_on_all(|e| {
+            matches!(e, ChainOrchestratorEvent::BatchFinalized { .. }).then_some(())
+        })
+        .await?;
+        Ok(())
+    }
+
     /// Wait for batch reverted event on all specified nodes.
     pub async fn batch_reverted(self) -> eyre::Result<()> {
         self.wait_for_event_on_all(|e| {