chore: kl/medium-interop CI fixes

.github/workflows/ci-core-reusable.yml

@@ -175,6 +175,18 @@ jobs:
       - name: Setup Environment
         uses: ./.github/actions/setup-env
 
+      # TODO: Remove once merged into main
+      - name: (TEMPORARY) Update foundry
+        run: |
+          ci_run curl -LO https://github.com/matter-labs/foundry-zksync/releases/download/foundry-zksync-v0.0.26/foundry_zksync_v0.0.26_linux_amd64.tar.gz
+          ci_run mkdir ./foundry-temp
+          ci_run tar zxf foundry_zksync_v0.0.26_linux_amd64.tar.gz -C ./foundry-temp
+          ci_run cp ./foundry-temp/forge /usr/local/cargo/bin/forge
+          ci_run cp ./foundry-temp/cast /usr/local/cargo/bin/cast
+          echo "Foundry version after update:"
+          ci_run forge --version
+          ci_run rm -rf ./foundry-temp foundry_zksync_v0.0.26_linux_amd64.tar.gz
+
       - name: Build test dependencies
         run: |
           ci_run zkstack dev test build
@@ -262,6 +274,13 @@ jobs:
           ci_run zkstack contract-verifier run --chain era &> ${{ env.SERVER_LOGS_DIR }}/contract-verifier-rollup.log &
           ci_run zkstack contract-verifier wait --chain era --verbose
 
+      - name: Check permissions
+        run: |
+          whoami
+          pwd
+          touch testfile
+          ls -l testfile
+
       - name: Run tests
         run: |
           ci_run yarn highlevel-test-tools test

.gitignore

@@ -119,6 +119,7 @@ transactions/
 
 # foundry-zksync
 install
+out
 
 
 .format_sql_snapshot

bin/build_and_init_ecosystem

@@ -23,7 +23,16 @@ initialize_ecosystem() {
     --server-db-url=postgres://postgres:notsecurepassword@localhost:5432 \
     --server-db-name=zksync_server_localhost_era \
     --ignore-prerequisites --verbose \
+    --observability=false || true
+  zkstack dev generate-genesis
+  zkstack ecosystem init \
+    --deploy-paymaster --deploy-erc20 --deploy-ecosystem \
+    --l1-rpc-url=http://localhost:8545 \
+    --server-db-url=postgres://postgres:notsecurepassword@localhost:5432 \
+    --server-db-name=zksync_server_localhost_era \
+    --ignore-prerequisites --verbose \
     --observability=false
+
   echo "[initialize_ecosystem] finished"
 }
 

core/bin/snapshots_creator/src/tests.rs

@@ -197,7 +197,13 @@ async fn create_l1_batch(
     l1_batch_number: L1BatchNumber,
     logs_for_initial_writes: &[StorageLog],
 ) {
-    let header = L1BatchHeader::new(l1_batch_number, 0, Default::default(), Default::default());
+    let header = L1BatchHeader::new(
+        l1_batch_number,
+        0,
+        Default::default(),
+        Default::default(),
+        SettlementLayer::for_tests(),
+    );
     conn.blocks_dal()
         .insert_mock_l1_batch(&header)
         .await

core/bin/system-constants-generator/src/utils.rs

@@ -22,11 +22,12 @@ use zksync_multivm::{
 };
 use zksync_types::{
     block::L2BlockHasher, bytecode::BytecodeHash, ethabi::Token, fee::Fee,
-    fee_model::BatchFeeInput, l1::L1Tx, l2::L2Tx, u256_to_h256, utils::storage_key_for_eth_balance,
-    AccountTreeId, Address, Execute, K256PrivateKey, L1BatchNumber, L1TxCommonData, L2BlockNumber,
-    L2ChainId, Nonce, ProtocolVersionId, StorageKey, Transaction, BOOTLOADER_ADDRESS,
-    SYSTEM_CONTEXT_ADDRESS, SYSTEM_CONTEXT_GAS_PRICE_POSITION, SYSTEM_CONTEXT_TX_ORIGIN_POSITION,
-    U256, ZKPORTER_IS_AVAILABLE,
+    fee_model::BatchFeeInput, l1::L1Tx, l2::L2Tx, settlement::SettlementLayer, u256_to_h256,
+    utils::storage_key_for_eth_balance, AccountTreeId, Address, Execute, K256PrivateKey,
+    L1BatchNumber, L1TxCommonData, L2BlockNumber, L2ChainId, Nonce, ProtocolVersionId, SLChainId,
+    StorageKey, Transaction, BOOTLOADER_ADDRESS, SYSTEM_CONTEXT_ADDRESS,
+    SYSTEM_CONTEXT_GAS_PRICE_POSITION, SYSTEM_CONTEXT_TX_ORIGIN_POSITION, U256,
+    ZKPORTER_IS_AVAILABLE,
 };
 
 use crate::intrinsic_costs::VmSpentResourcesResult;
@@ -192,6 +193,7 @@ fn default_l1_batch() -> L1BatchEnv {
             max_virtual_blocks_to_create: 100,
             interop_roots: vec![],
         },
+        settlement_layer: SettlementLayer::L1(SLChainId(1)),
     }
 }
 

