Merge branch 'main' into deniallugo-vm-interface

.dockerignore

@@ -1,6 +1,5 @@
 *
 !docker/prover/prover-entry.sh
-!docker/zk/entrypoint.sh
 !docker/local-node/entrypoint.sh
 !docker/external-node/entrypoint.sh
 !docker/contract-verifier/install-all-solc.sh

.github/release-please/manifest.json

@@ -1,6 +1,6 @@
 {
   "sdk/zksync-web3.js": "0.15.4",
   "sdk/zksync-rs": "0.4.0",
-  "core": "16.0.2",
+  "core": "16.2.0",
   "prover": "7.2.0"
 }

.github/workflows/build-core-template.yml

@@ -75,7 +75,7 @@ jobs:
         if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
         run: |
           ci_run docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
-          ci_run gcloud auth configure-docker us-docker.pkg.dev,asia-docker.pkg.dev -q
+          ci_run gcloud auth configure-docker us-docker.pkg.dev,asia-docker.pkg.dev,europe-docker.pkg.dev -q
 
       - name: update-images
         env:

.github/workflows/build-docker-from-tag.yml

@@ -76,6 +76,7 @@ jobs:
       setup_keys_id: 4989f12
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       push_asia: true
+      push_europe: true
 
   build-gar-prover-fri-gpu:
     name: Build GAR prover FRI GPU

.github/workflows/build-gar-reusable.yml

@@ -16,6 +16,11 @@ on:
         required: false
         default: false
         type: boolean
+      push_europe:
+        description: "Push images to EU GAR"
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   build-gar-prover:
@@ -79,3 +84,15 @@ jobs:
           docker buildx imagetools create \
             --tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-v2-gar:2.0-${{ inputs.image_tag_suffix }}-prover-${{ matrix.setup_keys.prover_id }}-${{ inputs.setup_keys_id }} \
             us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-v2-gar:2.0-${{ inputs.image_tag_suffix }}-prover-${{ matrix.setup_keys.prover_id }}-${{ inputs.setup_keys_id }}
+
+      - name: Login to EU GAR
+        if: "${{ inputs.push_europe }}"
+        run: |
+          gcloud auth print-access-token --lifetime=7200 --impersonate-service-account=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com | docker login -u oauth2accesstoken --password-stdin https://europe-docker.pkg.dev
+
+      - name: Push image to EU
+        if: "${{ inputs.push_europe }}"
+        run: |
+          docker buildx imagetools create \
+            --tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-v2-gar:2.0-${{ inputs.image_tag_suffix }}-prover-${{ matrix.setup_keys.prover_id }}-${{ inputs.setup_keys_id }} \
+            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-v2-gar:2.0-${{ inputs.image_tag_suffix }}-prover-${{ matrix.setup_keys.prover_id }}-${{ inputs.setup_keys_id }}

.github/workflows/build-prover-fri-gpu-gar.yml

@@ -44,3 +44,23 @@ jobs:
           push: true
           tags: |
             us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.image_tag_suffix }}
+
+      - name: Login to Asia GAR
+        run: |
+          gcloud auth print-access-token --lifetime=7200 --impersonate-service-account=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com | docker login -u oauth2accesstoken --password-stdin https://asia-docker.pkg.dev
+
+      - name: Build and push to Asia GAR
+        run: |
+          docker buildx imagetools create \
+            --tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.image_tag_suffix }} \
+            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.image_tag_suffix }}
+
+      - name: Login to Europe GAR
+        run: |
+          gcloud auth print-access-token --lifetime=7200 --impersonate-service-account=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com | docker login -u oauth2accesstoken --password-stdin https://europe-docker.pkg.dev
+
+      - name: Build and push to Europe GAR
+        run: |
+          docker buildx imagetools create \
+            --tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.image_tag_suffix }} \
+            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.image_tag_suffix }}

.github/workflows/build-prover-template.yml

@@ -90,7 +90,7 @@ jobs:
         if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/'))
         run: |
           ci_run docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
