Merge remote-tracking branch 'origin/fix/oldest_unpicked_batch' into …

…fix/oldest_unpicked_batch

.dockerignore

@@ -37,6 +37,5 @@ contracts/.git
 !etc/multivm_bootloaders
 !cargo
 !bellman-cuda
-!core/bin/verification_key_generator_and_server/data/
 !prover/vk_setup_data_generator_server_fri/data/
 !.github/release-please/manifest.json

.github/pull_request_template.md

@@ -18,4 +18,4 @@
 - [ ] Tests for the changes have been added / updated.
 - [ ] Documentation comments have been added / updated.
 - [ ] Code has been formatted via `zk fmt` and `zk lint`.
-- [ ] Spellcheck has been run via `cargo spellcheck --cfg=./spellcheck/era.cfg --code 1`.
+- [ ] Spellcheck has been run via `zk spellcheck`.

.github/release-please/manifest.json

@@ -1,5 +1,5 @@
 {
   "sdk/zksync-rs": "0.4.0",
-  "core": "18.13.0",
-  "prover": "10.0.2"
+  "core": "19.0.0",
+  "prover": "10.1.0"
 }

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

@@ -9,10 +9,6 @@ on:
         description: "DOCKERHUB_TOKEN"
         required: true
     inputs:
-      image_tag:
-        description: "Tag of a built image to deploy"
-        type: string
-        required: true
       image_tag_suffix:
         description: "Optional suffix to override tag name generation"
         type: string
@@ -26,27 +22,18 @@ jobs:
   build-images:
     name: Build and Push Docker Images
     env:
-      image_tag: ${{ inputs.image_tag }}
       IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}
