feat: Kl/interop support

.github/scripts/interop.sh

@@ -0,0 +1,40 @@
+sudo rm -rf ./volumes && zk_supervisor clean containers && zk_inception up -o false
+
+zk_inception 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 \
+            --prover-db-url=postgres://postgres:notsecurepassword@localhost:5432 \
+            --prover-db-name=zksync_prover_localhost_era \
+            --ignore-prerequisites --observability=false --skip-submodules-checkout \
+            --chain era # --no-port-reallocation
+            # --skip-contract-compilation-override \
+
+zk_inception chain create \
+        --chain-name second \
+        --chain-id 505 \
+        --prover-mode no-proofs \
+        --wallet-creation localhost \
+        --l1-batch-commit-data-generator-mode rollup \
+        --base-token-address 0x0000000000000000000000000000000000000001 \
+        --base-token-price-nominator 1 \
+        --base-token-price-denominator 1 \
+        --set-as-default false \
+        --ignore-prerequisites --skip-submodules-checkout --skip-contract-compilation-override
+
+zk_inception chain init \
+            --deploy-paymaster \
+            --l1-rpc-url=http://localhost:8545 \
+            --server-db-url=postgres://postgres:notsecurepassword@localhost:5432 \
+            --server-db-name=zksync_server_localhost_gateway \
+            --prover-db-url=postgres://postgres:notsecurepassword@localhost:5432 \
+            --prover-db-name=zksync_prover_localhost_gateway \
+            --chain second --skip-submodules-checkout --no-port-reallocation
+
+zk_inception server --ignore-prerequisites --chain era &> ./rollup.log & 
+
+zk_inception server --ignore-prerequisites --chain second &> ./second.log & 
+
+# sleep 20
+
+# zk_supervisor test integration -t "Interop" --no-deps --ignore-prerequisites --chain era

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

@@ -349,6 +349,109 @@ jobs:
           wait $PID2
           wait $PID3
 
+  interop: 
+    name: Interop (consensus=false, base_token="Eth", sync_layer = false)
+    strategy:
+      # In matrix jobs, fail-fast is true by default.
+      # To be consistent with the rest of the workflow we disable it explicitly.
+      fail-fast: false
+      matrix:
+        # FIXME: support consensus tests for SL migration
+        consensus: [false]
+        # FIXME: support custom tokens
+        base_token: ["Eth"]
+        # FIXME: run tests even when not using synclayer
+        sync_layer: [true]
+    env:
+      SERVER_COMPONENTS: "api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads"
+
+    runs-on: [matterlabs-ci-runner]
+    steps:
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        with:
+          submodules: "recursive"
+          fetch-depth: 0
+
+      - name: Setup environment
+        run: |
+          echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
+          echo $(pwd)/bin >> $GITHUB_PATH
+          echo IN_DOCKER=1 >> .env
+          echo RUN_CONTRACT_VERIFICATION_TEST=true >> .env
+          echo ZKSYNC_DEBUG_LOGS=true >> .env
+
+      - name: Download zksolc/solc and zkvyper/vyper
+        run: |
+          sudo apt update && sudo apt install wget -y
+
+          mkdir -p $(pwd)/etc/solc-bin/0.8.23
+          wget https://github.com/ethereum/solc-bin/raw/gh-pages/linux-amd64/solc-linux-amd64-v0.8.23%2Bcommit.f704f362
+          mv solc-linux-amd64-v0.8.23+commit.f704f362 $(pwd)/etc/solc-bin/0.8.23/solc
+          chmod +x $(pwd)/etc/solc-bin/0.8.23/solc
+
+          mkdir -p $(pwd)/etc/solc-bin/zkVM-0.8.23-1.0.0
+          wget https://github.com/matter-labs/era-solidity/releases/download/0.8.23-1.0.0/solc-linux-amd64-0.8.23-1.0.0 -O $(pwd)/etc/solc-bin/zkVM-0.8.23-1.0.0/solc
+          chmod +x $(pwd)/etc/solc-bin/zkVM-0.8.23-1.0.0/solc
+
+          mkdir -p $(pwd)/etc/zksolc-bin/v1.3.21
+          wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.21
+          mv zksolc-linux-amd64-musl-v1.3.21 $(pwd)/etc/zksolc-bin/v1.3.21/zksolc
+          chmod +x $(pwd)/etc/zksolc-bin/v1.3.21/zksolc
+
+          mkdir -p $(pwd)/etc/vyper-bin/0.3.10
+          wget -O vyper0.3.10 https://github.com/vyperlang/vyper/releases/download/v0.3.10/vyper.0.3.10%2Bcommit.91361694.linux
+          mv vyper0.3.10 $(pwd)/etc/vyper-bin/0.3.10/vyper
+          chmod +x $(pwd)/etc/vyper-bin/0.3.10/vyper
+
+          mkdir -p $(pwd)/etc/zkvyper-bin/v1.3.13
+          wget https://github.com/matter-labs/zkvyper-bin/raw/main/linux-amd64/zkvyper-linux-amd64-musl-v1.3.13
+          mv zkvyper-linux-amd64-musl-v1.3.13 $(pwd)/etc/zkvyper-bin/v1.3.13/zkvyper
+          chmod +x $(pwd)/etc/zkvyper-bin/v1.3.13/zkvyper
+
+      - name: Start services
+        run: |
+          ci_localnet_up
+          ci_run pre_download_compilers.sh
+          ci_run sccache --start-server
+
+      - name: Init
+        run: |
+          ci_run git config --global --add safe.directory /usr/src/zksync
+          ci_run git config --global --add safe.directory /usr/src/zksync/sdk/binaryen
+          ci_run git config --global --add safe.directory /usr/src/zksync/contracts/system-contracts
+          ci_run git config --global --add safe.directory /usr/src/zksync/contracts
+          ci_run zk
+          ci_run run_retried rustup show
+          ci_run zk config compile
+          ci_run zk init ${{ matrix.base_token == 'Custom' && '--base-token-name BAT' || ''}} ${{ matrix.deployment_mode == 'Validium' && '--validium-mode' || ''}}
+
+      # `sleep 5` because we need to wait until server started properly
+      - name: Run server
+        run: |
+          ci_run zk server --use-node-framework --components=$SERVER_COMPONENTS &>server.log &
+          ci_run sleep 5
+
+      - name: Run contract verifier
+        run: |
+          ci_run zk contract_verifier &>contract_verifier.log &
+          ci_run sleep 2
+
+      - name: Init second chain
+        run: |
+          ci_run zk env test-chain
+          ci_run zk config compile test-chain --diff 5
+          ci_run zk init hyper
+
+      - name: Run second server
+        run: |
+          ci_run zk server --use-node-framework --components=$SERVER_COMPONENTS &>server.log &
+          ci_run sleep 5
+
+      - name: Server integration tests
+        run: ci_run zk test i server
+
+
+
       - name: Upload logs
         uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         if: always()

Cargo.toml

@@ -83,7 +83,9 @@ members = [
 ]
 resolver = "2"
 
-exclude = []
+exclude = [
+    "contracts/system-contracts/bootloader/test_infra",
+]
 
 # for `perf` profiling
 [profile.perf]

chains/second/ZkStack.yaml

@@ -0,0 +1,14 @@
+id: 3
+name: second
+chain_id: 505
+prover_version: NoProofs
+configs: /Users/kalmanlajko/programming/zksync/tmp2/zksync-era/./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

chains/second/configs/contracts.yaml

@@ -0,0 +1,43 @@
+create2_factory_addr: 0xe441cf0795af14ddb9f7984da85cd36db1b8790d
+create2_factory_salt: 0x88923c4cbe9c208bdd041f7c19b2d0f7e16d312e3576f17934dd390b7a2c5cc5
+ecosystem_contracts:
+  bridgehub_proxy_addr: 0xf05aea6cd198a77da9ee3ea47d26cdcbfb3fde19
+  state_transition_proxy_addr: 0x45b36bb8104407fd994e4261208b838cb230accb
+  transparent_proxy_admin_addr: 0x8cdfcf26e9f7ae1c49111cd165f3ce5711601f49
+  stm_deployment_tracker_proxy_addr: 0x39490b0765545597619a2e8d6603932656902db9
+  validator_timelock_addr: 0xfad37d465138449737299da612b71bfb86041983
+  diamond_cut_data: 0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000cfeebf117657f8cacd70f57f6c0b2632775adb9d0000000000000000000000000000000000000000000000000000000000000d6000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000bc00000000000000000000000005f52b485277002800aa3b764177e9fdc0f51834600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000130e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000002878fe74000000000000000000000000000000000000000000000000000000003f42d5dd0000000000000000000000000000000000000000000000000000000041cf49bb000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf5000000000000000000000000000000000000000000000000000000006223258e0000000000000000000000000000000000000000000000000000000064b554ad0000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000b784610700000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000dd9eaca18ac93fa8d83924d7136557fefd7c6726000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002d06d49e5b000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000022c5cf230000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003408e470000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000039d7d4aa0000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005a59033500000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006a27e8b5000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da00000000000000000000000000000000000000000000000000000000946ebad100000000000000000000000000000000000000000000000000000000960dcf240000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c00000000000000000000000000000000000000000000000000000000000000000000000000000000401924984b5680a77d049d53a0d8537e1e44eafd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000b042901c70000000000000000000000000000000000000000000000000000000012f43dab00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f9000000000000000000000000000000000000000000000000000000007efda2ae00000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000d077255100000000000000000000000000000000000000000000000000000000ddcc9eec00000000000000000000000000000000000000000000000000000000e4948f4300000000000000000000000000000000000000000000000000000000e717bab7000000000000000000000000000000000000000000000000000000000000000000000000000000005df7d9b337021691050d6b2f9c74cf54fd9302bf00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000040f23da4300000000000000000000000000000000000000000000000000000000e12a61370000000000000000000000000000000000000000000000000000000098f8196200000000000000000000000000000000000000000000000000000000cf02827d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000004f7a9d1de7c84de2d546a7377c60ea454117ef410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100098504c365264e12aa9fdf10652e73dd7c8cbe9c3a3a045070f0277af80d0100055dbd629567931421dcebb4b38da3dab317ac5e0abacb7dedc14e3d033c00000000000000000000000000000000000000000000000000000000044aa200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b2800000000000000000000000003522467fbcd7d48d3b4da6428ac8728793cd074a
+  force_deployments_data: 0x0000000000000000000000000000000000000000000000000000000000000009000000000000000000000000000000000000000000000000000000000000010e00000000000000000000000007b06e9081e998c761c32ec7d56e449fd74f0fe3010000fd53068fc35c6a23fee067bcfd3fc0d880ba4f79d8b65aafbff02f305d000000000000000000000000be58a336a246b5f36154a5d73f958cfd852cdd3a000000000000000000000000000000000000000000000000000000000000006401000a1917cc40206afbcb59515fe12ac96056f008db6d01df958d4f289ff80501000535cb5d6c8221a56902072a3dde9ea4af3fa20b584fde6bd63c118694a9010005e3b9cc76d0a2402f5b32ed4e26c91b26c95e7ab8bdfb221bcd817f50d5010002eb7a16926de53a9e148cf3ab4720232541c8848e9b2535666354ef98660000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+  native_token_vault_addr: 0x94fd61f67f3362fd6980c2bd8989b1f93dd6eab4
+bridges:
+  erc20:
+    l1_address: 0x1561d571d3645266ea631884580bd8c5e634a5dd
+    l2_address: '0x0000000000000000000000000000000000010003'
+  shared:
+    l1_address: 0x07b06e9081e998c761c32ec7d56e449fd74f0fe3
+    l2_address: '0x0000000000000000000000000000000000010003'
+  l1_nullifier_addr: 0x4686a7279d56e6238b7884d8e41bdc39f84e311c
+l1:
+  default_upgrade_addr: 0x6d09ac6e0671c859ebea076346caa080820a587d
+  diamond_proxy_addr: 0x238b583e086e507c70ec60d60636e362f7467ea4
+  governance_addr: 0x8a9dc757f84f2323cfe0ff555ef29363f0f8cb9f
+  chain_admin_addr: 0xa6fba37e028416e514b769ad767d3264775e78a1
+  access_control_restriction_addr: 0x9be3e70228e06b02306a934cf17a8eb7c09b048b
+  chain_proxy_admin_addr: 0xfd285e11becbd6d81d32944947be1f97e321784f
+  multicall3_addr: 0x730a8c8fe82fb5d2b1b25bb7fa7cd73c1ef24009
+  verifier_addr: 0x4f7a9d1de7c84de2d546a7377c60ea454117ef41
+  validator_timelock_addr: 0xfad37d465138449737299da612b71bfb86041983
+  base_token_addr: '0x0000000000000000000000000000000000000001'
+  rollup_l1_da_validator_addr: 0x9da4f47faf710c629b8d3fecb156453edd7822b9
+  validium_l1_da_validator_addr: 0xd4b187f8d873e49f5ec81ec5b562f178e11a14e8
+  transaction_filterer_addr: '0x0000000000000000000000000000000000000000'
+l2:
+  testnet_paymaster_addr: 0x6d89cce5a8768668f4218a0b37cce5d234576a03
+  default_l2_upgrader: 0x318137d99e9c1140dfef5e8c008e94b87ea5e1b1
+  da_validator_addr: 0x8d223f4c39d5460ab3fc495a34e2559e1a4c1fd8
+  l2_native_token_vault_proxy_addr: '0x0000000000000000000000000000000000010004'
+  legacy_shared_bridge_addr: 0xfcce3dbc002cfb8254e0d2eb2517e337414ee80f
+  consensus_registry: 0x5397bac0d1fae531f32156300b27187c552d78f2
+  multicall3: 0x55f6f01d04a21e76cbd2de9d4a9ff6ee9f8893a6
+user_facing_bridgehub: 0xf05aea6cd198a77da9ee3ea47d26cdcbfb3fde19
+user_facing_diamond_proxy: 0x238b583e086e507c70ec60d60636e362f7467ea4

chains/second/configs/external_node.yaml

@@ -0,0 +1,8 @@
+l1_chain_id: 9
+l2_chain_id: 270
+l1_batch_commit_data_generator_mode: Rollup
+
+main_node_url: http://localhost:3050
+main_node_rate_limit_rps: 1000
+
+gateway_url: http://localhost:3052