Merge pull request #927 from 0xPolygonHermez/develop

Merge develop (0.17.0) into main
-------------
Co-authored-by: Xavier Pinsach <10213118+xavi-pinsach@users.noreply.github.com>
Co-authored-by: agnusmor <100322135+agnusmor@users.noreply.github.com>
Co-authored-by: zkronos73 <zkronos73@gmail.com>
Co-authored-by: Roger Taulé Buxadera <55488871+RogerTaule@users.noreply.github.com>
Co-authored-by: zkronos73 <94566827+zkronos73@users.noreply.github.com>
Co-authored-by: RogerTaule <roger.taulee@gmail.com>
Co-authored-by: Héctor Masip Ardevol <hmasip@polygon.technology>
Co-authored-by: rickb80 <75077385+rickb80@users.noreply.github.com>
Co-authored-by: fractasy <fractasy@gmail.com>

Author: 7 people

.github/workflows/pr.yml

@@ -39,7 +39,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --workspace --release --features no_lib_link
+          args: --workspace --release
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
           RUST_BACKTRACE: 1
@@ -59,10 +59,10 @@ jobs:
     env:
       ZISK_GHA: "1"
       ZISK_REPO_DIR: ${{ github.workspace }}
-      ZISK_TESTVECTORS_BRANCH: "main"
+      ZISK_TESTVECTORS_BRANCH: "develop-0.3.0"
       DISTRIBUTED_PROCESSES: "2"
       DISTRIBUTED_THREADS: "64"
-      PROVE_FLAGS: "-a -y"
+      PROVE_FLAGS: "-y"
       TERM: xterm
     steps:
       - name: Checkout sources
@@ -86,6 +86,8 @@ jobs:
           ./build_setup.sh
 
       - name: Test sha_hasher
+        env:
+          ZISK_TEMPLATE_BRANCH: "pre-develop-0.17.0"
         run: |
           cd "$GITHUB_WORKSPACE/tools/test-env"
           ./test_sha_hasher.sh
@@ -140,6 +142,8 @@ jobs:
           ./build_zisk.sh
 
       - name: Test sha_hasher
+        env:
+          ZISK_TEMPLATE_BRANCH: "pre-develop-0.17.0"
         run: |
           cd "$GITHUB_WORKSPACE/tools/test-env"
           ./test_sha_hasher.sh
@@ -188,7 +192,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-targets -- -D warnings
-          # args: --all-features --all-targets -- -D warnings -A incomplete-features
+          # args: --all-targets -- -D warnings
+          args: --all-features --all-targets -- -D warnings -A incomplete-features
         env:
           CARGO_INCREMENTAL: 1

.github/workflows/pr_emulator.yml

@@ -18,7 +18,7 @@ on:
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref || github.run_id }}
   cancel-in-progress: true
-  
+
 jobs:
   riscof-elf-tests-rust:
     name: Riscof ELF tests (rust emulator)
@@ -52,41 +52,41 @@ jobs:
           cd "$GITHUB_WORKSPACE"
           sudo ./tools/emulate_all.sh $GITHUB_WORKSPACE/zisk-testvectors/riscof/riscof_work
 
-  riscof-elf-tests-asm:
-    name: Riscof ELF tests (assembly emulator)
-    runs-on: ubuntu-latest
-    timeout-minutes: 240
-    defaults:
-      run:
-        shell: bash
-    env:
-      ZISK_GHA: "1"
-      ZISK_REPO_DIR: ${{ github.workspace }}
-      TERM: xterm
-    steps:
-      - name: Increase shared memory (/dev/shm)
-        run: |
-          set -euxo pipefail
-          df -h /dev/shm || true
-          sudo mount -o remount,size=16G /dev/shm || sudo mount -o remount,size=16G /run/shm
-          df -h /dev/shm
+  # riscof-elf-tests-asm:
+  #   name: Riscof ELF tests (assembly emulator)
+  #   runs-on: ubuntu-latest
+  #   timeout-minutes: 240
+  #   defaults:
+  #     run:
+  #       shell: bash
+  #   env:
+  #     ZISK_GHA: "1"
+  #     ZISK_REPO_DIR: ${{ github.workspace }}
+  #     TERM: xterm
+  #   steps:
+  #     - name: Increase shared memory (/dev/shm)
+  #       run: |
+  #         set -euxo pipefail
+  #         df -h /dev/shm || true
+  #         sudo mount -o remount,size=16G /dev/shm || sudo mount -o remount,size=16G /run/shm
+  #         df -h /dev/shm
 
