test: add test_l1_sync_batch_commit

Author: yiweichi

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,7 +352,9 @@ 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||self.blob_provider_args.anvil_url.is_some()) {
+            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,
@@ -351,6 +364,7 @@ impl ScrollRollupNodeConfig {
                             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,
                     ),
@@ -410,7 +424,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 +901,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 +929,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 +959,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 +984,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 +1009,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/fixture.rs

@@ -6,11 +6,12 @@ use super::{
 use crate::{
     BlobProviderArgs, ChainOrchestratorArgs, ConsensusAlgorithm, ConsensusArgs, EngineDriverArgs,
     L1ProviderArgs, RollupNodeDatabaseArgs, RollupNodeGasPriceOracleArgs, RollupNodeNetworkArgs,
-    RpcArgs, ScrollRollupNode, ScrollRollupNodeConfig, SequencerArgs, SignerArgs,
+    RpcArgs, ScrollRollupNode, ScrollRollupNodeConfig, SequencerArgs, SignerArgs, TestArgs,
 };
 
 use alloy_eips::BlockNumberOrTag;
-use alloy_primitives::Address;
+use alloy_primitives::{address, Address};
+use alloy_provider::{Provider, ProviderBuilder};
 use alloy_rpc_types_eth::Block;
 use alloy_signer_local::PrivateKeySigner;
 use reth_chainspec::EthChainSpec;
@@ -230,13 +231,27 @@ impl TestFixture {
         self.anvil.is_some()
     }
 
+    /// Generate Anvil blocks by calling anvil_mine RPC method.
+    pub async fn anvil_mine_blocks(&self, num_blocks: u64) -> eyre::Result<()> {
+        // Ensure Anvil is running
+        let anvil_endpoint =
+            self.anvil_endpoint().ok_or_else(|| eyre::eyre!("Anvil is not running"))?;
+
+        // Create RPC client
+        let client = alloy_rpc_client::RpcClient::new_http(anvil_endpoint.parse()?);
+
+        // Mine blocks using anvil_mine RPC method
+        // Parameters: (num_blocks, interval_in_seconds)
+        let _: () = client.request("anvil_mine", (num_blocks, 0)).await?;
+
+        Ok(())
+    }
+
     /// Send a raw transaction to Anvil.
     pub async fn anvil_send_raw_transaction(
         &self,
         raw_tx: impl Into<alloy_primitives::Bytes>,
     ) -> eyre::Result<alloy_primitives::B256> {
-        use alloy_provider::{Provider, ProviderBuilder};
-
         // Ensure Anvil is running
         let anvil_endpoint =
             self.anvil_endpoint().ok_or_else(|| eyre::eyre!("Anvil is not running"))?;
@@ -294,7 +309,7 @@ impl TestFixtureBuilder {
     /// Returns the default rollup node config.
     fn default_config() -> ScrollRollupNodeConfig {
         ScrollRollupNodeConfig {
-            test: true,
+            test_args: TestArgs { test: true, skip_l1_synced: false },
             network_args: RollupNodeNetworkArgs::default(),
             database_args: RollupNodeDatabaseArgs::default(),
             l1_provider_args: L1ProviderArgs::default(),
@@ -339,8 +354,15 @@ impl TestFixtureBuilder {
     }
 
     /// Toggle the test field.
-    pub const fn with_test(mut self, test: bool) -> Self {
-        self.config.test = test;
+    pub fn with_test(mut self, test: bool) -> Self {
+        self.config.test_args.test = test;
+        self
+    }
+
+    /// Enable test mode to skip L1 watcher Synced notifications.
+    /// This is useful for tests that don't want to wait for L1 sync completion events.
+    pub fn skip_l1_synced_notifications(mut self) -> Self {
+        self.config.test_args.skip_l1_synced = true;
         self
     }
 
@@ -487,7 +509,7 @@ impl TestFixtureBuilder {
         self
     }
 
-    /// Enable Anvil with the default state file (`tests/anvil_state.json`).
+    /// Enable Anvil with the default state file (`./tests/testdata/anvil_state.json`).
     pub fn with_anvil_default_state(mut self) -> Self {
         self.enable_anvil = true;
         self.anvil_state_path = Some(PathBuf::from("./tests/testdata/anvil_state.json"));
@@ -513,6 +535,23 @@ impl TestFixtureBuilder {
         self
     }
 
+    /// Set custom L1 config addresses for Anvil testing.
+    /// This method reads contract addresses from tests/anvil.env.
+    pub fn with_anvil_l1_config(mut self) -> Self {
+        let chain_spec = self.chain_spec.take().unwrap_or_else(|| SCROLL_DEV.clone());
+        let mut spec = (*chain_spec).clone();
+        spec.config.l1_config.scroll_chain_address =
+            address!("0x5FC8d32690cc91D4c39d9d3abcBD16989F875707");
+        spec.config.l1_config.l1_message_queue_address =
+            address!("0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9");
+        spec.config.l1_config.l1_message_queue_v2_address =
+            address!("0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9");
+        spec.config.l1_config.l2_system_config_address =
+            address!("0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0");
+        self.chain_spec = Some(Arc::new(spec));
+        self
+    }
+
     /// Build the test fixture.
     pub async fn build(self) -> eyre::Result<TestFixture> {
         let mut config = self.config;
@@ -609,7 +648,7 @@ impl TestFixtureBuilder {
         if let Some(id) = chain_id {
             config.chain_id = Some(id);
         }
-        
+
         config.port = 8544;
 
         // Configure block time
@@ -619,14 +658,9 @@ impl TestFixtureBuilder {
 
         // Load state from file if provided
         if let Some(path) = state_path {
-            let state = anvil::eth::backend::db::SerializableState::load(path)
-                .map_err(|e| {
-                    eyre::eyre!(
-                        "Failed to load Anvil state from {}: {:?}",
-                        path.display(),
-                        e
-                    )
-                })?;
+            let state = anvil::eth::backend::db::SerializableState::load(path).map_err(|e| {
+                eyre::eyre!("Failed to load Anvil state from {}: {:?}", path.display(), e)
+            })?;
             tracing::info!("Loaded Anvil state from: {}", path.display());
             config.init_state = Some(state);
         }

crates/node/src/test_utils/mod.rs

@@ -78,7 +78,7 @@ pub use network_helpers::{
 use crate::{
     BlobProviderArgs, ChainOrchestratorArgs, ConsensusArgs, EngineDriverArgs, L1ProviderArgs,
     RollupNodeDatabaseArgs, RollupNodeNetworkArgs, RpcArgs, ScrollRollupNode,
-    ScrollRollupNodeConfig, SequencerArgs,
+    ScrollRollupNodeConfig, SequencerArgs, TestArgs,
 };
 use alloy_primitives::Bytes;
 use reth_chainspec::EthChainSpec;
@@ -220,7 +220,7 @@ pub async fn generate_tx(wallet: Arc<Mutex<Wallet>>) -> Bytes {
 /// Returns a default [`ScrollRollupNodeConfig`] preconfigured for testing.
 pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
     ScrollRollupNodeConfig {
-        test: true,
+        test_args: TestArgs { test: true, skip_l1_synced: false },
         network_args: RollupNodeNetworkArgs::default(),
         database_args: RollupNodeDatabaseArgs::default(),
         l1_provider_args: L1ProviderArgs::default(),
@@ -253,7 +253,7 @@ pub fn default_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
 /// interval.
 pub fn default_sequencer_test_scroll_rollup_node_config() -> ScrollRollupNodeConfig {
     ScrollRollupNodeConfig {
-        test: true,
+        test_args: TestArgs { test: true, skip_l1_synced: false },
         network_args: RollupNodeNetworkArgs::default(),
         database_args: RollupNodeDatabaseArgs {
             rn_db_path: Some(PathBuf::from("sqlite::memory:")),