Skip to content

Commit 5a7cce6

Browse files
han0110han0110
authored
feat: update sp1 to v6.6.0 (#421)
1 parent 4968be3 commit 5a7cce6

10 files changed

Lines changed: 322 additions & 340 deletions

File tree

‎Cargo.lock‎

Lines changed: 252 additions & 265 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,16 @@ openvm-transpiler = { git = "https://github.com/han0110/openvm.git", branch = "p
144144
openvm-verify-stark-host = { git = "https://github.com/han0110/openvm.git", branch = "patch/v2.1.0-preview", default-features = false }
145145

146146
# SP1 dependencies
147-
sp1-core-executor = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" }
148-
sp1-cuda = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" }
149-
sp1-hypercube = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" }
150-
sp1-jit = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" }
151-
sp1-primitives = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" }
152-
sp1-recursion-executor = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" }
153-
sp1-sdk = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" }
154-
sp1-verifier = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0" }
155-
sp1-zkvm = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0", default-features = false }
156-
sp1-libzkevm = { git = "https://github.com/succinctlabs/sp1", tag = "v6.4.0", package = "libzkevm" }
147+
sp1-core-executor = { git = "https://github.com/succinctlabs/sp1", tag = "v6.6.0" }
148+
sp1-cuda = { git = "https://github.com/succinctlabs/sp1", tag = "v6.6.0" }
149+
sp1-hypercube = { git = "https://github.com/succinctlabs/sp1", tag = "v6.6.0" }
150+
sp1-jit = { git = "https://github.com/succinctlabs/sp1", tag = "v6.6.0" }
151+
sp1-primitives = { git = "https://github.com/succinctlabs/sp1", tag = "v6.6.0" }
152+
sp1-recursion-executor = { git = "https://github.com/succinctlabs/sp1", tag = "v6.6.0" }
153+
sp1-sdk = { git = "https://github.com/succinctlabs/sp1", tag = "v6.6.0" }
154+
sp1-verifier = { git = "https://github.com/succinctlabs/sp1", tag = "v6.6.0" }
155+
sp1-zkvm = { git = "https://github.com/succinctlabs/sp1", tag = "v6.6.0", default-features = false }
156+
sp1-libzkevm = { git = "https://github.com/succinctlabs/sp1", tag = "v6.6.0", package = "libzkevm" }
157157

158158
# ZisK dependencies
159159
proofman-fields = "1.2.0-alpha"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Different zkVMs handles public values in different approaches:
159159
| zkVM | Version | ISA | GPU | Multi GPU | Cluster |
160160
| ------ | -------------------------------------------------------------------------- | --------- | :---: | :-------: | :-----: |
161161
| OpenVM | [`2.1.0-preview`](https://github.com/openvm-org/openvm/tree/v2.1.0-preview) | `RV64IMA` | V | | |
162-
| SP1 | [`6.4.0`](https://github.com/succinctlabs/sp1/tree/v6.4.0) | `RV64IMA` | V | | |
162+
| SP1 | [`6.6.0`](https://github.com/succinctlabs/sp1/tree/v6.6.0) | `RV64IMA` | V | | |
163163
| ZisK | [`1.2.0-alpha`](https://github.com/0xPolygonHermez/zisk/tree/v1.2.0-alpha) | `RV64IMA` | V | V | V |
164164

165165
## Examples

‎crates/compiler/sp1/src/rust_rv64ima.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const TARGET: RustTarget = RustTarget::SpecJson {
1919
json: include_str!("./rust_rv64ima/riscv64ima-unknown-none-elf.json"),
2020
};
2121

22-
/// According to https://github.com/succinctlabs/sp1/blob/v6.4.0/crates/build/src/command/utils.rs#L68.
22+
/// According to https://github.com/succinctlabs/sp1/blob/v6.6.0/crates/build/src/command/utils.rs#L68.
2323
const RUSTFLAGS: &[&str] = &[
2424
"-C",
2525
"passes=lower-atomic", // Only for rustc > 1.81

‎docker/sp1/Dockerfile.base‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ COPY --chmod=755 scripts/sdk_installers/install_sp1_sdk.sh /tmp/install_sp1_sdk.
2020
# Define where SP1 SDK will be installed within the image.
2121
# The install_sp1_sdk.sh script will respect these ENV variables.
2222
ENV SP1_DIR="/root/.sp1" \
23-
SP1_VERSION="v6.4.0"
23+
SP1_VERSION="v6.6.0"
2424

2525
# Run the SP1 SDK installation script with secret mount
2626
# It will use the SP1_DIR and SP1_VERSION defined above.

‎docs/vk-generation.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ This guide records the encoding for each supported zkVM and gives the commands t
8888
8989
### Format
9090
91-
32-bytes holding the 8 koalabear field elements of the digest packed as base-2^31 digits of a big-endian integer, which is the form [`HashableKey::bytes32`](https://github.com/succinctlabs/sp1/blob/v6.4.0/crates/hypercube/src/verifier/hashable_key.rs) prints and what `cargo prove vkey` reports.
91+
32-bytes holding the 8 koalabear field elements of the digest packed as base-2^31 digits of a big-endian integer, which is the form [`HashableKey::bytes32`](https://github.com/succinctlabs/sp1/blob/v6.6.0/crates/hypercube/src/verifier/hashable_key.rs) prints and what `cargo prove vkey` reports.
9292
9393
### Instructions
9494
@@ -100,7 +100,7 @@ This guide records the encoding for each supported zkVM and gives the commands t
100100
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
101101
. "$HOME/.cargo/env"
102102
103-
ZKVM_VERSION="v6.4.0"
103+
ZKVM_VERSION="v6.6.0"
104104
curl -L https://sp1up.succinct.xyz | bash
105105
export PATH="$HOME/.sp1/bin:$PATH"
106106
sp1up -v "$ZKVM_VERSION"

‎scripts/sdk_installers/install_sp1_sdk.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ curl -L https://sp1up.succinct.xyz | bash
2727
# and for subsequent commands if this script is sourced.
2828
export PATH="${SP1_DIR}/bin:$PATH"
2929

30-
export SP1_VERSION="${SP1_VERSION:-v6.4.0}"
30+
export SP1_VERSION="${SP1_VERSION:-v6.6.0}"
3131

3232
# Run sp1up to install/update the toolchain
3333
if ! command -v sp1up &> /dev/null; then

‎tests/sp1/basic/Cargo.lock‎

Lines changed: 46 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/sp1/stock_nightly_no_std/src/sp1.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ _start:
3232
sym STACK_TOP
3333
);
3434

35-
/// According to https://github.com/succinctlabs/sp1/blob/v6.4.0/crates/zkvm/entrypoint/src/syscalls/sys.rs#L56-L59.
35+
/// According to https://github.com/succinctlabs/sp1/blob/v6.6.0/crates/zkvm/entrypoint/src/syscalls/sys.rs#L56-L59.
3636
#[panic_handler]
3737
fn panic_impl(_panic_info: &core::panic::PanicInfo) -> ! {
3838
halt(1);
3939
}
4040

41-
/// According to https://github.com/succinctlabs/sp1/blob/v6.4.0/crates/zkvm/entrypoint/src/syscalls/halt.rs#L59-L63.
41+
/// According to https://github.com/succinctlabs/sp1/blob/v6.6.0/crates/zkvm/entrypoint/src/syscalls/halt.rs#L59-L63.
4242
fn halt(exit_code: u32) -> ! {
4343
unsafe {
4444
core::arch::asm!(
@@ -66,7 +66,7 @@ unsafe impl GlobalAlloc for SimpleAlloc {
6666
#[global_allocator]
6767
static HEAP: SimpleAlloc = SimpleAlloc;
6868

69-
// According to https://github.com/succinctlabs/sp1/blob/v6.4.0/crates/primitives/src/consts.rs#L8.
69+
// According to https://github.com/succinctlabs/sp1/blob/v6.6.0/crates/primitives/src/consts.rs#L8.
7070
pub const MAXIMUM_MEMORY_SIZE: u64 = (1u64 << 48) - 1;
7171

7272
#[allow(clippy::missing_safety_doc)]

‎tests/sp1/zkvm_interface/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ ere-platform-sp1 = { path = "../../../crates/platform/sp1" }
1010
ere-util-test = { path = "../../../crates/util/test" }
1111

1212
[patch.crates-io]
13-
sp1-lib = { git = "https://github.com/han0110/sp1", rev = "7929b001303feb6803ce1214557d5ab1f17eee84" }
13+
sp1-lib = { git = "https://github.com/han0110/sp1", rev = "b4f72fe1de5d6d26b3d3f531fcabd137b03e3338" }
1414

1515
[patch."https://github.com/succinctlabs/sp1"]
16-
sp1-lib = { git = "https://github.com/han0110/sp1", rev = "7929b001303feb6803ce1214557d5ab1f17eee84" }
17-
sp1-primitives = { git = "https://github.com/han0110/sp1", rev = "7929b001303feb6803ce1214557d5ab1f17eee84" }
18-
sp1-zkvm = { git = "https://github.com/han0110/sp1", rev = "7929b001303feb6803ce1214557d5ab1f17eee84" }
19-
libzkevm = { git = "https://github.com/han0110/sp1", rev = "7929b001303feb6803ce1214557d5ab1f17eee84" }
16+
sp1-lib = { git = "https://github.com/han0110/sp1", rev = "b4f72fe1de5d6d26b3d3f531fcabd137b03e3338" }
17+
sp1-primitives = { git = "https://github.com/han0110/sp1", rev = "b4f72fe1de5d6d26b3d3f531fcabd137b03e3338" }
18+
sp1-zkvm = { git = "https://github.com/han0110/sp1", rev = "b4f72fe1de5d6d26b3d3f531fcabd137b03e3338" }
19+
libzkevm = { git = "https://github.com/han0110/sp1", rev = "b4f72fe1de5d6d26b3d3f531fcabd137b03e3338" }

0 commit comments

Comments
 (0)