Merge branch 'sync-layer-stable' of github.com:matter-labs/zksync-era…

… into kl/more-system-contracts-support

.github/workflows/check-spelling.yml

@@ -37,6 +37,6 @@ jobs:
         run: |
           ci_run zk
 
-      - name: Run spellcheck
-        run: |
-          ci_run zk spellcheck
+#       - name: Run spellcheck
+#         run: |
+#           ci_run zk spellcheck

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

@@ -29,6 +29,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db setup
 
       # This does both linting and "building". We're using `zk lint prover` as it's common practice within our repo

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

@@ -28,6 +28,7 @@ jobs:
       - name: Setup db
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db migrate
 
       - name: Lints

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

@@ -60,6 +60,7 @@ jobs:
       - name: Init
         run: |
           ci_run zk
+          ci_run run_retried rustup show
           ci_run zk db setup
 
       - name: Prover unit tests

.github/workflows/ci-zk-toolbox-reusable.yml

@@ -78,24 +78,24 @@ jobs:
           ci_localnet_up
           ci_run sccache --start-server
 
-      - name: Initialize ecosystem
-        run: |
-          ci_run zk_inception ecosystem init --deploy-paymaster --deploy-erc20 \
-          --deploy-ecosystem --l1-rpc-url=http://reth:8545 \
-          --server-db-url=postgres://postgres:notsecurepassword@postgres:5432 \
-          --server-db-name=zksync_server_localhost_era \
-          --prover-db-url=postgres://postgres:notsecurepassword@postgres:5432 \
-          --prover-db-name=zksync_prover_localhost_era \
-          --ignore-prerequisites --verbose
-
-      - name: Run server
-        run: |
-          ci_run zk_inception server --ignore-prerequisites -a --use-node-framework --verbose &>server.log &
-          ci_run sleep 5
-
-      - name: Run integration tests
-        run: |
-          ci_run zk_supervisor integration-tests --ignore-prerequisites --verbose
+      # - name: Initialize ecosystem
+      #   run: |
+      #     ci_run zk_inception ecosystem init --deploy-paymaster --deploy-erc20 \
+      #     --deploy-ecosystem --l1-rpc-url=http://reth:8545 \
+      #     --server-db-url=postgres://postgres:notsecurepassword@postgres:5432 \
+      #     --server-db-name=zksync_server_localhost_era \
+      #     --prover-db-url=postgres://postgres:notsecurepassword@postgres:5432 \
+      #     --prover-db-name=zksync_prover_localhost_era \
+      #     --ignore-prerequisites --verbose
+
+      # - name: Run server
+      #   run: |
+      #     ci_run zk_inception server --ignore-prerequisites -a --use-node-framework --verbose &>server.log &
+      #     ci_run sleep 5
+
+      # - name: Run integration tests
+        # run: |
+        #   ci_run zk_supervisor integration-tests --ignore-prerequisites --verbose
 
       - name: Show server.log logs
         if: always()

.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:

.github/workflows/protobuf.yaml

@@ -36,43 +36,43 @@ jobs:
       - uses: mozilla-actions/sccache-action@v0.0.3
 
       # 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@v1
-        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@v1
+  #       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'

.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
@@ -68,6 +71,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/*