try smaller block range

Author: zkzoomer

zkstack_cli/crates/zkstack/src/commands/chain/gateway/gateway_common.rs

@@ -16,7 +16,7 @@ use zkstack_cli_common::{
     logger,
 };
 use zkstack_cli_config::{ZkStackConfig, ZkStackConfigTrait};
-use zksync_basic_types::{Address, H256, U256, U64};
+use zksync_basic_types::{network::Network, Address, H256, U256, U64};
 use zksync_system_constants::L2_BRIDGEHUB_ADDRESS;
 use zksync_types::{
     server_notification::{GatewayMigrationNotification, GatewayMigrationState},
@@ -32,7 +32,7 @@ use super::{
 use crate::{
     abi::{BridgehubAbi, ChainTypeManagerAbi, IChainAssetHandlerAbi, ZkChainAbi},
     commands::chain::{admin_call_builder::AdminCallBuilder, utils::send_tx},
-    consts::DEFAULT_EVENTS_BLOCK_RANGE,
+    consts::{DEFAULT_EVENTS_BLOCK_RANGE, LOCALHOST_L1_EVENTS_BLOCK_RANGE},
 };
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
@@ -122,9 +122,16 @@ pub(crate) async fn get_migration_transaction(
     let chain_asset_handler =
         IChainAssetHandlerAbi::new(chain_asset_handler_addr, provider.clone());
 
+    // On local L1 (chain_id 9), large block range queries (0..Latest) can lead to flakiness.
+    // We reduce the chunk size to ensure reliability.
+    let block_range = if sl_chain_id.as_u64() == Network::Localhost.chain_id().0 {
+        LOCALHOST_L1_EVENTS_BLOCK_RANGE
+    } else {
+        DEFAULT_EVENTS_BLOCK_RANGE
+    };
     let max_interval_to_search = Utc::now() - MAX_SEARCHING_MIGRATION_TXS_INTERVAL;
     let latest_tx_hash: Option<H256> = loop {
-        let lower_bound = search_upper_bound.saturating_sub(DEFAULT_EVENTS_BLOCK_RANGE);
+        let lower_bound = search_upper_bound.saturating_sub(block_range);
 
         logger::info(format!(
             "Checking block range: {}..={}",

zkstack_cli/crates/zkstack/src/consts.rs

@@ -3,6 +3,7 @@ pub const AMOUNT_FOR_DISTRIBUTION_TO_WALLETS: u128 = 2_000u128 * 1_000_000_000_0
 pub const MINIMUM_BALANCE_FOR_WALLET: u128 = 5u128 * 1_000_000_000_000_000_000u128;
 /// The default block range within which we search for events within one query.
 pub const DEFAULT_EVENTS_BLOCK_RANGE: u64 = 50_000;
+pub const LOCALHOST_L1_EVENTS_BLOCK_RANGE: u64 = 1_000;
 pub const SERVER_MIGRATIONS: &str = "core/lib/dal/migrations";
 pub const PROVER_MIGRATIONS: &str = "prover/crates/lib/prover_dal/migrations";
 pub const PROVER_STORE_MAX_RETRIES: u16 = 10;