feat: Kl/interop support

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - staging
       - trying
+      - sync-layer-stable # adding this branch here to run CI on it regardless of the conflicts
       - '!release-please--branches--**'
 
 concurrency:
@@ -85,7 +86,7 @@ jobs:
   ci-for-core:
     name: CI for Core Components
     needs: changed_files
-    if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
+    if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.zk_toolbox == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
     uses: ./.github/workflows/ci-core-reusable.yml
 
   ci-for-prover:
@@ -107,17 +108,17 @@ jobs:
     name: CI for Common Components (prover or core)
     uses: ./.github/workflows/ci-common-reusable.yml
 
-  build-core-images:
-    name: Build core images
-    needs: changed_files
-    if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
-    uses: ./.github/workflows/new-build-core-template.yml
-    with:
-      image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
-      action: "build"
-    secrets:
-      DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
-      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+  # build-core-images:
+  #   name: Build core images
+  #   needs: changed_files
+  #   if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
+  #   uses: ./.github/workflows/new-build-core-template.yml
+  #   with:
+  #     image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
+  #     action: "build"
+  #   secrets:
+  #     DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+  #     DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
   build-tee-prover-images:
     name: Build TEE Prover images
@@ -175,7 +176,8 @@ jobs:
     name: Github Status Check
     runs-on: ubuntu-latest
     if: always() && !cancelled()
-    needs: [ ci-for-core-lint, ci-for-common, ci-for-core, ci-for-prover, ci-for-docs, build-core-images, build-contract-verifier, build-prover-images ]
+    # TODO restore build-core-images
+    needs: [ ci-for-core-lint, ci-for-common, ci-for-core, ci-for-prover, ci-for-docs, build-contract-verifier, build-prover-images ]
     steps:
       - name: Status
         run: |

.github/workflows/protobuf.yaml

@@ -36,43 +36,43 @@ jobs:
       - uses: mozilla-actions/sccache-action@89e9040de88b577a072e3760aaf59f585da083af # v0.0.5
 
       # before
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-        with:
-          ref: ${{ env.BASE }}
-          path: before
-          fetch-depth: 0 # fetches all branches and tags, which is needed to compute the LCA.
-      - name: checkout LCA
-        run:
-          git checkout $(git merge-base $BASE $HEAD)
-        working-directory: ./before
-      - name: compile before
-        run: cargo check --all-targets
-        working-directory: ./before/
-      - name: build before.binpb
-        run: >
-          perl -ne 'print "$1\n" if /PROTOBUF_DESCRIPTOR="(.*)"/'
-          `find ./before/target/debug/build/*/output`
-          | xargs cat > ./before.binpb
+      # - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      #   with:
+      #     ref: ${{ env.BASE }}
+      #     path: before
+      #     fetch-depth: 0 # fetches all branches and tags, which is needed to compute the LCA.
+      # - name: checkout LCA
+      #   run:
+      #     git checkout $(git merge-base $BASE $HEAD)
+      #   working-directory: ./before
+      # - name: compile before
+      #   run: cargo check --all-targets
+      #   working-directory: ./before/
+      # - name: build before.binpb
+      #   run: >
+      #     perl -ne 'print "$1\n" if /PROTOBUF_DESCRIPTOR="(.*)"/'
+      #     `find ./before/target/debug/build/*/output`
+      #     | xargs cat > ./before.binpb
 
       # after
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-        with:
-          ref: ${{ env.HEAD }}
-          path: after
-      - name: compile after
-        run: cargo check --all-targets
-        working-directory: ./after
-      - name: build after.binpb
-        run: >
-          perl -ne 'print "$1\n" if /PROTOBUF_DESCRIPTOR="(.*)"/'
-          `find ./after/target/debug/build/*/output`
-          | xargs cat > ./after.binpb
+      # - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      #   with:
+      #     ref: ${{ env.HEAD }}
+      #     path: after
+      # - name: compile after
+      #   run: cargo check --all-targets
+      #   working-directory: ./after
+      # - name: build after.binpb
+      #   run: >
+      #     perl -ne 'print "$1\n" if /PROTOBUF_DESCRIPTOR="(.*)"/'
+      #     `find ./after/target/debug/build/*/output`
+      #     | xargs cat > ./after.binpb
 