-      - name: Checkout sources
-        uses: actions/checkout@v4
+  #     - name: Checkout sources
+  #       uses: actions/checkout@v4
 
-      - name: Checkout zisk-testvectors repo
-        uses: actions/checkout@v4
-        with:
-          repository: 0xPolygonHermez/zisk-testvectors
-          path: zisk-testvectors
+  #     - name: Checkout zisk-testvectors repo
+  #       uses: actions/checkout@v4
+  #       with:
+  #         repository: 0xPolygonHermez/zisk-testvectors
+  #         path: zisk-testvectors
 
-      - name: Install dependencies
-        run: |
-          cd "$GITHUB_WORKSPACE/tools/test-env"
-          sudo ./install_deps.sh
+  #     - name: Install dependencies
+  #       run: |
+  #         cd "$GITHUB_WORKSPACE/tools/test-env"
+  #         sudo ./install_deps.sh
 
-      - name: Emulate in assembly Riscof ELF files
-        run: |
-          . "$HOME/.cargo/env"
-          cd "$GITHUB_WORKSPACE"
-          sudo ./tools/emulate_asm_all.sh $GITHUB_WORKSPACE/zisk-testvectors/riscof/riscof_work
+  #     - name: Emulate in assembly Riscof ELF files
+  #       run: |
+  #         . "$HOME/.cargo/env"
+  #         cd "$GITHUB_WORKSPACE"
+  #         sudo ./tools/emulate_asm_all.sh $GITHUB_WORKSPACE/zisk-testvectors/riscof/riscof_work

.github/workflows/release.yml

@@ -84,7 +84,7 @@ jobs:
         shell: bash
         run: |
           cd "$GITHUB_WORKSPACE/tools/test-env"
-          ./install_deps.sh
+          ./install_deps.sh --cuda
 
       - name: Setup macOS env vars
         if: matrix.target == 'aarch64-apple-darwin'
@@ -95,13 +95,12 @@ jobs:
           echo "LIBFFI_LIB_DIR=/opt/homebrew/opt/libffi/lib" >> $GITHUB_ENV
           echo "LIBFFI_INCLUDE_DIR=/opt/homebrew/opt/libffi/include" >> $GITHUB_ENV
 
-      - name: Build binaries
+      - name: Build binaries (CPU-only)
         shell: bash
         run: |
-            cargo build --release --target "${{ matrix.target }}"
+            cargo build --release --target "${{ matrix.target }}" --features "cpu-only"
 
-      - name: Archive binaries
-        id: artifacts
+      - name: Copy binaries
         env:
           PLATFORM_NAME: ${{ matrix.platform }}
           TARGET: ${{ matrix.target }}
@@ -112,11 +111,16 @@ jobs:
 
           LIB_EXT=$([[ "${PLATFORM_NAME}" == "darwin" ]] && echo "dylib" || echo "so")
 
-          cp ./target/${TARGET}/release/cargo-zisk                 zisk-dist/bin/
+          if [[ "${PLATFORM_NAME}" == "linux" ]]; then
+            cp ./target/${TARGET}/release/cargo-zisk               zisk-dist/bin/cargo-zisk-cpu
+            cp ./target/${TARGET}/release/zisk-worker              zisk-dist/bin/zisk-worker-cpu
+          else
+            cp ./target/${TARGET}/release/cargo-zisk               zisk-dist/bin/
+            cp ./target/${TARGET}/release/zisk-worker              zisk-dist/bin/
+          fi
           cp ./target/${TARGET}/release/ziskemu                    zisk-dist/bin/
           cp ./target/${TARGET}/release/riscv2zisk                 zisk-dist/bin/
           cp ./target/${TARGET}/release/zisk-coordinator           zisk-dist/bin/
