Merge Extra features with main to M0

.github/release-please/manifest.json

@@ -1,5 +1,5 @@
 {
-  "core": "25.1.0",
-  "prover": "17.0.0",
+  "core": "25.2.0",
+  "prover": "17.1.0",
   "zkstack_cli": "0.1.2"
 }

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

@@ -49,14 +49,15 @@ jobs:
   build-push-core-images:
     name: Build and push image
     needs: [ setup ]
-    uses: ./.github/workflows/build-core-template.yml
+    uses: ./.github/workflows/new-build-core-template.yml
     if: contains(github.ref_name, 'core')
     secrets:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     with:
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       en_alpha_release: true
+      action: "push"
 
   build-push-tee-prover-images:
     name: Build and push images
@@ -73,37 +74,40 @@ jobs:
   build-push-contract-verifier:
     name: Build and push image
     needs: [ setup ]
-    uses: ./.github/workflows/build-contract-verifier-template.yml
+    uses: ./.github/workflows/new-build-contract-verifier-template.yml
     if: contains(github.ref_name, 'contract_verifier')
     secrets:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     with:
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
+      action: "push"
 
   build-push-prover-images:
     name: Build and push image
     needs: [ setup ]
-    uses: ./.github/workflows/build-prover-template.yml
+    uses: ./.github/workflows/new-build-prover-template.yml
     if: contains(github.ref_name, 'prover')
     with:
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }}
       CUDA_ARCH: "60;70;75;80;89"
+      action: "push"
     secrets:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
 
   build-push-witness-generator-image-avx512:
     name: Build and push image
     needs: [ setup ]
-    uses: ./.github/workflows/build-witness-generator-template.yml
+    uses: ./.github/workflows/new-build-witness-generator-template.yml
     if: contains(github.ref_name, 'prover')
     with:
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}-avx512
       ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }}
       CUDA_ARCH: "60;70;75;80;89"
       WITNESS_GENERATOR_RUST_FLAGS: "-Ctarget_feature=+avx512bw,+avx512cd,+avx512dq,+avx512f,+avx512vl"
+      action: "push"
     secrets:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

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

@@ -61,7 +61,7 @@ jobs:
       - name: Init
         run: |
           ci_run run_retried rustup show
-      
+
       - name: Install zkstack
         run: |
           ci_run ./zkstack_cli/zkstackup/install -g --path ./zkstack_cli/zkstackup/zkstackup
@@ -147,10 +147,10 @@ jobs:
             --base-token-price-denominator 1 \
             --set-as-default false \
             --ignore-prerequisites \
-            --legacy-bridge
+            --legacy-bridge \
+            --evm-emulator false
 
           ci_run zkstack ecosystem init --dev --verbose
-          ci_run zkstack dev contracts --test-contracts
 
       # `sleep 60` because we need to wait until server added all the tokens
       - name: Run server
@@ -201,7 +201,7 @@ jobs:
         run: |
           ci_run ./zkstack_cli/zkstackup/install -g --path ./zkstack_cli/zkstackup/zkstackup || true
           ci_run zkstackup -g --local
-  
+
       - name: Create log directories
         run: |
           SERVER_LOGS_DIR=logs/server
@@ -262,7 +262,8 @@ jobs:
           --base-token-price-nominator 1 \
           --base-token-price-denominator 1 \
           --set-as-default false \
-          --ignore-prerequisites
+          --ignore-prerequisites \
+          --evm-emulator false
 
           ci_run zkstack chain init \
           --deploy-paymaster \
@@ -283,7 +284,8 @@ jobs:
           --base-token-price-nominator 314 \
           --base-token-price-denominator 1000 \
           --set-as-default false \
-          --ignore-prerequisites
+          --ignore-prerequisites \
+          --evm-emulator false
 
           ci_run zkstack chain init \
           --deploy-paymaster \
@@ -304,7 +306,8 @@ jobs:
           --base-token-price-nominator 1 \
           --base-token-price-denominator 1 \
           --set-as-default false \
-          --ignore-prerequisites
+          --ignore-prerequisites \
+          --evm-emulator false
 
           ci_run zkstack chain build-transactions --chain offline_chain --l1-rpc-url http://127.0.0.1:8545
 