-          ci_run gcloud auth configure-docker us-docker.pkg.dev,asia-docker.pkg.dev -q
+          ci_run gcloud auth configure-docker us-docker.pkg.dev,asia-docker.pkg.dev,europe-docker.pkg.dev -q
 
       # We need to run this only when ERA_BELLMAN_CUDA_RELEASE is not available
       # In our case it happens only when PR is created from fork

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

@@ -33,7 +33,6 @@ jobs:
           ci_run zk db setup
           ci_run zk compiler all
           ci_run zk contract build
-          ci_run zk run yarn
 
       - name: Contracts unit tests
         run: ci_run zk test l1-contracts
@@ -119,20 +118,20 @@ jobs:
           mv solc-linux-amd64-v0.8.21+commit.d9974bed $(pwd)/etc/solc-bin/0.8.21/solc
           chmod +x $(pwd)/etc/solc-bin/0.8.21/solc
 
-          mkdir -p $(pwd)/etc/zksolc-bin/v1.3.14
-          wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.14
-          mv zksolc-linux-amd64-musl-v1.3.14 $(pwd)/etc/zksolc-bin/v1.3.14/zksolc
-          chmod +x $(pwd)/etc/zksolc-bin/v1.3.14/zksolc
+          mkdir -p $(pwd)/etc/zksolc-bin/v1.3.15
+          wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.15
+          mv zksolc-linux-amd64-musl-v1.3.15 $(pwd)/etc/zksolc-bin/v1.3.15/zksolc
+          chmod +x $(pwd)/etc/zksolc-bin/v1.3.15/zksolc
 
           mkdir -p $(pwd)/etc/vyper-bin/0.3.3
           wget -O vyper0.3.3 https://github.com/vyperlang/vyper/releases/download/v0.3.3/vyper.0.3.3%2Bcommit.48e326f0.linux
           mv vyper0.3.3 $(pwd)/etc/vyper-bin/0.3.3/vyper
           chmod +x $(pwd)/etc/vyper-bin/0.3.3/vyper
 
-          mkdir -p $(pwd)/etc/zkvyper-bin/v1.3.10
-          wget https://github.com/matter-labs/zkvyper-bin/raw/main/linux-amd64/zkvyper-linux-amd64-musl-v1.3.10
-          mv zkvyper-linux-amd64-musl-v1.3.10 $(pwd)/etc/zkvyper-bin/v1.3.10/zkvyper
-          chmod +x $(pwd)/etc/zkvyper-bin/v1.3.10/zkvyper
+          mkdir -p $(pwd)/etc/zkvyper-bin/v1.3.11
+          wget https://github.com/matter-labs/zkvyper-bin/raw/main/linux-amd64/zkvyper-linux-amd64-musl-v1.3.11
+          mv zkvyper-linux-amd64-musl-v1.3.11 $(pwd)/etc/zkvyper-bin/v1.3.11/zkvyper
+          chmod +x $(pwd)/etc/zkvyper-bin/v1.3.11/zkvyper
 
       - name: Start services
         run: |
@@ -217,20 +216,20 @@ jobs:
           mv solc-linux-amd64-v0.8.21+commit.d9974bed $(pwd)/etc/solc-bin/0.8.21/solc
           chmod +x $(pwd)/etc/solc-bin/0.8.21/solc
 
-          mkdir -p $(pwd)/etc/zksolc-bin/v1.3.14
-          wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.14
-          mv zksolc-linux-amd64-musl-v1.3.14 $(pwd)/etc/zksolc-bin/v1.3.14/zksolc
-          chmod +x $(pwd)/etc/zksolc-bin/v1.3.14/zksolc
+          mkdir -p $(pwd)/etc/zksolc-bin/v1.3.15
+          wget https://github.com/matter-labs/zksolc-bin/raw/main/linux-amd64/zksolc-linux-amd64-musl-v1.3.15
+          mv zksolc-linux-amd64-musl-v1.3.15 $(pwd)/etc/zksolc-bin/v1.3.15/zksolc
+          chmod +x $(pwd)/etc/zksolc-bin/v1.3.15/zksolc
 
           mkdir -p $(pwd)/etc/vyper-bin/0.3.3
           wget -O vyper0.3.3 https://github.com/vyperlang/vyper/releases/download/v0.3.3/vyper.0.3.3%2Bcommit.48e326f0.linux
           mv vyper0.3.3 $(pwd)/etc/vyper-bin/0.3.3/vyper
           chmod +x $(pwd)/etc/vyper-bin/0.3.3/vyper
 