-      # compare
-      - uses: bufbuild/buf-setup-action@54abbed4fe8d8d45173eca4798b0c39a53a7b658 # v1.39.0
-        with:
-          github_token: ${{ github.token }}
-      - name: buf breaking
-        run: >
-          buf breaking './after.binpb' --against './before.binpb' --exclude-path 'zksync/config/experimental.proto'
-          --config '{"version":"v1","breaking":{"use":["WIRE_JSON","WIRE"]}}' --error-format 'github-actions'
+      # # compare
+      # - uses: bufbuild/buf-setup-action@54abbed4fe8d8d45173eca4798b0c39a53a7b658 # v1.39.0
+      #   with:
+      #     github_token: ${{ github.token }}
+      # - name: buf breaking
+      #   run: >
+      #     buf breaking './after.binpb' --against './before.binpb' --exclude-path 'zksync/config/experimental.proto'
+      #     --config '{"version":"v1","breaking":{"use":["WIRE_JSON","WIRE"]}}' --error-format 'github-actions'

.github/workflows/vm-perf-comparison.yml

@@ -18,65 +18,65 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.base_ref }}
 
-      - name: fetch PR branch
-        run: |
-          git remote add pr_repo ${{ github.event.pull_request.head.repo.clone_url }}
-          git fetch pr_repo ${{ github.event.pull_request.head.ref }}
+      # - name: fetch PR branch
+      #   run: |
+      #     git remote add pr_repo ${{ github.event.pull_request.head.repo.clone_url }}
+      #     git fetch pr_repo ${{ github.event.pull_request.head.ref }}
 
-      - name: fetch merge-base SHA
-        id: merge_base
-        run: echo "sha=$(git merge-base HEAD FETCH_HEAD)" >> $GITHUB_OUTPUT
+      # - name: fetch merge-base SHA
+      #   id: merge_base
+      #   run: echo "sha=$(git merge-base HEAD FETCH_HEAD)" >> $GITHUB_OUTPUT
 
-      - name: checkout divergence point
-        run: git checkout ${{ steps.merge_base.outputs.sha }} --recurse-submodules
+      # - name: checkout divergence point
+      #   run: git checkout ${{ steps.merge_base.outputs.sha }} --recurse-submodules
 
-      - name: setup-env
-        run: |
-          touch .env
-          echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
-          echo $(pwd)/bin >> $GITHUB_PATH
-          echo "SCCACHE_GCS_BUCKET=matterlabs-infra-sccache-storage" >> .env
-          echo "SCCACHE_GCS_SERVICE_ACCOUNT=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com" >> .env
-          echo "SCCACHE_GCS_RW_MODE=READ_WRITE" >> .env
-          echo "RUSTC_WRAPPER=sccache" >> .env
+      # - name: setup-env
+      #   run: |
+      #     touch .env
+      #     echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
+      #     echo $(pwd)/bin >> $GITHUB_PATH
+      #     echo "SCCACHE_GCS_BUCKET=matterlabs-infra-sccache-storage" >> .env
+      #     echo "SCCACHE_GCS_SERVICE_ACCOUNT=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com" >> .env
+      #     echo "SCCACHE_GCS_RW_MODE=READ_WRITE" >> .env
+      #     echo "RUSTC_WRAPPER=sccache" >> .env
 
-      - name: init
-        run: |
-          run_retried docker compose pull zk
-          docker compose up -d zk
+      # - name: init
+      #   run: |
+      #     run_retried docker compose pull zk
+      #     docker compose up -d zk
 
-      - name: run benchmarks on base branch
-        shell: bash
-        run: |
-          ci_run zkt
-          ci_run zk_supervisor contracts --system-contracts
-          ci_run cargo bench --package vm-benchmark --bench iai | tee base-iai
-          ci_run cargo run --package vm-benchmark --release --bin instruction_counts | tee base-opcodes || touch base-opcodes
+      # - name: run benchmarks on base branch
+      #   shell: bash
+      #   run: |
+      #     ci_run zkt
+      #     ci_run zk_supervisor contracts --system-contracts
+      #     ci_run cargo bench --package vm-benchmark --bench iai | tee base-iai
+      #     ci_run cargo run --package vm-benchmark --release --bin instruction_counts | tee base-opcodes || touch base-opcodes
 