-          cp ./target/${TARGET}/release/zisk-worker                zisk-dist/bin/
           cp ./ziskup/ziskup                                       zisk-dist/bin/
           cp ./target/${TARGET}/release/libziskclib.a              zisk-dist/bin/
 
@@ -127,6 +131,36 @@ jobs:
             cp ./emulator-asm/Makefile                             zisk-dist/zisk/emulator-asm
           fi
 
+      - name: Build binaries (GPU)
+        if: matrix.platform == 'linux'
+        shell: bash
+        run: |
+            tmp_log=$(mktemp)
+            cargo build --release --target "${{ matrix.target }}" -vv 2>&1 | tee "${tmp_log}"
+            if ! grep -qi "STARKS compiled with GPU support" "${tmp_log}"; then
+              echo "Error: Zisk built without GPU support, aborting."
+              exit 1
+            fi
+
+      - name: Copy binaries (GPU)
+        if: matrix.platform == 'linux'
+        env:
+          PLATFORM_NAME: ${{ matrix.platform }}
+          TARGET: ${{ matrix.target }}
+          ARCH: ${{ matrix.arch }}
+        shell: bash
+        run: |
+          cp ./target/${TARGET}/release/cargo-zisk                 zisk-dist/bin/cargo-zisk-gpu
+          cp ./target/${TARGET}/release/zisk-worker                zisk-dist/bin/zisk-worker-gpu
+
+      - name: Archive binaries
+        id: artifacts
+        env:
+          PLATFORM_NAME: ${{ matrix.platform }}
+          TARGET: ${{ matrix.target }}
+          ARCH: ${{ matrix.arch }}
+        shell: bash
+        run: |
           ARCHIVE_FILE="cargo_zisk_${PLATFORM_NAME}_${ARCH}.tar.gz"
           tar -czvf "$ARCHIVE_FILE" -C zisk-dist .
 

.github/workflows/test_install_bin.yml

@@ -97,7 +97,7 @@ jobs:
       - name: Create program
         shell: bash
         run: |
-          cargo-zisk sdk new $HOME/guest
+          cargo-zisk new $HOME/guest
 
       - name: Build program
         shell: bash
@@ -130,7 +130,7 @@ jobs:
         shell: bash
         run: |
           cd $HOME/guest
-          cargo-zisk prove -e target/elf/riscv64ima-zisk-zkvm-elf/release/guest -i host/tmp/input.bin -o proof -a -y -p 8000 -u 2>&1 | tee prove_output.log
+          cargo-zisk prove -e target/elf/riscv64ima-zisk-zkvm-elf/release/guest -i host/tmp/input.bin -o proof.bin -y -p 8000 -u 2>&1 | tee prove_output.log
           if ! grep -F "Vadcop Final proof was verified" prove_output.log; then
             echo "❌ Prove program failed"
             exit 1
@@ -140,8 +140,8 @@ jobs:
         shell: bash
         run: |
           cd $HOME/guest
-          cargo-zisk verify -p ./proof/vadcop_final_proof.bin 2>&1 | tee verify_output.log
-          if ! grep -F "Stark proof was verified" verify_output.log; then
+          cargo-zisk verify -p ./proof.bin 2>&1 | tee verify_output.log
+          if ! grep -F "STARK proof was verified" verify_output.log; then
             echo "❌ Verify proof failed"
             exit 1
           fi

.gitignore

@@ -2,6 +2,7 @@
 **/target
 
 /*.tar.gz
+/*.json.gz
 /riscof
 /build*
 /proofs*