-          mkdir -p $(pwd)/etc/zkvyper-bin/v1.3.10
-          wget https://github.com/matter-labs/zkvyper-bin/raw/main/linux-amd64/zkvyper-linux-amd64-musl-v1.3.10
-          mv zkvyper-linux-amd64-musl-v1.3.10 $(pwd)/etc/zkvyper-bin/v1.3.10/zkvyper
-          chmod +x $(pwd)/etc/zkvyper-bin/v1.3.10/zkvyper
+          mkdir -p $(pwd)/etc/zkvyper-bin/v1.3.11
+          wget https://github.com/matter-labs/zkvyper-bin/raw/main/linux-amd64/zkvyper-linux-amd64-musl-v1.3.11
+          mv zkvyper-linux-amd64-musl-v1.3.11 $(pwd)/etc/zkvyper-bin/v1.3.11/zkvyper
+          chmod +x $(pwd)/etc/zkvyper-bin/v1.3.11/zkvyper
 
       - name: Start services
         run: |
@@ -266,18 +265,22 @@ jobs:
       - name: Run Cross EN Checker
         run: ci_run zk run cross-en-checker
 
-      # - name: Run revert test
-      #   run: |
-      #     ci_run pkill zksync_server || true
-      #     ci_run sleep 2
-      #     ci_run zk test i revert
-      #     # Check that the rollback was performed on the EN
-      #     ci_run grep -q 'Rollback successfully completed' ext-node.log
-      #     # Restart the EN
-      #     ci_run zk server &>>server.log &
-      #     ci_run sleep 30
-      #     ZKSYNC_ENV=ext-node-docker ci_run zk external-node &>>ext-node.log &
-      #     ci_run sleep 30
+      - name: Run revert test
+        run: |
+          ci_run zk env
+          ci_run zk env docker
+          ci_run pkill zksync_server || true
+          ci_run sleep 2
+          ci_run zk env
+          ci_run zk test i revert
+          # Check that the rollback was performed on the EN
+          ci_run sleep 20
+          ci_run grep -q 'Rollback successfully completed' ext-node.log
+          # Restart the EN
+          ci_run zk server &>>server.log &
+          ci_run sleep 30
+          ZKSYNC_ENV=ext-node-docker ci_run zk external-node &>>ext-node.log &
+          ci_run sleep 30
 
       - name: Run upgrade test
         run: |
@@ -289,7 +292,7 @@ jobs:
         run: |
           ci_run cat server.log
           ci_run cat ext-node.log
-          # ci_run cat core/tests/revert-test/revert.log
+          ci_run cat core/tests/revert-test/revert.log
           ci_run cat core/tests/upgrade-test/upgrade.log
           ci_run sccache --show-stats
           ci_run cat /tmp/sccache_log.txt

.github/workflows/release-test-stage.yml

@@ -86,6 +86,7 @@ jobs:
       setup_keys_id: 4989f12
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       push_asia: false
+      push_europe: false
 
   build-gar-prover-fri-gpu:
     name: Build GAR prover FRI GPU

.github/workflows/zk-environment-old-publish.yml

@@ -0,0 +1,30 @@
+# Temp workflow to build and push old Ubuntu 22.04 image for debugging purposes
+# TODO: delete me
+name: Publish zk-environment Docker images
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  zk_environment_old:
+    name: Build and push zk-environment "old" Docker images to Docker Hub
+    runs-on: matterlabs-ci-runner
+    steps:
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
+        with:
+          submodules: "recursive"
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@f03ac48505955848960e80bbb68046aa35c7b9e7 # v2
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Build and optionally push zk-environment lightweight
+        uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
+        with:
+          file: docker/zk-environment/20.04_amd64_old.Dockerfile
+          tags: matterlabs/zk-environment:old-lightweight
+          push: true