@@ -339,7 +342,8 @@ jobs:
           --base-token-price-nominator 314 \
           --base-token-price-denominator 1000 \
           --set-as-default false \
-          --ignore-prerequisites
+          --ignore-prerequisites \
+          --evm-emulator false
 
           ci_run zkstack chain init \
           --deploy-paymaster \
@@ -357,10 +361,17 @@ jobs:
         run: |
           ci_run zkstack dev test build
 
+      - name: Build tested binaries
+        run: |
+          ci_run zkstack server build
+          ci_run zkstack external-node build
+          ci_run zkstack contract-verifier build
+
       - name: Initialize Contract verifier
         run: |
           ci_run zkstack contract-verifier init --zksolc-version=v1.5.3 --zkvyper-version=v1.5.4 --solc-version=0.8.26 --vyper-version=v0.3.10 --era-vm-solc-version=0.8.26-1.0.1 --only --chain era
           ci_run zkstack contract-verifier run --chain era &> ${{ env.SERVER_LOGS_DIR }}/contract-verifier-rollup.log &
+          ci_run zkstack contract-verifier wait --chain era --verbose
 
       - name: Run servers
         run: |
@@ -375,10 +386,14 @@ jobs:
             --components=api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads,vm_runner_bwip,vm_playground,da_dispatcher,consensus \
             &> ${{ env.SERVER_LOGS_DIR }}/consensus.log &
 
-          ci_run sleep 5
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain era
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain validium
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain custom_token
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain consensus
 
-      - name: Setup attester committee for the consensus chain
+      - name: Set up attester committee for the consensus chain
         run: |
+          ci_run zkstack consensus wait-for-registry --ignore-prerequisites --verbose --chain consensus
           ci_run zkstack consensus set-attester-committee --chain consensus --from-genesis &> ${{ env.INTEGRATION_TESTS_LOGS_DIR }}/consensus.log 
 
       - name: Run integration tests
@@ -411,12 +426,17 @@ jobs:
         run: |
           ci_run ./bin/run_on_all_chains.sh "zkstack dev test recovery --no-deps --no-kill --ignore-prerequisites --verbose" ${{ env.CHAINS }} ${{ env.INTEGRATION_TESTS_LOGS_DIR }}
 
-      - name: Run external node server
+      - name: Run external nodes
         run: |
           ci_run zkstack external-node run --ignore-prerequisites --chain era &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/rollup.log &
           ci_run zkstack external-node run --ignore-prerequisites --chain validium &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/validium.log &
           ci_run zkstack external-node run --ignore-prerequisites --chain custom_token &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/custom_token.log &
           ci_run zkstack external-node run --ignore-prerequisites --chain consensus --enable-consensus &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/consensus.log &
+
+          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain era
+          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain validium
+          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain custom_token
+          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain consensus
 
       - name: Run integration tests en
         run: |

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

@@ -50,7 +50,8 @@ jobs:
             --base-token-price-nominator 1 \
             --base-token-price-denominator 1 \
             --set-as-default true \
-            --ignore-prerequisites 
+            --ignore-prerequisites \
+            --evm-emulator false
 
           ci_run zkstack ecosystem init --dev --verbose
           ci_run zkstack prover init --dev --verbose
@@ -86,7 +87,7 @@ jobs:
           ci_run zkstack prover run --component=witness-generator --round=all-rounds --docker=false &>prover_logs/witness-generator.log &
       - name: Run Circuit Prover
         run: |
-          ci_run zkstack prover run --component=circuit-prover --witness-vector-generator-count=10 --docker=false &>prover_logs/circuit_prover.log &
+          ci_run zkstack prover run --component=circuit-prover -l=23 -h=3 --docker=false &>prover_logs/circuit_prover.log &
       - name: Wait for prover jobs to finish
         env:
           DATABASE_URL: postgres://postgres:notsecurepassword@localhost:5432/zksync_prover_localhost_proving_chain

.github/workflows/ci.yml

@@ -20,7 +20,6 @@ jobs:
     outputs:
       core: ${{ steps.changed-files.outputs.core_any_changed }}
       prover: ${{ steps.changed-files.outputs.prover_any_changed }}
