Upgrade zisk to v0.12.0 (#157)

Cargo.lock

@@ -2227,7 +2227,7 @@ dependencies = [
 
 [[package]]
 name = "build-utils"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "cargo_metadata 0.19.2",
  "thiserror 2.0.12",
@@ -2591,7 +2591,7 @@ dependencies = [
 
 [[package]]
 name = "compile-utils"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "cargo_metadata 0.19.2",
  "tempfile",
@@ -3639,7 +3639,7 @@ dependencies = [
 
 [[package]]
 name = "ere-cli"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "anyhow",
  "bincode 1.3.3",
@@ -3660,7 +3660,7 @@ dependencies = [
 
 [[package]]
 name = "ere-dockerized"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "bincode 1.3.3",
  "build-utils",
@@ -3677,7 +3677,7 @@ dependencies = [
 
 [[package]]
 name = "ere-jolt"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "ark-serialize 0.5.0",
  "build-utils",
@@ -3693,7 +3693,7 @@ dependencies = [
 
 [[package]]
 name = "ere-miden"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "bincode 1.3.3",
  "build-utils",
@@ -3711,7 +3711,7 @@ dependencies = [
 
 [[package]]
 name = "ere-nexus"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "bincode 1.3.3",
  "build-utils",
@@ -3726,7 +3726,7 @@ dependencies = [
 
 [[package]]
 name = "ere-openvm"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "build-utils",
  "compile-utils",
@@ -3745,7 +3745,7 @@ dependencies = [
 
 [[package]]
 name = "ere-pico"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "anyhow",
  "bincode 1.3.3",
@@ -3763,7 +3763,7 @@ dependencies = [
 
 [[package]]
 name = "ere-risc0"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "anyhow",
  "borsh",
@@ -3782,7 +3782,7 @@ dependencies = [
 
 [[package]]
 name = "ere-server"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "anyhow",
  "bincode 1.3.3",
@@ -3810,7 +3810,7 @@ dependencies = [
 
 [[package]]
 name = "ere-sp1"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "bincode 1.3.3",
  "build-utils",
@@ -3826,7 +3826,7 @@ dependencies = [
 
 [[package]]
 name = "ere-ziren"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "bincode 1.3.3",
  "build-utils",
@@ -3841,7 +3841,7 @@ dependencies = [
 
 [[package]]
 name = "ere-zisk"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "bincode 1.3.3",
  "blake3",
@@ -13047,7 +13047,7 @@ dependencies = [
 
 [[package]]
 name = "test-utils"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "bincode 1.3.3",
  "rand 0.9.2",
@@ -15541,7 +15541,7 @@ dependencies = [
 
 [[package]]
 name = "zkvm-interface"
-version = "0.0.12"
+version = "0.0.13"
 dependencies = [
  "auto_impl",
  "bincode 1.3.3",

Cargo.toml

@@ -23,7 +23,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.0.12"
+version = "0.0.13"
 edition = "2024"
 rust-version = "1.85"
 license = "MIT OR Apache-2.0"

crates/ere-dockerized/build.rs

@@ -43,7 +43,7 @@ fn generate_zkvm_sdk_version_impl() {
     //        Once ZisK's SDK is ready, we should update this to detect the SDK
     //        version.
     //        The issue for tracking https://github.com/eth-act/ere/issues/73.
-    let zisk_version = "0.11.0";
+    let zisk_version = "0.12.0";
 
     let zkvm_sdk_version_impl = format!(
         r#"impl crate::ErezkVM {{

crates/ere-zisk/build.rs

@@ -1,5 +1,5 @@
 use build_utils::gen_name_and_sdk_version;
 
 fn main() {
-    gen_name_and_sdk_version("zisk", "0.11.0");
+    gen_name_and_sdk_version("zisk", "0.12.0");
 }

crates/ere-zisk/src/client.rs

@@ -22,7 +22,6 @@ pub type RomDigest = [u64; 4];
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, EnumIter)]
 pub enum ZiskOption {
     Port,
-    ChunkSizeBits,
     UnlockMappedMemory, // Should be set if locked memory is not enough
     MinimalMemory,
     // GPU options
@@ -38,7 +37,6 @@ impl ZiskOption {
     fn env_var_key(&self) -> &'static str {
         match self {
             Self::Port => "ZISK_PORT",
-            Self::ChunkSizeBits => "ZISK_CHUNK_SIZE_BITS",
             Self::UnlockMappedMemory => "ZISK_UNLOCK_MAPPED_MEMORY",
             Self::MinimalMemory => "ZISK_MINIMAL_MEMORY",
             Self::Preallocate => "ZISK_PREALLOCATE",
@@ -59,11 +57,9 @@ impl ZiskOption {
             | Self::MinimalMemory
             | Self::Preallocate
             | Self::SharedTables => true,
-            Self::Port
-            | Self::ChunkSizeBits
-            | Self::MaxStreams
-            | Self::NumberThreadsWitness
-            | Self::MaxWitnessStored => false,
+            Self::Port | Self::MaxStreams | Self::NumberThreadsWitness | Self::MaxWitnessStored => {
+                false
+            }
         }
     }
 
@@ -71,7 +67,6 @@ impl ZiskOption {
     fn key(&self) -> &'static str {
         match self {
             Self::Port => "--port",
-            Self::ChunkSizeBits => "--chunk-size-bits",
             Self::UnlockMappedMemory => "--unlock-mapped-memory",
             // NOTE: Use snake case for `prove-client` command
             // Issue for tracking: https://github.com/eth-act/ere/issues/151.
@@ -114,7 +109,6 @@ impl ZiskOptions {
     fn server_args(&self) -> impl Iterator<Item = &str> {
         self.args([
             ZiskOption::Port,
-            ZiskOption::ChunkSizeBits,
             ZiskOption::UnlockMappedMemory,
             ZiskOption::Preallocate,
             ZiskOption::SharedTables,

docker/zisk/Dockerfile

@@ -28,7 +28,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     openmpi-bin \
     openmpi-common \
     libclang-dev \
-    clang && \
+    clang \
+    # Needed for /usr/include/google/protobuf/timestamp.proto
+    libprotobuf-dev && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # If current environment is in CI or not.

scripts/sdk_installers/install_zisk_sdk.sh

@@ -32,7 +32,7 @@ ensure_tool_installed "cargo" "as cargo-zisk is a cargo subcommand"
 
 # Step 1: Download and run the script that installs the ziskup binary itself.
 # Export SETUP_KEY=proving to ensure no interactive options in `ziskup`.
-export ZISK_VERSION="0.11.0"
+export ZISK_VERSION="0.12.0"
 export SETUP_KEY=${SETUP_KEY:=proving}
 curl "https://raw.githubusercontent.com/0xPolygonHermez/zisk/main/ziskup/install.sh" | bash
 unset SETUP_KEY
@@ -62,7 +62,7 @@ fi
 # Step 3: Build cargo-zisk-gpu from source with GPU features enabled (skip if in CI)
 if [ -z $CI ]; then
     TEMP_DIR=$(mktemp -d)
-    git clone https://github.com/han0110/zisk.git --single-branch --branch "feature/override-cuda-arch" "$TEMP_DIR/zisk"
+    git clone https://github.com/0xPolygonHermez/zisk.git --depth 1 --branch "v$ZISK_VERSION" "$TEMP_DIR/zisk"
     cd "$TEMP_DIR/zisk"
     cargo build --release --features gpu
     cp ./target/release/cargo-zisk "${HOME}/.zisk/bin/cargo-zisk-gpu"

tests/zisk/basic/Cargo.toml

@@ -7,5 +7,5 @@ edition = "2021"
 
 [dependencies]
 bincode = "1.3.3"
-ziskos = { git = "https://github.com/0xPolygonHermez/zisk.git", tag = "v0.11.0" }
+ziskos = { git = "https://github.com/0xPolygonHermez/zisk.git", tag = "v0.12.0" }
 test-utils = { path = "../../../crates/test-utils" }