fix(gateway_migration): Add wait for starting migration

Signed-off-by: Danil <[email protected]>

Author: Deniallugo

core/lib/types/src/api/mod.rs

@@ -1112,6 +1112,7 @@ pub struct GatewayMigrationStatus {
     pub latest_notification: Option<GatewayMigrationNotification>,
     pub state: GatewayMigrationState,
     pub settlement_layer: Option<SettlementLayer>,
+    pub wait_for_batches_to_be_committed: bool,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]

core/node/api_server/src/web3/namespaces/unstable/mod.rs

@@ -8,11 +8,13 @@ use zksync_dal::{Connection, Core, CoreDal, DalError};
 use zksync_mini_merkle_tree::MiniMerkleTree;
 use zksync_multivm::{interface::VmEvent, zk_evm_latest::ethereum_types::U64};
 use zksync_types::{
+    aggregated_operations::L1BatchAggregatedActionType,
     api,
     api::{
         ChainAggProof, DataAvailabilityDetails, GatewayMigrationStatus, L1ToL2TxsStatus, TeeProof,
         TransactionDetailedResult, TransactionExecutionInfo,
     },
+    eth_sender::EthTxFinalityStatus,
     server_notification::GatewayMigrationState,
     tee_types::TeeType,
     web3,
@@ -248,6 +250,32 @@ impl UnstableNamespace {
             .await
             .map_err(DalError::generalize)?;
 
+        let latest_processed_l1_batch_number = connection
+            .interop_root_dal()
+            .get_latest_processed_interop_root_l1_batch_number()
+            .await?;
+
+        let wait_for_batches_to_be_committed = if let Some(latest_processed_l1_batch_number) =
+            connection
+                .interop_root_dal()
+                .get_latest_processed_interop_root_l1_batch_number()
+                .await?
+        {
+            if let Some(tx) = connection
+                .eth_sender_dal()
+                .get_last_sent_successfully_eth_tx_by_batch_and_op(
+                    L1BatchNumber::from(latest_processed_l1_batch_number),
+                    L1BatchAggregatedActionType::Commit,
+                )
+                .await
+            {
+                tx.eth_tx_finality_status == EthTxFinalityStatus::Finalized
+            } else {
+                false
+            }
+        } else {
+            false
+        };
         let state = GatewayMigrationState::from_sl_and_notification(
             self.state.api_config.settlement_layer,
             latest_notification,
@@ -257,6 +285,7 @@ impl UnstableNamespace {
             latest_notification,
             state,
             settlement_layer: self.state.api_config.settlement_layer,
+            wait_for_batches_to_be_committed,
         })
     }
 

core/tests/ts-integration/contracts/zkasm/invalid_pointer.zkasm

@@ -52,6 +52,7 @@ impl MigrationDirection {
 
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
 pub enum NotificationReceivedState {
+    NotAllBatchesCommitted,
     NotAllBatchesExecuted(U256, U256),
     UnconfirmedTxs(usize),
 }
@@ -71,6 +72,9 @@ impl std::fmt::Display for NotificationReceivedState {
                     "There are some unconfirmed transactions: {unconfirmed_txs}"
                 )
             }
+            NotificationReceivedState::NotAllBatchesCommitted => {
+                write!(f, "Not all batches have been committed yet")
+            }
         }
     }
 }
@@ -309,6 +313,12 @@ pub(crate) async fn get_gateway_migration_state(
                 ),
             ));
         }
+
+        if gateway_migration_status.wait_for_batches_to_be_committed {
+            return Ok(GatewayMigrationProgressState::NotificationReceived(
+                NotificationReceivedState::NotAllBatchesCommitted,
+            ));
+        }
     }
 
     let unconfirmed_txs = zk_client.get_unconfirmed_txs_count().await?;

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

@@ -38,7 +38,10 @@ use crate::{
         admin_call_builder::AdminCallBuilder,
         gateway::{
             constants::DEFAULT_MAX_L1_GAS_PRICE_FOR_PRIORITY_TXS,
-            gateway_common::extract_and_wait_for_priority_ops,
+            gateway_common::{
+                extract_and_wait_for_priority_ops, get_gateway_migration_state,
+                GatewayMigrationProgressState, MigrationDirection,
+            },
         },
         init::get_l1_da_validator,
         utils::send_tx,
@@ -88,6 +91,32 @@ pub async fn run(args: MigrateFromGatewayArgs, shell: &Shell) -> anyhow::Result<
         .ctm
         .diamond_cut_data;
 
+    let gateway_general_config = gateway_chain_config.get_general_config().await?;
+    let gw_rpc_url = gateway_general_config.l2_http_url()?;
+
+    let state = get_gateway_migration_state(
+        l1_url.clone(),
+        chain_contracts_config
+            .ecosystem_contracts
+            .bridgehub_proxy_addr,
+        chain_config.chain_id.as_u64(),
+        chain_config
+            .get_general_config()
+            .await?
+            .l2_http_url()
+            .context("L2 RPC URL must be provided for cross checking")?,
+        gw_rpc_url.clone(),
+        MigrationDirection::FromGateway,
+    )
+    .await?;
+
+    if state != GatewayMigrationProgressState::ServerReady {
+        anyhow::bail!(
+            "Chain is not ready for starting the migration from Gateway. Current state: {:?}",
+            state
+        );
+    }
+
     let start_migrate_from_gateway_call = start_migrate_chain_from_gateway(
         shell,
         &args.forge_args,
@@ -111,8 +140,6 @@ pub async fn run(args: MigrateFromGatewayArgs, shell: &Shell) -> anyhow::Result<
     let (calldata, value) =
         AdminCallBuilder::new(start_migrate_from_gateway_call.calls).compile_full_calldata();
 
-    let general_config = gateway_chain_config.get_general_config().await?;
-    let gw_rpc_url = general_config.l2_http_url()?;
     let gateway_provider = get_ethers_provider(&gw_rpc_url)?;
     let gateway_zk_client = get_zk_client(&gw_rpc_url, chain_config.chain_id.as_u64())?;
 

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

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2025-03-19"
+channel = "nightly-2025-09-19"