-    runs-on: ${{ matrix.component.runner }}
+    runs-on: ${{ fromJSON('["matterlabs-ci-runner", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
     strategy:
       matrix:
-          component:
-          - name: server-v2
-            platforms: linux/amd64
-            runner: matterlabs-ci-runner
-          - name: external-node
-            platforms: linux/amd64
-            runner: matterlabs-ci-runner
-          - name: contract-verifier
-            platforms: linux/amd64
-            runner: matterlabs-ci-runner
-          - name: cross-external-nodes-checker
-            platforms: linux/amd64
-            runner: matterlabs-ci-runner
-          - name: snapshots-creator
-            platforms: linux/amd64
-            runner: matterlabs-ci-runner
+          components:
+            - server-v2
+            - external-node
+            - contract-verifier
+            - cross-external-nodes-checker
+            - snapshots-creator
+          platforms:
+            - linux/amd64
 
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
@@ -88,16 +75,16 @@ 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,europe-docker.pkg.dev -q
+          ci_run gcloud auth configure-docker us-docker.pkg.dev -q
 
       - name: update-images
         env:
           DOCKER_ACTION: ${{ inputs.action }}
-          COMPONENT: ${{ matrix.component.name }}
-          PLATFORMS: ${{ matrix.component.platforms }}
+          COMPONENT: ${{ matrix.components }}
+          PLATFORM: ${{ matrix.platforms }}
         run: |
           ci_run rustup default nightly-2023-08-21
-          ci_run zk docker $DOCKER_ACTION --platforms=${PLATFORMS} $COMPONENT
+          ci_run zk docker $DOCKER_ACTION $COMPONENT
       - name: Show sccache stats
         if: always()
         run: |

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

@@ -63,7 +63,6 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     with:
-      image_tag: ${{ needs.setup.outputs.image_tag }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
 
   build-push-prover-images:
@@ -72,7 +71,6 @@ jobs:
     uses: ./.github/workflows/build-prover-template.yml
     if: contains(github.ref_name, 'prover')
     with:
-      image_tag: ${{ needs.setup.outputs.image_tag }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }}
       CUDA_ARCH: "60;70;75;89"

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

@@ -13,10 +13,6 @@ on:
         description: "ERA_BELLMAN_CUDA_RELEASE"
         type: string
         required: true
-      image_tag:
-        description: "Tag of a built image to deploy"
-        type: string
-        required: true
       image_tag_suffix:
         description: "Optional suffix to override tag name generation"
         type: string
@@ -41,7 +37,6 @@ jobs:
   build-images:
     name: Build and Push Docker Images
     env:
-      image_tag: ${{ inputs.image_tag }}
       IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}
       RUNNER_COMPOSE_FILE: "docker-compose-runner-nightly.yml"
       ERA_BELLMAN_CUDA_RELEASE: ${{ inputs.ERA_BELLMAN_CUDA_RELEASE }}
@@ -93,7 +88,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,europe-docker.pkg.dev -q
+          ci_run gcloud auth configure-docker us-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/check-spelling.yml

@@ -12,14 +12,30 @@ env:
 
 jobs:
   spellcheck:
-    runs-on: ubuntu-latest
+    runs-on: [matterlabs-ci-runner]
     steps:
-      - name: Install cargo-spellcheck
-        uses: taiki-e/install-action@v2
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
         with:
-          tool: cargo-spellcheck
+          submodules: "recursive"
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+
+      - name: Setup environment
+        run: |
+          echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
+          echo $(pwd)/bin >> $GITHUB_PATH
+          echo IN_DOCKER=1 >> .env
+
+      - name: Start services
+        run: |
+          docker compose up -d zk
 
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
+      - name: Build zk
+        run: |
+          ci_run zk
 
-      - name: Run cargo-spellcheck
-        run: cargo spellcheck --cfg=./spellcheck/era.cfg --code 1
+      - name: Run spellcheck
+        run: |
+          ci_run zk spellcheck

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

@@ -37,4 +37,3 @@ jobs:
           ci_run zk lint ts --check
           ci_run zk lint md --check
           ci_run zk db check-sqlx-data
-

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

@@ -326,6 +326,10 @@ jobs:
         if: always()
         run: ci_run cat server.log || true
 
+      - name: Show ext-node.log logs
+        if: always()
+        run: ci_run cat ext-node.log || true
+
       - name: Show contract_verifier.log logs
         if: always()
         run: ci_run cat ext-node.log || true

.github/workflows/ci.yml

@@ -108,7 +108,6 @@ jobs:
     if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
     uses: ./.github/workflows/build-core-template.yml
     with:
-      image_tag: ${{ needs.setup.outputs.image_tag }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       action: "build"
     secrets:
@@ -121,7 +120,6 @@ jobs:
     if: ${{ (needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
     uses: ./.github/workflows/build-prover-template.yml
     with:
-      image_tag: ${{ needs.setup.outputs.image_tag }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       action: "build"
       ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }}

.github/workflows/nodejs-license.yaml

@@ -19,8 +19,9 @@ env:
     Public Domain;
     WTFPL;
     Unlicense;
+    BlueOak-1.0.0;
   # It has to be one line, there must be no space between packages.
-  EXCLUDE_PACKAGES: [email protected];[email protected];
+  EXCLUDE_PACKAGES: [email protected];[email protected];@cspell/[email protected];
 
 jobs:
   generate-matrix:

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

@@ -74,7 +74,6 @@ jobs:
     uses: ./.github/workflows/build-core-template.yml
     if: needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.all == 'true'
     with:
-      image_tag: ${{ needs.setup.outputs.image_tag }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
     secrets:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
@@ -86,7 +85,6 @@ jobs:
     uses: ./.github/workflows/build-prover-template.yml
     if: needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true'
     with:
-      image_tag: ${{ needs.setup.outputs.image_tag }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }}
       CUDA_ARCH: "60;70;75;89"

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

@@ -5,14 +5,14 @@ on:
     branches:
       - main
     paths:
-      - "docker/zk-environment/*"
-      - ".github/workflows/zk-environment.publish.yml"
+      - "docker/zk-environment/**"
+      - ".github/workflows/zk-environment-publish.yml"
   pull_request:
     branches:
       - main
     paths:
-      - "docker/zk-environment/*"
-      - ".github/workflows/zk-environment.publish.yml"
+      - "docker/zk-environment/**"
+      - ".github/workflows/zk-environment-publish.yml"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.sha }}
@@ -23,7 +23,7 @@ jobs:
     outputs:
       zk_environment: ${{ steps.changed-files-yaml.outputs.zk_env_any_changed }}
       zk_environment_cuda_11_8: ${{ steps.changed-files-yaml.outputs.zk_env_cuda_11_8_any_changed }}
-      zk_environment_cuda_12: ${{ steps.changed-files-yaml.outputs.zk_env_cuda_12_any_changed }}
+      zk_environment_cuda_12_0: ${{ steps.changed-files-yaml.outputs.zk_env_cuda_12_any_changed }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
@@ -37,13 +37,13 @@ jobs:
           files_yaml: |
             zk_env:
               - docker/zk-environment/Dockerfile
-              - .github/workflows/zk-environment.publish.yml
+              - .github/workflows/zk-environment-publish.yml
             zk_env_cuda_11_8:
               - docker/zk-environment/20.04_amd64_cuda_11_8.Dockerfile
-              - .github/workflows/zk-environment.publish.yml
+              - .github/workflows/zk-environment-publish.yml
             zk_env_cuda_12:
               - docker/zk-environment/20.04_amd64_cuda_12_0.Dockerfile
-              - .github/workflows/zk-environment.publish.yml
+              - .github/workflows/zk-environment-publish.yml
 
   get_short_sha:
     if: needs.changed_files.outputs.zk_environment == 'true'

.gitignore

@@ -27,7 +27,6 @@ todo
 
 Cargo.lock
 !/Cargo.lock
-!/core/bin/verification_key_generator_and_server/Cargo.lock
 !/infrastructure/zksync-crypto/Cargo.lock
 !/prover/Cargo.lock