use new zkstack-out

Author: zkzoomer

contracts

@@ -13,14 +13,14 @@ abigen!(
 );
 
 abigen!(
-    ChainTypeManagerAbi,
-    "../../../contracts/l1-contracts/zkstack-out/IChainTypeManagerForZKStack.sol/IChainTypeManagerForZKStack.json",
+    IChainTypeManagerAbi,
+    "../../../contracts/l1-contracts/zkstack-out/IChainTypeManager.sol/IChainTypeManager.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 
 abigen!(
     ValidatorTimelockAbi,
-    "../../../contracts/l1-contracts/zkstack-out/IValidatorTimelockForZKStack.sol/IValidatorTimelockForZKStack.json",
+    "../../../contracts/l1-contracts/zkstack-out/IValidatorTimelock.sol/IValidatorTimelock.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 
@@ -62,21 +62,15 @@ abigen!(
     event_derives(serde::Deserialize, serde::Serialize)
 );
 
-abigen!(
-    DeployPaymasterAbi,
-    "../../../contracts/l1-contracts/zkstack-out/DeployPaymaster.s.sol/DeployPaymaster.json",
-    event_derives(serde::Deserialize, serde::Serialize)
-);
-
 abigen!(
     IDeployPaymasterAbi,
     "../../../contracts/l1-contracts/zkstack-out/IDeployPaymaster.sol/IDeployPaymaster.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 
 abigen!(
-    GatewayVotePreparationAbi,
-    "../../../contracts/l1-contracts/zkstack-out/GatewayVotePreparation.s.sol/GatewayVotePreparation.json",
+    IGatewayVotePreparationAbi,
+    "../../../contracts/l1-contracts/zkstack-out/IGatewayVotePreparation.sol/IGatewayVotePreparation.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 
@@ -87,8 +81,8 @@ abigen!(
 );
 
 abigen!(
-    EnableEvmEmulatorAbi,
-    "../../../contracts/l1-contracts/zkstack-out/EnableEvmEmulator.s.sol/EnableEvmEmulator.json",
+    IEnableEvmEmulatorAbi,
+    "../../../contracts/l1-contracts/zkstack-out/IEnableEvmEmulator.sol/IEnableEvmEmulator.json",
     event_derives(serde::Deserialize, serde::Serialize)
 );
 

zkstack_cli/crates/zkstack/src/abi.rs

@@ -22,7 +22,7 @@ use zkstack_cli_config::{
 use zkstack_cli_types::ProverMode;
 
 use crate::{
-    abi::{BridgehubAbi, GATEWAYVOTEPREPARATIONABI_ABI},
+    abi::{BridgehubAbi, IGATEWAYVOTEPREPARATIONABI_ABI},
     admin_functions::{
         governance_execute_calls, grant_gateway_whitelist, revoke_gateway_whitelist,
         AdminScriptMode,
@@ -217,7 +217,7 @@ pub async fn gateway_vote_preparation(
         .bridgehub_proxy_addr;
 
     let gateway_vote_preparation_contract =
-        BaseContract::from(GATEWAYVOTEPREPARATIONABI_ABI.clone());
+        BaseContract::from(IGATEWAYVOTEPREPARATIONABI_ABI.clone());
     let calldata = gateway_vote_preparation_contract
         .encode("run", (bridgehub_proxy, ctm_chain_id))
         .unwrap();

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

@@ -30,7 +30,7 @@ use super::{
     notify_server_calldata::{get_notify_server_calls, NotifyServerCallsArgs},
 };
 use crate::{
-    abi::{BridgehubAbi, ChainTypeManagerAbi, IChainAssetHandlerAbi, ZkChainAbi},
+    abi::{BridgehubAbi, IChainAssetHandlerAbi, IChainTypeManagerAbi, ZkChainAbi},
     commands::chain::{admin_call_builder::AdminCallBuilder, utils::send_tx},
     consts::DEFAULT_EVENTS_BLOCK_RANGE,
 };
@@ -189,7 +189,7 @@ pub(crate) async fn get_gateway_migration_state(
     let l1_bridgehub = BridgehubAbi::new(l1_bridgehub_addr, l1_provider.clone());
 
     let l1_ctm_address = l1_bridgehub.chain_type_manager(l2_chain_id.into()).await?;
-    let l1_ctm = ChainTypeManagerAbi::new(l1_ctm_address, l1_provider.clone());
+    let l1_ctm = IChainTypeManagerAbi::new(l1_ctm_address, l1_provider.clone());
 
     let current_sl_from_l1 = l1_bridgehub
         .settlement_layer(l2_chain_id.into())
@@ -377,7 +377,7 @@ pub(crate) async fn get_gateway_migration_state(
 
 async fn get_latest_notification_event_from_l1(
     l2_chain_id: u64,
-    l1_ctm: ChainTypeManagerAbi<Provider<Http>>,
+    l1_ctm: IChainTypeManagerAbi<Provider<Http>>,
     l1_provider: Arc<Provider<Http>>,
 ) -> anyhow::Result<Option<GatewayMigrationNotification>> {
     logger::info("Searching for the latest migration notifications...");

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

@@ -3,6 +3,8 @@ use std::{path::Path, sync::Arc};
 use anyhow::Context;
 use clap::Parser;
 use ethers::{
+    abi::parse_abi,
+    contract::Contract,
     prelude::Http,
     providers::{Middleware, Provider},
 };
@@ -19,7 +21,7 @@ use super::{
     messages::message_for_gateway_migration_progress_state,
 };
 use crate::{
-    abi::{BridgehubAbi, ChainTypeManagerAbi, ValidatorTimelockAbi, ZkChainAbi},
+    abi::{BridgehubAbi, IChainTypeManagerAbi, ValidatorTimelockAbi, ZkChainAbi},
     admin_functions::{
         admin_l1_l2_tx, enable_validator_via_gateway, finalize_migrate_to_gateway,
         set_da_validator_pair_via_gateway, AdminScriptMode, AdminScriptOutput,
@@ -133,7 +135,7 @@ impl MigrateToGatewayConfig {
             );
         }
 
-        let gw_ctm = ChainTypeManagerAbi::new(ctm_gw_address, gw_provider.clone());
+        let gw_ctm = IChainTypeManagerAbi::new(ctm_gw_address, gw_provider.clone());
         let gw_ctm_protocol_version = gw_ctm.protocol_version().await?;
         if gw_ctm_protocol_version != protocol_version {
             // The migration would fail anyway since CTM has checks to ensure that the protocol version is the same
@@ -240,27 +242,35 @@ pub(crate) async fn get_migrate_to_gateway_calls(
         result.extend(da_validator_encoding_result.calls.into_iter());
     }
 
-    let is_validator_enabled =
-        if get_minor_protocol_version(context.protocol_version)?.is_pre_interop_fast_blocks() {
-            // In previous versions, we need to check if the validator is enabled
-            context
-                .gw_validator_timelock
-                .validators(context.l2_chain_id.into(), context.validator)
-                .await?
-        } else {
-            context
-                .gw_validator_timelock
-                .has_role_for_chain_id(
-                    context.l2_chain_id.into(),
-                    context
-                        .gw_validator_timelock
-                        .committer_role()
-                        .call()
-                        .await?,
-                    context.validator,
-                )
-                .await?
-        };
+    let is_validator_enabled = if get_minor_protocol_version(context.protocol_version)?
+        .is_pre_interop_fast_blocks()
+    {
+        // In previous versions, we need to check if the validator is enabled
+        let legacy_validator_timelock = Contract::new(
+                context.gw_validator_timelock_addr,
+                parse_abi(&[
+                    "function validators(uint256 _chainId, address _validator) external view returns (bool)",
+                ])?,
+                context.gw_provider.clone(),
+            );
+        legacy_validator_timelock
+            .method::<_, bool>("validators", (context.l2_chain_id, context.validator))?
+            .call()
+            .await?
+    } else {
+        context
+            .gw_validator_timelock
+            .has_role_for_chain_id(
+                context.l2_chain_id.into(),
+                context
+                    .gw_validator_timelock
+                    .committer_role()
+                    .call()
+                    .await?,
+                context.validator,
+            )
+            .await?
+    };
 
     // 4. If validator is not yet present, please include.
     if !is_validator_enabled {

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

@@ -10,7 +10,7 @@ use zkstack_cli_common::{
 use zkstack_cli_config::forge_interface::script_params::ENABLE_EVM_EMULATOR_PARAMS;
 
 use crate::{
-    abi::ENABLEEVMEMULATORABI_ABI,
+    abi::IENABLEEVMEMULATORABI_ABI,
     messages::MSG_ENABLING_EVM_EMULATOR,
     utils::forge::{check_the_balance, fill_forge_private_key, WalletOwner},
 };
@@ -24,7 +24,7 @@ pub async fn enable_evm_emulator(
     forge_args: &ForgeScriptArgs,
     l1_rpc_url: String,
 ) -> anyhow::Result<()> {
-    let enable_evm_emulator_contract = BaseContract::from(ENABLEEVMEMULATORABI_ABI.clone());
+    let enable_evm_emulator_contract = BaseContract::from(IENABLEEVMEMULATORABI_ABI.clone());
     let calldata = enable_evm_emulator_contract
         .encode("chainAllowEvmEmulation", (admin, target_address))
         .unwrap();

zkstack_cli/crates/zkstack/src/enable_evm_emulator.rs

@@ -6,7 +6,7 @@ use zksync_basic_types::{
 };
 use zksync_system_constants::{L2_BRIDGEHUB_ADDRESS, L2_CHAIN_ASSET_HANDLER_ADDRESS};
 
-use crate::{abi::ChainTypeManagerAbi, utils::protocol_version::get_minor_protocol_version};
+use crate::{abi::IChainTypeManagerAbi, utils::protocol_version::get_minor_protocol_version};
 
 pub(crate) fn apply_l1_to_l2_alias(addr: Address) -> Address {
     let offset: Address = "1111000000000000000000000000000000001111".parse().unwrap();
@@ -22,7 +22,7 @@ pub(crate) async fn precompute_chain_address_on_gateway(
     new_l2_admin: Address,
     protocol_version: U256,
     gateway_diamond_cut: Vec<u8>,
-    gw_ctm: ChainTypeManagerAbi<Provider<ethers::providers::Http>>,
+    gw_ctm: IChainTypeManagerAbi<Provider<ethers::providers::Http>>,
 ) -> anyhow::Result<Address> {
     let ctm_data = encode(&[
         Token::FixedBytes(base_token_asset_id.0.into()),