-      zkstack_cli: ${{ steps.changed-files.outputs.zkstack_cli_any_changed }}
       docs: ${{ steps.changed-files.outputs.docs_any_changed }}
       all: ${{ steps.changed-files.outputs.all_any_changed }}
     steps:
@@ -178,6 +177,7 @@ jobs:
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}-avx512
       action: "build"
       WITNESS_GENERATOR_RUST_FLAGS: "-Ctarget_feature=+avx512bw,+avx512cd,+avx512dq,+avx512f,+avx512vl"
+      ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }}
     secrets:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -186,7 +186,7 @@ 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 ]
+    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, e2e-for-prover ]
     steps:
       - name: Status
         run: |

.github/workflows/deploy-core-docs.yml

@@ -0,0 +1,67 @@
+name: Deploy core docs
+
+on:
+  push:
+    branches:
+      - "main"
+    tags:
+      - "core-v*.*.*"
+    paths:
+      - 'docs/**'
+      - '.github/workflows/deploy-core-docs.yml'
+  pull_request:
+    paths:
+      - 'docs/**'
+      - '.github/workflows/deploy-core-docs.yml'
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: "Branch, tag or commit to deploy the core docs. If empty, use the ref that triggered the workflow."
+        required: false
+        default: ""
+      version:
+        type: string
+        description: "Version of the documentation to deploy"
+        required: false
+        default: "latest"
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+
+  deploy-core-docs:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    env:
+      DOCS_DIR: 'docs'
+      PROJECT: 'core'
+      ENABLE_TESTS: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          ref: ${{ inputs.ref || '' }}
+
+      - name: Extract version from tag
+        if: startsWith(github.ref, 'refs/tags/')
+        id: extract-version
+        shell: 'bash -ex {0}'
+        run: |
+          TAG="${{ github.ref_name }}"
+          VERSION="${TAG#*-}"
+          echo "version=${VERSION}" >> "${GITHUB_OUTPUT}"
+
+      - name: Deploy core docs
+        uses: matter-labs/deploy-mdbooks@73f638643d1be948d1002fe5433747f4a3e37a29 # v1
+        with:
+          version: ${{ inputs.version || steps.extract-version.outputs.version || github.ref_name }}
+          docs-dir: ${{ env.DOCS_DIR }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          enable-tests: ${{ env.ENABLE_TESTS }}
+          project: ${{ env.PROJECT }}
+          deploy: ${{ github.event_name != 'pull_request' }}

.github/workflows/deploy-prover-docs.yml

@@ -0,0 +1,67 @@
+name: Deploy prover docs
+
+on:
+  push:
+    branches:
+      - "main"
+    tags:
+      - "prover-v*.*.*"
+    paths:
+      - 'prover/docs/**'
+      - '.github/workflows/deploy-prover-docs.yml'
+  pull_request:
+    paths:
+      - 'prover/docs/**'
+      - '.github/workflows/deploy-prover-docs.yml'
+  workflow_dispatch:
+    inputs:
+      ref:
+        description: "Branch, tag or commit to deploy the prover docs. If empty, use the ref that triggered the workflow."
+        required: false
+        default: ""
+      version:
+        type: string
+        description: "Version of the documentation to deploy"
+        required: false
+        default: "latest"
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+
+  deploy-prover-docs:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    env:
+      DOCS_DIR: 'prover/docs'
+      PROJECT: 'prover'
+      ENABLE_TESTS: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        with:
+          ref: ${{ inputs.ref || '' }}
+
+      - name: Extract version from tag
+        if: startsWith(github.ref, 'refs/tags/')
+        id: extract-version
+        shell: 'bash -ex {0}'
+        run: |
+          TAG="${{ github.ref_name }}"
+          VERSION="${TAG#*-}"
+          echo "version=${VERSION}" >> "${GITHUB_OUTPUT}"
+
+      - name: Deploy prover docs
+        uses: matter-labs/deploy-mdbooks@73f638643d1be948d1002fe5433747f4a3e37a29 # v1
+        with:
+          version: ${{ inputs.version || steps.extract-version.outputs.version || github.ref_name }}
+          docs-dir: ${{ env.DOCS_DIR }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          enable-tests: ${{ env.ENABLE_TESTS }}
+          project: ${{ env.PROJECT }}
+          deploy: ${{ github.event_name != 'pull_request' }}