github/ere
1
1
Fork 0
mirror of https://github.com/eth-act/ere.git synced 2026-02-19 11:54:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update zisk to v0.15.0 (#260)

Browse Source
This commit is contained in:
Han
2025-12-30 21:01:21 +09:00
committed by GitHub
parent fd985bf542
commit 73a760aa63
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.github/scripts/free-up-disk-space.sh vendored
View File

@@ -3,7 +3,10 @@
set -e -o pipefail
df -h /
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/lib/android
sudo rm -rf /opt/hostedtoolcache
sudo rm -rf /usr/share/dotnet # remove dotnet
sudo rm -rf /usr/local/lib/android # remove android
sudo rm -rf /opt/ghc /usr/local/.ghcup # remove haskell
sudo rm -rf /opt/hostedtoolcache # remove codeql
df -h /

8
Cargo.lock generated
View File

@@ -6444,8 +6444,8 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "lib-c"
version = "0.14.0"
source = "git+https://github.com/0xPolygonHermez/zisk.git?tag=v0.14.0#2f791ffd070d024ba350f054c349c8d6bd98d629"
version = "0.15.0"
source = "git+https://github.com/0xPolygonHermez/zisk.git?tag=v0.15.0#b3ca745b80423c8123dc24f19039865a5bc8b074"
[[package]]
name = "lib-rv32-asm"
@@ -16291,8 +16291,8 @@ dependencies = [
[[package]]
name = "ziskos"
version = "0.14.0"
source = "git+https://github.com/0xPolygonHermez/zisk.git?tag=v0.14.0#2f791ffd070d024ba350f054c349c8d6bd98d629"
version = "0.15.0"
source = "git+https://github.com/0xPolygonHermez/zisk.git?tag=v0.15.0#b3ca745b80423c8123dc24f19039865a5bc8b074"
dependencies = [
"bincode 2.0.1",
"cfg-if",

2
Cargo.toml
View File

@@ -136,7 +136,7 @@ zkm-sdk = { git = "https://github.com/ProjectZKM/Ziren.git", tag = "v1.2.3" }
zkm-zkvm = { git = "https://github.com/ProjectZKM/Ziren.git", tag = "v1.2.3" }
# ZisK dependencies
ziskos = { git = "https://github.com/0xPolygonHermez/zisk.git", tag = "v0.14.0" }
ziskos = { git = "https://github.com/0xPolygonHermez/zisk.git", tag = "v0.15.0" }
# Local dependencies
ere-zkvm-interface = { path = "crates/zkvm-interface" }

2
crates/zkvm/zisk/src/zkvm/sdk.rs
View File

@@ -590,7 +590,7 @@ fn rom_setup(elf_path: &Path) -> Result<RomDigest, Error> {
/// Send shutdown request to ZisK asm services.
fn shutdown_asm_service(port: u16) {
// According to https://github.com/0xPolygonHermez/zisk/blob/v0.14.0/emulator-asm/asm-runner/src/asm_services/mod.rs#L34.
// According to https://github.com/0xPolygonHermez/zisk/blob/v0.15.0/emulator-asm/asm-runner/src/asm_services/mod.rs#L34.
const CMD_SHUTDOWN_REQUEST_ID: u64 = 1000000;
if let Ok(mut stream) = TcpStream::connect((Ipv4Addr::LOCALHOST, port)) {
let _ = stream.write_all(

6
scripts/sdk_installers/install_zisk_sdk.sh
View File

@@ -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.14.0"
export ZISK_VERSION="0.15.0"
export SETUP_KEY=${SETUP_KEY:=proving}
curl "https://raw.githubusercontent.com/0xPolygonHermez/zisk/main/ziskup/install.sh" | bash
unset SETUP_KEY
@@ -43,7 +43,7 @@ export PATH="$PATH:$HOME/.zisk/bin"
# FIXME: Issue for tracking: https://github.com/eth-act/ere/issues/200.
if true; then
WORKSPACE=$(mktemp -d)
git clone https://github.com/han0110/zisk.git --depth 1 --branch patch/v0.14.0 "$WORKSPACE"
git clone https://github.com/han0110/zisk.git --depth 1 --branch patch/v0.15.0 "$WORKSPACE"
cargo build --manifest-path "$WORKSPACE/Cargo.toml" --release
cp "$WORKSPACE/target/release/cargo-zisk" "$HOME/.zisk/bin/cargo-zisk"
cp "$WORKSPACE/target/release/libzisk_witness.so" "$HOME/.zisk/bin/libzisk_witness.so"
@@ -74,7 +74,7 @@ if [ -n "$CUDA" ]; then
WORKSPACE=$(mktemp -d)
# FIXME: Issue for tracking: https://github.com/eth-act/ere/issues/200.
# git clone https://github.com/0xPolygonHermez/zisk.git --depth 1 --tag "v$ZISK_VERSION" "$WORKSPACE"
git clone https://github.com/han0110/zisk.git --depth 1 --branch patch/v0.14.0 "$WORKSPACE"
git clone https://github.com/han0110/zisk.git --depth 1 --branch patch/v0.15.0 "$WORKSPACE"
cargo build --manifest-path "$WORKSPACE/Cargo.toml" --release --features gpu
cp "$WORKSPACE/target/release/cargo-zisk" "$HOME/.zisk/bin/cargo-zisk-cuda"
cp "$WORKSPACE/target/release/libzisk_witness.so" "$HOME/.zisk/bin/libzisk_witness_cuda.so"