feat: Kl/interop support

.github/scripts/interop.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# to use this properly comment out the section that fails the node if the bootloader has is wrong in genesis/src/lib.rs
+
+
+zkstack dev clean containers && zkstack up -o false
+zkstack dev contracts
+
+zkstack dev generate-genesis
+
+zkstack ecosystem init --dev --observability=false \
+    --update-submodules false
+
+zkstack chain convert-to-gateway --chain gateway --ignore-prerequisites
+zkstack server --ignore-prerequisites --chain gateway &> ./gateway.log & 
+
+zkstack server wait --ignore-prerequisites --verbose --chain gateway
+zkstack chain migrate-to-gateway --chain era --gateway-chain-name gateway
+zkstack chain migrate-to-gateway --chain second --gateway-chain-name gateway
+
+ zkstack server --ignore-prerequisites --chain era &> ./rollup.log &
+
+ zkstack server --ignore-prerequisites --chain second &> ./second.log &
+
+# sleep 20
+
+# zkstack dev test integration -t "Interop" --no-deps --ignore-prerequisites --chain era

.gitignore

@@ -110,7 +110,8 @@ prover/data/keys/plonk_setup_snark_data.bin
 
 # ZK Stack CLI
 chains/era/configs/*
-chains/gateway/*
+chains/second/configs/*
+chains/gateway/configs/*
 chains/avail/*
 configs/*
 era-observability/

chains/gateway/ZkStack.yaml

@@ -0,0 +1,15 @@
+id: 1
+name: gateway
+chain_id: 506
+prover_version: NoProofs
+configs: ./chains/gateway/configs/
+rocks_db_path: ./chains/gateway/db/
+external_node_config_path: null
+artifacts_path: ./chains/gateway/artifacts/
+l1_batch_commit_data_generator_mode: Rollup
+base_token:
+  address: '0x0000000000000000000000000000000000000001'
+  nominator: 1
+  denominator: 1
+wallet_creation: Localhost
+evm_emulator: false

chains/second/ZkStack.yaml

@@ -0,0 +1,15 @@
+id: 2
+name: second
+chain_id: 505
+prover_version: NoProofs
+configs: ./chains/second/configs/
+rocks_db_path: ./chains/second/db/
+external_node_config_path: null
+artifacts_path: ./chains/second/artifacts/
+l1_batch_commit_data_generator_mode: Rollup
+base_token:
+  address: '0x0000000000000000000000000000000000000001'
+  nominator: 1
+  denominator: 1
+wallet_creation: Localhost
+evm_emulator: false

core/bin/external_node/src/config/mod.rs

@@ -130,6 +130,7 @@ pub(crate) struct RemoteENConfig {
     pub l2_testnet_paymaster_addr: Option<Address>,
     pub l2_timestamp_asserter_addr: Option<Address>,
     pub l1_wrapped_base_token_store: Option<Address>,
+    pub l1_message_root_proxy_addr: Option<Address>,
     pub base_token_addr: Address,
     pub l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
     pub dummy_verifier: bool,
@@ -219,6 +220,10 @@ impl RemoteENConfig {
                 .map(|a| a.dummy_verifier)
                 .unwrap_or_default(),
             l2_timestamp_asserter_addr: timestamp_asserter_address,
+            l1_message_root_proxy_addr: ecosystem_contracts
+                .as_ref()
+                .map(|a| a.message_root_proxy_addr)
+                .flatten(),
         })
     }
 
@@ -243,6 +248,7 @@ impl RemoteENConfig {
             l1_wrapped_base_token_store: None,
             dummy_verifier: true,
             l2_timestamp_asserter_addr: None,
+            l1_message_root_proxy_addr: None,
         }
     }
 }
@@ -1497,6 +1503,7 @@ impl From<&ExternalNodeConfig> for InternalApiConfig {
             l1_bytecodes_supplier_addr: config.remote.l1_bytecodes_supplier_addr,
             l1_wrapped_base_token_store: config.remote.l1_wrapped_base_token_store,
             l1_bridgehub_proxy_addr: config.remote.l1_bridgehub_proxy_addr,
+            message_root_proxy_addr: config.remote.l1_message_root_proxy_addr,
             l1_state_transition_proxy_addr: config.remote.l1_state_transition_proxy_addr,
             l1_transparent_proxy_admin_addr: config.remote.l1_transparent_proxy_admin_addr,
             l1_diamond_proxy_addr: config.l1_diamond_proxy_address(),

core/bin/external_node/src/node_builder.rs

@@ -192,6 +192,8 @@ impl ExternalNodeBuilder {
             self.config.required.eth_client_url.clone(),
             self.config.required.gateway_chain_id,
             self.config.optional.gateway_url.clone(),
+            None,
+            None, // kl todo add dependency chains here
         );
         self.node.add_layer(query_eth_client_layer);
         Ok(self)

core/bin/genesis_generator/src/main.rs

@@ -22,7 +22,7 @@ use zksync_types::{
     protocol_version::ProtocolSemanticVersion, url::SensitiveUrl, ProtocolVersionId,
 };
 
-const DEFAULT_GENESIS_FILE_PATH: &str = "./etc/env/file_based/genesis.yaml";
+const DEFAULT_GENESIS_FILE_PATH: &str = "../etc/env/file_based/genesis.yaml";
 
 #[derive(Debug, Parser)]
 #[command(author = "Matter Labs", version, about = "Genesis config generator", long_about = None)]

core/bin/zksync_server/src/node_builder.rs

@@ -189,6 +189,8 @@ impl MainNodeBuilder {
                 .as_ref()
                 .map(|c| c.gateway_chain_id),
             eth_config.gateway_rpc_url,
+            eth_config.dependency_chain_id,
+            eth_config.dependency_chain_rpc_url,
         );
         self.node.add_layer(query_eth_client_layer);
         Ok(self)

core/lib/basic_types/src/protocol_version.rs

@@ -70,15 +70,17 @@ pub enum ProtocolVersionId {
     Version25,
     Version26,
     Version27,
+    Version28,
+    Version29,
 }
 
 impl ProtocolVersionId {
     pub const fn latest() -> Self {
-        Self::Version26
+        Self::Version28
     }
 
     pub const fn next() -> Self {
-        Self::Version27
+        Self::Version29
     }
 
     pub fn try_from_packed_semver(packed_semver: U256) -> Result<Self, String> {
@@ -124,6 +126,8 @@ impl ProtocolVersionId {
             ProtocolVersionId::Version25 => VmVersion::Vm1_5_0IncreasedBootloaderMemory,
             ProtocolVersionId::Version26 => VmVersion::VmGateway,
             ProtocolVersionId::Version27 => VmVersion::VmGateway,
+            ProtocolVersionId::Version28 => VmVersion::VmInterop,
+            ProtocolVersionId::Version29 => VmVersion::VmInterop,
         }
     }
 
@@ -153,6 +157,11 @@ impl ProtocolVersionId {
         self < &Self::Version27
     }
 
+    pub fn is_pre_interop(&self) -> bool {
+        // note fflonk version has not been merged yet
+        self < &Self::Version27
+    }
+
     pub fn is_1_4_0(&self) -> bool {
         self >= &ProtocolVersionId::Version18 && self < &ProtocolVersionId::Version20
     }
@@ -298,6 +307,8 @@ impl From<ProtocolVersionId> for VmVersion {
             ProtocolVersionId::Version25 => VmVersion::Vm1_5_0IncreasedBootloaderMemory,
             ProtocolVersionId::Version26 => VmVersion::VmGateway,
             ProtocolVersionId::Version27 => VmVersion::VmGateway,
+            ProtocolVersionId::Version28 => VmVersion::VmInterop,
+            ProtocolVersionId::Version29 => VmVersion::VmInterop,
         }
     }
 }

core/lib/basic_types/src/vm.rs

@@ -17,6 +17,7 @@ pub enum VmVersion {
     Vm1_5_0SmallBootloaderMemory,
     Vm1_5_0IncreasedBootloaderMemory,
     VmGateway,
+    VmInterop,
 }
 
 impl VmVersion {

core/lib/config/src/configs/contracts.rs

@@ -13,6 +13,7 @@ pub struct EcosystemContracts {
     // while on the server side for consistency with the conventions, where the prefix denotes
     // the location of the contracts we call it `l1_wrapped_base_token_store`
     pub l1_wrapped_base_token_store: Option<Address>,
+    pub message_root_proxy_addr: Option<Address>,
 }
 
 impl EcosystemContracts {
@@ -23,6 +24,7 @@ impl EcosystemContracts {
             transparent_proxy_admin_addr: Address::repeat_byte(0x15),
             l1_bytecodes_supplier_addr: Some(Address::repeat_byte(0x16)),
             l1_wrapped_base_token_store: Some(Address::repeat_byte(0x17)),
+            message_root_proxy_addr: Some(Address::repeat_byte(0x18)),
         }
     }
 }

core/lib/config/src/configs/secrets.rs

@@ -1,5 +1,5 @@
 use anyhow::Context;
-use zksync_basic_types::{secrets::APIKey, url::SensitiveUrl};
+use zksync_basic_types::{secrets::APIKey, url::SensitiveUrl, SLChainId};
 
 use crate::configs::{
     consensus::ConsensusSecrets,
@@ -17,6 +17,8 @@ pub struct DatabaseSecrets {
 pub struct L1Secrets {
     pub l1_rpc_url: SensitiveUrl,
     pub gateway_rpc_url: Option<SensitiveUrl>,
+    pub dependency_chain_rpc_url: Option<SensitiveUrl>,
+    pub dependency_chain_id: Option<SLChainId>,
 }
 
 #[derive(Debug, Clone, PartialEq)]

core/lib/config/src/testonly.rs

@@ -763,6 +763,7 @@ impl Distribution<configs::EcosystemContracts> for EncodeDist {
             transparent_proxy_admin_addr: rng.gen(),
             l1_bytecodes_supplier_addr: rng.gen(),
             l1_wrapped_base_token_store: rng.gen(),
+            message_root_proxy_addr: rng.gen(),
         }
     }
 }
@@ -860,6 +861,10 @@ impl Distribution<configs::secrets::L1Secrets> for EncodeDist {
         L1Secrets {
             l1_rpc_url: format!("localhost:{}", rng.gen::<u16>()).parse().unwrap(),
             gateway_rpc_url: Some(format!("localhost:{}", rng.gen::<u16>()).parse().unwrap()),
+            dependency_chain_rpc_url: Some(
+                format!("localhost:{}", rng.gen::<u16>()).parse().unwrap(),
+            ),
+            dependency_chain_id: Some(SLChainId(rng.gen())),
         }
     }
 }

core/lib/constants/src/contracts.rs

@@ -179,6 +179,40 @@ pub const L2_WRAPPED_BASE_TOKEN_IMPL: Address = H160([
     0x00, 0x01, 0x00, 0x07,
 ]);
 
+pub const L2_INTEROP_CENTER_ADDRESS: Address = H160([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x08,
+]);
+pub const L2_INTEROP_HANDLER_ADDRESS: Address = H160([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x09,
+]);
+
+pub const INTEROP_ACCOUNT_ADDRESS: Address = H160([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x0a,
+]);
+
+pub const L2_MESSAGE_ROOT_STORAGE_ADDRESS: Address = H160([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x0b,
+]);
+
+pub const L2_MESSAGE_VERIFICATION_ADDRESS: Address = H160([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x0c,
+]);
+
+pub const L2_STANDARD_TRIGGER_ACCOUNT_ADDRESS: Address = H160([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x0d,
+]);
+
+pub const L2_ASSET_TRACKER_ADDRESS: Address = H160([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x01, 0x00, 0x0e,
+]);
+
 pub const ERC20_TRANSFER_TOPIC: H256 = H256([
     221, 242, 82, 173, 27, 226, 200, 155, 105, 194, 176, 104, 252, 55, 141, 170, 149, 43, 167, 241,
     99, 196, 161, 22, 40, 245, 90, 77, 245, 35, 179, 239,

core/lib/contracts/src/lib.rs

@@ -285,7 +285,7 @@ pub fn read_bytecode_from_path(
 }
 
 pub fn read_sys_contract_bytecode(directory: &str, name: &str, lang: ContractLanguage) -> Vec<u8> {
-    DEFAULT_SYSTEM_CONTRACTS_REPO.read_sys_contract_bytecode(directory, name, lang)
+    DEFAULT_SYSTEM_CONTRACTS_REPO.read_sys_contract_bytecode(directory, name, None, lang)
 }
 
 static DEFAULT_SYSTEM_CONTRACTS_REPO: Lazy<SystemContractsRepo> =
@@ -313,6 +313,7 @@ impl SystemContractsRepo {
         &self,
         directory: &str,
         name: &str,
+        object_name: Option<&str>,
         lang: ContractLanguage,
     ) -> Vec<u8> {
         match lang {
@@ -337,13 +338,17 @@ impl SystemContractsRepo {
                 // easily get rid of the old lookup, because old foundry-zksync is compiled into `zk_environment`
                 // image. Once `foundry-zksync` is updated to at least 0.0.4, we can remove folder names from the
                 // `SYSTEM_CONTRACT_LIST` for yul contracts and merge two lookups below.
+                // in foundry-zksync starting from 0.0.8 json file name corresponds to the object inside the yul component
+                let object_name = object_name.unwrap_or(name);
                 let possible_paths = [
                     self.root.join(format!("zkout/{0}.yul/{0}.json", name)),
                     self.root
                         .join(format!("zkout/{0}{1}.yul/{1}.json", directory, name)),
                     self.root.join(format!(
                         "zkout/{name}.yul/contracts-preprocessed/{directory}/{name}.yul.json",
                     )),
+                    self.root
+                        .join(format!("zkout/{name}.yul/{object_name}.json",)),
                 ];
 
                 for path in &possible_paths {
@@ -384,7 +389,12 @@ impl SystemContractsRepo {
 }
 
 pub fn read_bootloader_code(bootloader_type: &str) -> Vec<u8> {
-    read_sys_contract_bytecode("bootloader", bootloader_type, ContractLanguage::Yul)
+    DEFAULT_SYSTEM_CONTRACTS_REPO.read_sys_contract_bytecode(
+        "bootloader",
+        bootloader_type,
+        Some("Bootloader"),
+        ContractLanguage::Yul,
+    )
 }
 
 /// Reads zbin bytecode from a given path, relative to workspace location.
@@ -553,6 +563,12 @@ impl BaseSystemContracts {
         BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
     }
 
+    pub fn playground_interop() -> Self {
+        let bootloader_bytecode: Vec<u8> = read_bootloader_code("playground_batch");
+        // kl todo once contracts are stabilized move to etc/multivm
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
+    }
+
     pub fn estimate_gas_pre_virtual_blocks() -> Self {
         let bootloader_bytecode = read_zbin_bytecode(
             "etc/multivm_bootloaders/vm_1_3_2/fee_estimate.yul/fee_estimate.yul.zbin",
@@ -630,6 +646,11 @@ impl BaseSystemContracts {
         BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
     }
 
+    pub fn estimate_gas_interop() -> Self {
+        let bootloader_bytecode = read_bootloader_code("fee_estimate");
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode)
+    }
+
     pub fn hashes(&self) -> BaseSystemContractsHashes {
         BaseSystemContractsHashes {
             bootloader: self.bootloader.hash,