core/lib/basic_types/src/protocol_version.rs

@@ -131,9 +131,10 @@ impl ProtocolVersionId {
             ProtocolVersionId::Version27 => VmVersion::VmEvmEmulator,
             ProtocolVersionId::Version28 => VmVersion::VmEcPrecompiles,
             ProtocolVersionId::Version29 => VmVersion::VmInterop,
-            ProtocolVersionId::Version30 => VmVersion::VmInterop,
+            ProtocolVersionId::Version30 => VmVersion::VmMediumInterop,
+
             // Speculative VM version for the next protocol version to be used in the upgrade integration test etc.
-            ProtocolVersionId::Version31 => VmVersion::VmInterop,
+            ProtocolVersionId::Version31 => VmVersion::VmMediumInterop,
         }
     }
 
@@ -171,6 +172,10 @@ impl ProtocolVersionId {
         self < &Self::Version29
     }
 
+    pub fn is_pre_medium_interop(&self) -> bool {
+        self < &Self::Version30
+    }
+
     pub fn is_1_4_0(&self) -> bool {
         self >= &ProtocolVersionId::Version18 && self < &ProtocolVersionId::Version20
     }
@@ -207,10 +212,6 @@ impl ProtocolVersionId {
         self >= &ProtocolVersionId::Version23
     }
 
-    pub fn is_pre_medium_interop(&self) -> bool {
-        self < &ProtocolVersionId::Version30
-    }
-
     pub const fn gateway_upgrade() -> Self {
         ProtocolVersionId::Version26
     }
@@ -322,9 +323,9 @@ impl From<ProtocolVersionId> for VmVersion {
             ProtocolVersionId::Version27 => VmVersion::VmEvmEmulator,
             ProtocolVersionId::Version28 => VmVersion::VmEcPrecompiles,
             ProtocolVersionId::Version29 => VmVersion::VmInterop,
-            ProtocolVersionId::Version30 => VmVersion::VmInterop,
+            ProtocolVersionId::Version30 => VmVersion::VmMediumInterop,
             // Speculative VM version for the next protocol version to be used in the upgrade integration test etc.
-            ProtocolVersionId::Version31 => VmVersion::VmInterop,
+            ProtocolVersionId::Version31 => VmVersion::VmMediumInterop,
         }
     }
 }

core/lib/basic_types/src/vm.rs

@@ -20,6 +20,7 @@ pub enum VmVersion {
     VmEvmEmulator,
     VmEcPrecompiles,
     VmInterop,
+    VmMediumInterop,
 }
 
 impl VmVersion {

core/lib/constants/src/contracts.rs

@@ -206,6 +206,26 @@ pub const L2_CHAIN_ASSET_HANDLER_ADDRESS: Address = H160([
     0x00, 0x01, 0x00, 0x0a,
 ]);
 
+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, 0x0b,
+]);
+
+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, 0x0c,
+]);
+
+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, 0x0d,
+]);
+
+pub const GW_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

@@ -653,6 +653,12 @@ impl BaseSystemContracts {
         BaseSystemContracts::load_with_bootloader(bootloader_bytecode, true)
     }
 
+    pub fn playground_medium_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, true)
+    }
+
     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",
@@ -751,6 +757,11 @@ impl BaseSystemContracts {
         BaseSystemContracts::load_with_bootloader(bootloader_bytecode, true)
     }
 
+    pub fn estimate_gas_medium_interop() -> Self {
+        let bootloader_bytecode = read_bootloader_code("fee_estimate");
+        BaseSystemContracts::load_with_bootloader(bootloader_bytecode, true)
+    }
+
     pub fn hashes(&self) -> BaseSystemContractsHashes {
         BaseSystemContractsHashes {
             bootloader: self.bootloader.hash,