feat: update zisk to v0.18.0 (#367)

Author: han0110

.github/scripts/build-image.sh

@@ -9,13 +9,13 @@ IMAGE_REGISTRY=""
 BUILD_BASE=false
 BUILD_COMPILER=false
 BUILD_SERVER=false
-BUILD_CLUSTER=false
 CUDA=false
 CUDA_ARCHS=""
 RUSTFLAGS=""
+GITHUB_TOKEN="${GITHUB_TOKEN:-}"
 
 usage() {
-    echo "Usage: $0 --zkvm <zkvm> --tag <tag> [--base] [--compiler] [--server] [--cluster] [--registry <registry>] [--cuda] [--cuda-archs <archs>] [--rustflags <flags>]"
+    echo "Usage: $0 --zkvm <zkvm> --tag <tag> [--base] [--compiler] [--server] [--registry <registry>] [--cuda] [--cuda-archs <archs>] [--rustflags <flags>]"
     echo ""
     echo "Required:"
     echo "  --zkvm <zkvm>            zkVM to build for (e.g., zisk, sp1, risc0)"
@@ -25,7 +25,6 @@ usage() {
     echo "  --base                   Build the base images"
     echo "  --compiler               Build the compiler image"
     echo "  --server                 Build the server image"
-    echo "  --cluster                Build the cluster image"
     echo ""
     echo "Optional:"
     echo "  --registry <registry>    Registry prefix (e.g., ghcr.io/eth-act/ere)"
@@ -62,10 +61,6 @@ while [[ $# -gt 0 ]]; do
             BUILD_SERVER=true
             shift
             ;;
-        --cluster)
-            BUILD_CLUSTER=true
-            shift
-            ;;
         --cuda)
             CUDA=true
             shift
@@ -100,8 +95,8 @@ if [ -z "$IMAGE_TAG" ]; then
     usage
 fi
 
-if [ "$BUILD_BASE" = false ] && [ "$BUILD_COMPILER" = false ] && [ "$BUILD_SERVER" = false ] && [ "$BUILD_CLUSTER" = false ]; then
-    echo "Error: At least one of --base, --compiler, --server, --cluster is required"
+if [ "$BUILD_BASE" = false ] && [ "$BUILD_COMPILER" = false ] && [ "$BUILD_SERVER" = false ]; then
+    echo "Error: At least one of --base, --compiler, --server is required"
     usage
 fi
 
@@ -120,21 +115,18 @@ BASE_IMAGE="${IMAGE_PREFIX}ere-base:${IMAGE_TAG}"
 BASE_ZKVM_IMAGE="${IMAGE_PREFIX}ere-base-${ZKVM}:${IMAGE_TAG}"
 COMPILER_ZKVM_IMAGE="${IMAGE_PREFIX}ere-compiler-${ZKVM}:${IMAGE_TAG}"
 SERVER_ZKVM_IMAGE="${IMAGE_PREFIX}ere-server-${ZKVM}:${IMAGE_TAG}"
-CLUSTER_ZKVM_IMAGE="${IMAGE_PREFIX}ere-cluster-${ZKVM}:${IMAGE_TAG}"
 
 # Prepare build arguments
 
 BASE_BUILD_ARGS=()
 BASE_ZKVM_BUILD_ARGS=(--build-arg "BASE_IMAGE=$BASE_IMAGE")
 COMPILER_ZKVM_BUILD_ARGS=(--build-arg "BASE_ZKVM_IMAGE=$BASE_ZKVM_IMAGE")
 SERVER_ZKVM_BUILD_ARGS=(--build-arg "BASE_ZKVM_IMAGE=$BASE_ZKVM_IMAGE")
-CLUSTER_ZKVM_BUILD_ARGS=()
 
 if [ "$CUDA" = true ]; then
     BASE_BUILD_ARGS+=(--build-arg "CUDA=1")
     BASE_ZKVM_BUILD_ARGS+=(--build-arg "CUDA=1")
     SERVER_ZKVM_BUILD_ARGS+=(--build-arg "CUDA=1")
-    CLUSTER_ZKVM_BUILD_ARGS+=(--build-arg "CUDA=1")
 fi
 
 # Default CUDA_ARCHS when --cuda is set but --cuda-archs not specified
@@ -167,7 +159,6 @@ if [ "$CUDA" = true ] && [ -n "$CUDA_ARCHS" ]; then
         zisk)
             BASE_ZKVM_BUILD_ARGS+=(--build-arg "CUDA_ARCHS=$CUDA_ARCHS")
             SERVER_ZKVM_BUILD_ARGS+=(--build-arg "CUDA_ARCHS=$CUDA_ARCHS")
-            CLUSTER_ZKVM_BUILD_ARGS+=(--build-arg "CUDA_ARCHS=$CUDA_ARCHS")
             ;;
         *)
             ;;
@@ -220,13 +211,4 @@ if [ "$BUILD_SERVER" = true ]; then
         .
 fi
 
-if [ "$BUILD_CLUSTER" = true ]; then
-    echo "Building zkvm cluster image: $CLUSTER_ZKVM_IMAGE"
-    docker build \
-        --file "docker/${ZKVM}/Dockerfile.cluster" \
-        --tag "$CLUSTER_ZKVM_IMAGE" \
-        "${CLUSTER_ZKVM_BUILD_ARGS[@]}" \
-        .
-fi
-
 echo "Build complete!"

.github/workflows/build-and-push-images.yml

@@ -175,63 +175,3 @@ jobs:
                 --tag "$IMAGE:latest-cuda"
             fi
           done
-
-  build_and_push_cluster:
-    name: Build and push cluster docker image (${{ matrix.zkvm }})
-    needs: image_meta
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        zkvm:
-          - zisk
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Free up disk space
-        run: bash .github/scripts/free-up-disk-space.sh
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build ere-cluster-${{ matrix.zkvm }} image with CUDA enabled
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          bash .github/scripts/build-image.sh \
-            --zkvm ${{ matrix.zkvm }} \
-            --registry ${{ needs.image_meta.outputs.registry }} \
-            --tag ${{ needs.image_meta.outputs.sha_tag }}-cuda \
-            --cluster \
-            --cuda-archs '${{ env.CUDA_ARCHS }}'
-
-      - name: Push cluster image and add semver/latest tag if release tag exists
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          VERSION_TAG=$(gh api --paginate "repos/${{ github.repository }}/tags" \
-            --jq ".[] | select(.commit.sha == \"${{ github.sha }}\" and (.name | startswith(\"v\"))) | .name" \
-            | head -n1)
-
-          SHA_TAG="${{ needs.image_meta.outputs.sha_tag }}-cuda"
-
-          IMAGE="${{ needs.image_meta.outputs.registry }}/ere-cluster-${{ matrix.zkvm }}"
-
-          echo "Pushing $IMAGE:$SHA_TAG"
-          docker push "$IMAGE:$SHA_TAG"
-
-          if [ -n "$VERSION_TAG" ]; then
-            SEMVER_TAG="${VERSION_TAG#v}-cuda"
-            echo "Tagging $IMAGE:$SHA_TAG as $IMAGE:$SEMVER_TAG and $IMAGE:latest-cuda"
-            docker buildx imagetools create "$IMAGE:$SHA_TAG" \
-              --tag "$IMAGE:$SEMVER_TAG" \
-              --tag "$IMAGE:latest-cuda"
-          fi

.github/workflows/test-verifier.yml

@@ -41,7 +41,9 @@ jobs:
           sudo apt-get install -y protobuf-compiler
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly-2026-05-01
 
       - name: Cache dependencies
         uses: Swatinem/rust-cache@v2
@@ -119,8 +121,9 @@ jobs:
           sudo apt-get install -y protobuf-compiler
 
       - name: Install Rust toolchain
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@master
         with:
+          toolchain: nightly-2026-05-01
           components: clippy
 
       - name: Cache dependencies

.github/workflows/test-zkvm-zisk.yml

@@ -19,6 +19,5 @@ jobs:
     with:
       zkvm: zisk
       cuda: true
-      cluster: true
       test_threads: 1
       skip_prove_test: true

.github/workflows/test-zkvm.yml

@@ -12,11 +12,6 @@ on:
         required: false
         type: boolean
         default: false
-      cluster:
-        description: 'Whether to build cluster image'
-        required: false
-        type: boolean
-        default: false
       test_threads:
         description: 'Number of threads when testing via docker'
         required: false
@@ -41,7 +36,6 @@ jobs:
     name: Get image metadata
     runs-on: ubuntu-latest
     outputs:
-      dockerfile_changed: ${{ steps.changed_files.outputs.any_changed }}
       image_registry: ${{ steps.image_meta.outputs.image_registry }}
       image_tag: ${{ steps.image_meta.outputs.image_tag }}
       cached_image_tag: ${{ steps.image_meta.outputs.cached_image_tag }}
@@ -127,18 +121,6 @@ jobs:
             --server \
             --cuda-archs '${{ env.CUDA_ARCHS }}'
 
-      - name: Build ere-cluster-${{ inputs.zkvm }} image with CUDA enabled
-        if: ${{ inputs.cluster && needs.image_meta.outputs.dockerfile_changed == 'true' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          bash .github/scripts/build-image.sh \
-            --zkvm ${{ inputs.zkvm }} \
-            --registry ${{ needs.image_meta.outputs.image_registry }} \
-            --tag ${{ needs.image_meta.outputs.image_tag }}-cuda \
-            --cluster \
-            --cuda-archs '${{ env.CUDA_ARCHS }}'
-
   clippy_via_docker:
     name: Clippy via Docker
     needs: image_meta