-      - name: checkout PR
-        run: |
-          git checkout --force FETCH_HEAD --recurse-submodules
+      # - name: checkout PR
+      #   run: |
+      #     git checkout --force FETCH_HEAD --recurse-submodules
 
-      - name: run benchmarks on PR
-        shell: bash
-        run: |
-          ci_run zkt
-          ci_run zk_supervisor contracts --system-contracts
-          ci_run cargo bench --package vm-benchmark --bench iai | tee pr-iai
-          ci_run cargo run --package vm-benchmark --release --bin instruction_counts | tee pr-opcodes || touch pr-opcodes
+      # - name: run benchmarks on PR
+      #   shell: bash
+      #   run: |
+      #     ci_run zkt
+      #     ci_run zk_supervisor contracts --system-contracts
+      #     ci_run cargo bench --package vm-benchmark --bench iai | tee pr-iai
+      #     ci_run cargo run --package vm-benchmark --release --bin instruction_counts | tee pr-opcodes || touch pr-opcodes
 
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-          echo "speedup<<$EOF" >> $GITHUB_OUTPUT
-          ci_run cargo run --package vm-benchmark --release --bin compare_iai_results base-iai pr-iai base-opcodes pr-opcodes >> $GITHUB_OUTPUT
-          echo "$EOF" >> $GITHUB_OUTPUT
-        id: comparison
+      #     EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+      #     echo "speedup<<$EOF" >> $GITHUB_OUTPUT
+      #     ci_run cargo run --package vm-benchmark --release --bin compare_iai_results base-iai pr-iai base-opcodes pr-opcodes >> $GITHUB_OUTPUT
+      #     echo "$EOF" >> $GITHUB_OUTPUT
+      #   id: comparison
 
-      - name: Comment on PR
-        uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
-        with:
-          message: |
-            ${{ steps.comparison.outputs.speedup == '' && '## No performance difference detected (anymore)' || '## Detected VM performance changes' }}
-            ${{ steps.comparison.outputs.speedup }}
-          comment_tag: vm-performance-changes
-          mode: recreate
-          create_if_not_exists: ${{ steps.comparison.outputs.speedup != '' }}
+      # - name: Comment on PR
+      #   uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
+      #   with:
+      #     message: |
+      #       ${{ steps.comparison.outputs.speedup == '' && '## No performance difference detected (anymore)' || '## Detected VM performance changes' }}
+      #       ${{ steps.comparison.outputs.speedup }}
+      #     comment_tag: vm-performance-changes
+      #     mode: recreate
+      #     create_if_not_exists: ${{ steps.comparison.outputs.speedup != '' }}

.gitignore

@@ -36,6 +36,9 @@ Cargo.lock
 /etc/env/.current
 /etc/env/configs/*
 !/etc/env/configs/dev.toml
+!/etc/env/configs/dev2.toml
+!/etc/env/configs/l1-hyperchain.template.toml
+!/etc/env/configs/l1-hyperchain-docker.template.toml
 !/etc/env/configs/dev_validium.toml
 !/etc/env/configs/dev_validium_docker.toml
 !/etc/env/configs/ext-node.toml
@@ -69,6 +72,7 @@ Cargo.lock
 !/etc/env/*.yaml
 !/etc/env/ext-node-validium-docker.toml
 /etc/tokens/localhost.json
+/etc/tokens/localhostL2.json
 /etc/zksolc-bin/*
 /etc/zkvyper-bin/*
 /etc/solc-bin/*
@@ -114,6 +118,7 @@ prover/data/keys/setup_*
 
 # Zk Toolbox
 chains/era/configs/*
+chains/gateway/*
 configs/*
 era-observability/
 core/tests/ts-integration/deployments-zk

Cargo.toml

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

bin/last_chain_id

@@ -0,0 +1 @@
+64