feat(eigen-client-extra-features): Merge main

.dockerignore

@@ -20,11 +20,12 @@ keys/setup
 !prover/
 !yarn.lock
 !package.json
-!Cargo.lock
-!Cargo.toml
+!core/Cargo.lock
+!core/Cargo.toml
 !contracts/
 !setup_2\^26.key
 !setup_2\^24.key
+!setup_compact.key
 # It's required to remove .git from contracts,
 # otherwise yarn tries to use .git parent directory that
 # doesn't exist.

.githooks/pre-commit

@@ -15,8 +15,6 @@ check_fmt () {
     fi
 }
 
-check_fmt
-
-cd prover/
-
-check_fmt
+( cd core/ && check_fmt )
+( cd prover/ && check_fmt )
+( cd zkstack_cli/ && check_fmt )

.github/release-please/config.json

@@ -5,26 +5,27 @@
   "bump-minor-pre-major": true,
   "bump-patch-for-minor-pre-major": true,
   "include-component-in-tag": true,
+  "release-type": "simple",
   "packages": {
     "core": {
-      "release-type": "simple",
-      "component": "core",
+      "component": "core"
+    },
+    "prover": {
+      "component": "prover",
       "extra-files": [
         {
           "type": "generic",
-          "path": "bin/external_node/Cargo.toml"
+          "path": "Cargo.toml"
         }
       ]
     },
-    "prover": {
-      "release-type": "simple",
-      "component": "prover"
-    },
     "zkstack_cli": {
-      "release-type": "simple",
       "component": "zkstack_cli",
-      "plugins": [
-        "cargo-workspace"
+      "extra-files": [
+        {
+          "type": "generic",
+          "path": "Cargo.toml"
+        }
       ]
     }
   }

.github/release-please/manifest.json

@@ -1,5 +1,5 @@
 {
-  "core": "25.4.0",
+  "core": "26.1.0",
   "prover": "17.1.1",
   "zkstack_cli": "0.1.2"
 }

.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml → .github/workflows/build-circuit-prover-gpu-gar.yml

@@ -27,7 +27,7 @@ jobs:
 
       - name: Download Setup data
         run: |
-          gsutil -m rsync -r gs://matterlabs-setup-data-us/${{ inputs.setup_keys_id }} docker/prover-gpu-fri-gar
+          gsutil -m rsync -r gs://matterlabs-setup-data-us/${{ inputs.setup_keys_id }} docker/circuit-prover-gpu-gar
 
       - name: Login to us-central1 GAR
         run: |
@@ -47,32 +47,6 @@ jobs:
         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 prover-gpu-fri-gar
-        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
-        with:
-          context: docker/prover-gpu-fri-gar
-          build-args: |
-            PROVER_IMAGE=${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
-          push: true
-          tags: |
-            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
-
-      - name: Build and push prover-gpu-fri-gar to Asia GAR
-        run: |
-          docker buildx imagetools create \
-            --tag asia-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }} \
-            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
-
-      - name: Build and push prover-gpu-fri-gar to Europe GAR
-        run: |
-          docker buildx imagetools create \
-            --tag europe-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }} \
-            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/prover-fri-gpu-gar:2.0-${{ inputs.protocol_version }}-${{ inputs.image_tag_suffix }}
-
-      - name: Move Setup data from prover-gpu-fri-gar to circuit-prover-gpu-gar
-        run: |
-          mv -v docker/prover-gpu-fri-gar/*.bin docker/circuit-prover-gpu-gar/
-
       - name: Build and push circuit-prover-gpu-gar
         uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
         with:

.github/workflows/build-contract-verifier-template.yml

@@ -13,44 +13,37 @@ on:
         description: "Optional suffix to override tag name generation"
         type: string
         required: false
-      action:
-        description: "Action with docker image"
-        type: string
-        default: "push"
-        required: false
       compilers:
         description: 'JSON of required compilers and their versions'
         type: string
         required: false
         default: '[{ "zksolc": ["1.3.14", "1.3.16", "1.3.17", "1.3.1", "1.3.7", "1.3.18", "1.3.19", "1.3.21"] } , { "zkvyper": ["1.3.13"] }]'
-jobs:
-  build-images:
-    name: Build and Push Docker Images
-    env:
-      IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}
-    runs-on: ${{ fromJSON('["matterlabs-ci-runner-high-performance", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
-    strategy:
-      matrix:
-        components:
-          - contract-verifier
-          - verified-sources-fetcher
-        platforms:
-          - linux/amd64
+      action:
+        type: string
+        default: non-push
+        required: false
 
+jobs:
+  prepare-contracts:
+    name: Prepare contracts
+    runs-on: matterlabs-ci-runner-high-performance
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           submodules: "recursive"
 
-      - name: setup-env
+      - name: Prepare ENV
+        shell: bash
         run: |
           echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
           echo CI=1 >> $GITHUB_ENV
           echo $(pwd)/bin >> $GITHUB_PATH
+          echo $HOME/.local/bin >> $GITHUB_PATH
           echo CI=1 >> .env
           echo IN_DOCKER=1 >> .env
 
       - name: Download contracts
+        shell: bash
         run: |
           commit_sha=$(git submodule status contracts | awk '{print $1}' | tr -d '-')
           page=1
@@ -80,8 +73,41 @@ jobs:
           tar -C ./contracts -zxf l2-contracts.tar.gz
           tar -C ./contracts -zxf system-contracts.tar.gz
 
-      - name: pre-download compilers
+      - name: Install Apt dependencies
+        if: env.BUILD_CONTRACTS == 'true'
+        shell: bash
+        run: |
+          sudo apt-get update && sudo apt-get install -y libssl-dev pkg-config
+
+      - name: Install Node
+        if: env.BUILD_CONTRACTS == 'true'
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        with:
+          node-version: 20
+          cache: 'npm'
+
+      - name: Install Yarn
+        if: env.BUILD_CONTRACTS == 'true'
+        run: npm install -g yarn
+
+      - name: Setup rust
+        if: env.BUILD_CONTRACTS == 'true'
+        uses: actions-rust-lang/setup-rust-toolchain@1fbea72663f6d4c03efaab13560c8a24cfd2a7cc # v1.9.0
+        with:
+          toolchain: nightly-2024-08-01
+
+      - name: Install foundry-zksync
+        if: env.BUILD_CONTRACTS == 'true'
+        run: |
+          mkdir ./foundry-zksync
+          curl -LO https://github.com/matter-labs/foundry-zksync/releases/download/nightly-27360d4c8d12beddbb730dae07ad33a206b38f4b/foundry_nightly_linux_amd64.tar.gz
+          tar zxf foundry_nightly_linux_amd64.tar.gz -C ./foundry-zksync
+          chmod +x ./foundry-zksync/forge ./foundry-zksync/cast
+          echo "$PWD/foundry-zksync" >> $GITHUB_PATH
+
+      - name: Pre-download compilers
         if: env.BUILD_CONTRACTS == 'true'
+        shell: bash
         run: |
           # Download needed versions of vyper compiler
           # Not sanitized due to unconventional path and tags
@@ -98,59 +124,128 @@ jobs:
             chmod +x "./hardhat-nodejs/compilers-v2/$compiler/${compiler}-v${version}"
           done
 
-      - name: start-services
+      - name: Install zkstack
+        if: env.BUILD_CONTRACTS == 'true'
+        run: |
+          ./zkstack_cli/zkstackup/install --path ./zkstack_cli/zkstackup/zkstackup
+          zkstackup --local || true
+
+      - name: build contracts
+        if: env.BUILD_CONTRACTS == 'true'
+        shell: bash
         run: |
-          echo "IMAGE_TAG_SUFFIX=${{ env.IMAGE_TAG_SUFFIX }}" >> .env
-          run_retried docker compose pull zk postgres
-          docker compose up -d zk postgres
-          ci_run pre_download_compilers.sh
-          ci_run sccache --start-server
+          cp etc/tokens/{test,localhost}.json
+          zkstack dev contracts
 
-      - name: init
+      - name: Upload contracts
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        with:
+          name: contacts-verifier
+          path: |
+            ./contracts
+
+  build-images:
+    name: Build and Push Docker Images
+    needs: prepare-contracts
+    permissions:
+      packages: write
+      contents: read
+    runs-on: ${{ fromJSON('["matterlabs-ci-runner-high-performance", "matterlabs-ci-runner-arm"]')[contains(matrix.platforms, 'arm')] }}
+    strategy:
+      matrix:
+        components:
+          - contract-verifier
+          - verified-sources-fetcher
+        platforms:
+          - linux/amd64
+
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          submodules: "recursive"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
+
+      - name: Setup env
+        shell: bash
         run: |
-          ci_run git config --global --add safe.directory /usr/src/zksync
-          ci_run git config --global --add safe.directory /usr/src/zksync/sdk/binaryen
-          ci_run git config --global --add safe.directory /usr/src/zksync/contracts/system-contracts
-          ci_run git config --global --add safe.directory /usr/src/zksync/contracts
-          ci_run ./bin/zk || true
-          ci_run run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
-
-      - name: install zkstack
+          echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
+          echo CI=1 >> $GITHUB_ENV
+          echo $(pwd)/bin >> $GITHUB_PATH
+          echo CI=1 >> .env
+          echo IN_DOCKER=1 >> .env
+
+      - name: Download setup key
+        shell: bash
         run: |
-          ci_run ./zkstack_cli/zkstackup/install -g --path ./zkstack_cli/zkstackup/zkstackup || true
-          ci_run zkstackup -g --local
+          if [ -f "/setup_2^26.key" ]; then
+            cp '/setup_2^26.key' './setup_2^26.key'
+          else
+            run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key
+          fi
 
-      - name: build contracts
-        if: env.BUILD_CONTRACTS == 'true'
+      - name: Set env vars
+        shell: bash
         run: |
-          ci_run cp etc/tokens/{test,localhost}.json
-          ci_run zkstack dev contracts
+          echo PLATFORM=$(echo ${{ matrix.platforms }} | tr '/' '-') >> $GITHUB_ENV
+          echo IMAGE_TAG_SHA=$(git rev-parse --short HEAD) >> $GITHUB_ENV
+          # Support for custom tag suffix
+          if [ -n "${{ inputs.image_tag_suffix }}" ]; then
+            echo IMAGE_TAG_SHA_TS="${{ inputs.image_tag_suffix }}" >> $GITHUB_ENV
+          else
+            echo IMAGE_TAG_SHA_TS=$(git rev-parse --short HEAD)-$(date +%s) >> $GITHUB_ENV
+          fi
 
-      - name: Login to Docker registries
+      - name: Download contracts
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          name: contacts-verifier
+          path: |
+            ./contracts
+
+      - name: login to Docker registries
         if: ${{ inputs.action == 'push' }}
+        shell: bash
         run: |
-          ci_run docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
-          ci_run gcloud auth configure-docker us-docker.pkg.dev -q
-
-      - name: update-images
-        env:
-          DOCKER_ACTION: ${{ inputs.action }}
-          COMPONENT: ${{ matrix.components }}
-          PLATFORM: ${{ matrix.platforms }}
-        run: |
-          ci_run run_retried rustup default nightly-2024-05-07
-          platform=$(echo $PLATFORM | tr '/' '-')
-          ci_run zk docker $DOCKER_ACTION --custom-tag=${IMAGE_TAG_SUFFIX} --platform=${PLATFORM} $COMPONENT
-      - name: Show sccache stats
-        if: always()
+          docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
+          gcloud auth configure-docker us-docker.pkg.dev -q
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+        if: ${{ inputs.action == 'push' }}
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
+        with:
+          context: .
+          load: true
+          platforms: ${{ matrix.platforms }}
+          file: docker/${{ matrix.components }}/Dockerfile
+          build-args: |
+            SCCACHE_GCS_BUCKET=matterlabs-infra-sccache-storage
+            SCCACHE_GCS_SERVICE_ACCOUNT=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com
+            SCCACHE_GCS_RW_MODE=READ_WRITE
+            RUSTC_WRAPPER=sccache
+          tags: |
+            us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
+            matterlabs/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
+            ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
+
+      - name: Push docker image
+        if: ${{ inputs.action == 'push' }}
         run: |
-          ci_run sccache --show-stats || true
-          ci_run cat /tmp/sccache_log.txt || true
+          docker push us-docker.pkg.dev/matterlabs-infra/matterlabs-docker/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
+          docker push matterlabs/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
+          docker push ghcr.io/${{ github.repository_owner }}/${{ matrix.components }}:${{ env.IMAGE_TAG_SHA_TS }}-${{ env.PLATFORM }}
 
   create_manifest:
     name: Create release manifest
-    # TODO: After migraton switch to CI
-    runs-on: matterlabs-default-infra-runners
+    runs-on: matterlabs-ci-runner
     needs: build-images
     if: ${{ inputs.action == 'push' }}
     strategy: