From 1b67812df1c18ce234b222705e678372f42866c4 Mon Sep 17 00:00:00 2001
From: nhtyy <n@push0.dev>
Date: Tue, 19 Nov 2024 13:42:57 -0800
Subject: [PATCH] fix: bump sp1 version + new patch
---
Cargo.lock | 60 ++++++------
Cargo.toml | 6 +-
provers/sp1/guest/Cargo.lock | 174 ++++-------------------------------
provers/sp1/guest/Cargo.toml | 7 +-
4 files changed, 55 insertions(+), 192 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 697070988..4b76bcddf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8655,9 +8655,9 @@ dependencies = [
[[package]]
name = "sp1-build"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c121875505b3f039891e9e26fa2c007e8e66b68df1ac5cc315604f722c88b76"
+checksum = "e64438370a9c565926f6234d3a36ae32a23d01ac815c5512cdc4f8cb160974a3"
dependencies = [
"anyhow",
"cargo_metadata 0.18.1",
@@ -8675,9 +8675,9 @@ dependencies = [
[[package]]
name = "sp1-core-executor"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e28289e0dc59f08955c50cb89a406dd7943d48451e6bfb8bdf7d41f81019c8"
+checksum = "afae417b311ba7923b32711a7b7a12ae9d59923e121ace68f9f547a31baad77c"
dependencies = [
"bincode",
"bytemuck",
@@ -8709,9 +8709,9 @@ dependencies = [
[[package]]
name = "sp1-core-machine"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "849dd9b6c96f6be669ecb860793db7b0436671ade8b1629ae8c46cd10e4bbed9"
+checksum = "6c8de226e4abccdef87a1e975ba90417012ceb5198aaa2c9baee1e9b5946f803"
dependencies = [
"bincode",
"cfg-if",
@@ -8757,9 +8757,9 @@ dependencies = [
[[package]]
name = "sp1-curves"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaef1763516b57c6e845c74fbf7dede28a0930111e7eb62b97c923d869b195f6"
+checksum = "e4a68cf91e565d8d13a876775ec9a55b9e84078c99cf281fbd5ec2afafd72a93"
dependencies = [
"cfg-if",
"curve25519-dalek",
@@ -8779,9 +8779,9 @@ dependencies = [
[[package]]
name = "sp1-derive"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abc46a1a182a61be3cb3bb153368fe64f1c172ce439fe3ff03dda41573f8fa87"
+checksum = "9bdcf03d7e67fb93eb46d019e130be264258bef1412471b6e0950a5cd1ff5ac2"
dependencies = [
"quote",
"syn 1.0.109",
@@ -8818,18 +8818,18 @@ dependencies = [
[[package]]
name = "sp1-helper"
-version = "3.0.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae43cd2ae4ba94fc2ba7835fb0131375f52b93f385116a7a55e858a29044b592"
+checksum = "9e4c4a333290dae321aae050433b6e7081b92cf6bec509d9256a9f2cd32712f9"
dependencies = [
"sp1-build",
]
[[package]]
name = "sp1-primitives"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a3a60fc832cfe2c7b5441b0f386f6ce7c768f62f3d49de20a76fa2648886373"
+checksum = "3442b59d2606ed4517c09b5daaa39e0e0d0ef75fb8e75b6f50334fd87a966b42"
dependencies = [
"bincode",
"hex",
@@ -8845,9 +8845,9 @@ dependencies = [
[[package]]
name = "sp1-prover"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "987ab8760329e50674cadd809e92bf380d58889eb9577980c974d9a93d89d447"
+checksum = "6131dea3589aa9206adfde6e10b6a6fb35cd3a3e1bb9ba53bc45f31bb65d353a"
dependencies = [
"anyhow",
"bincode",
@@ -8887,9 +8887,9 @@ dependencies = [
[[package]]
name = "sp1-recursion-circuit"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c67d0a5a6dc242134aa177b6c33b08ff9646bcc25c30ac301f8f5e6e0059529c"
+checksum = "80e30f8b451d9bf98af24b287d388f4f894f9212c344d0cfb6b1691b2c383bb4"
dependencies = [
"hashbrown 0.14.5",
"itertools 0.13.0",
@@ -8921,9 +8921,9 @@ dependencies = [
[[package]]
name = "sp1-recursion-compiler"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad51b87ef8640f4566f642d8ecd650348c9e87e312a572dfcd64ba2e982883e2"
+checksum = "292c2f36280ca179fb4693c27605bed6a7f40edbc74d4eba092c176302c479f1"
dependencies = [
"backtrace",
"itertools 0.13.0",
@@ -8943,9 +8943,9 @@ dependencies = [
[[package]]
name = "sp1-recursion-core"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3c434abe6932ea93f2e54767041f037aecc8b55f20844a6ed9786293ec67371"
+checksum = "26fc9ed0bc176ae7be49f7469f5a47bd13637077628485c1f610610cb37cb160"
dependencies = [
"backtrace",
"ff 0.13.0",
@@ -8979,9 +8979,9 @@ dependencies = [
[[package]]
name = "sp1-recursion-derive"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "866117afb5938197584bae8880de18443931f36a268842ff8f74cb7a3059d36b"
+checksum = "3eb4316348ed134afc392a9a1f376bd99793362080ace5bfe12a9b16b5ec3ea5"
dependencies = [
"quote",
"syn 1.0.109",
@@ -8989,9 +8989,9 @@ dependencies = [
[[package]]
name = "sp1-recursion-gnark-ffi"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "973625e2d9f5ee8a7ce9bc83184f629af81b5bcd29720cda11c53b3f7eb1acd3"
+checksum = "ccbcf2a4a62a9a4e882cbe6af6f88602cdee65c6322b82e1b903ff943ec60e6d"
dependencies = [
"anyhow",
"bincode",
@@ -9015,9 +9015,9 @@ dependencies = [
[[package]]
name = "sp1-sdk"
-version = "3.0.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39bab15e962d1218e8ad021b2e9904597d5506d12847ef8be182385d5f3d3a6c"
+checksum = "637e3f19f75e2f5df52cadb588d19c3daac93d34f122efed963f41ffea9cbd7a"
dependencies = [
"alloy-sol-types",
"anyhow",
@@ -9056,9 +9056,9 @@ dependencies = [
[[package]]
name = "sp1-stark"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb820084dc880e82459d0988f5b379de79839a984d5dd668a4a4d8b9ca2b60f"
+checksum = "8fe6fec8caf6beffb063ce9aeda889dda156183d40c0b6da69ee521ee8b21e25"
dependencies = [
"arrayref",
"getrandom 0.2.15",
diff --git a/Cargo.toml b/Cargo.toml
index 7a1b6951d..ebac84ca5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,9 +58,9 @@ bonsai-sdk = { version = "=1.1.2" }
risc0-binfmt = { version = "=1.1.2" }
# SP1
-sp1-sdk = { version = "=3.0.0" }
-sp1-zkvm = { version = "=3.0.0" }
-sp1-helper = { version = "=3.0.0" }
+sp1-sdk = { version = "=3.3.0" }
+sp1-zkvm = { version = "=3.3.0" }
+sp1-helper = { version = "=3.3.0" }
# alloy
alloy-rlp = { version = "0.3.4", default-features = false }
diff --git a/provers/sp1/guest/Cargo.lock b/provers/sp1/guest/Cargo.lock
index 379afec6d..c49872c22 100644
--- a/provers/sp1/guest/Cargo.lock
+++ b/provers/sp1/guest/Cargo.lock
@@ -59,7 +59,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b515e82c8468ddb6ff8db21c78a5997442f113fd8471fd5b2261b2602dd0c67"
dependencies = [
"alloy-rlp",
- "num_enum 0.7.3",
+ "num_enum",
"serde",
"strum",
]
@@ -1102,12 +1102,6 @@ dependencies = [
"subtle",
]
-[[package]]
-name = "downcast-rs"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
-
[[package]]
name = "dunce"
version = "1.0.5"
@@ -1133,7 +1127,7 @@ dependencies = [
"hex-literal",
"rfc6979",
"signature",
- "sp1-lib 3.1.0",
+ "sp1-lib 3.3.0",
"spki",
]
@@ -1143,12 +1137,6 @@ version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
-[[package]]
-name = "elf"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4445909572dbd556c457c849c4ca58623d84b27c8fff1e74b0b4227d8b90d17b"
-
[[package]]
name = "elliptic-curve"
version = "0.13.8"
@@ -1168,27 +1156,6 @@ dependencies = [
"zeroize",
]
-[[package]]
-name = "enum-map"
-version = "2.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9"
-dependencies = [
- "enum-map-derive",
- "serde",
-]
-
-[[package]]
-name = "enum-map-derive"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.87",
-]
-
[[package]]
name = "enumn"
version = "0.1.14"
@@ -1777,12 +1744,6 @@ dependencies = [
"syn 1.0.109",
]
-[[package]]
-name = "nohash-hasher"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
-
[[package]]
name = "ntapi"
version = "0.4.1"
@@ -1918,34 +1879,13 @@ dependencies = [
"libc",
]
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive 0.5.11",
-]
-
[[package]]
name = "num_enum"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
dependencies = [
- "num_enum_derive 0.7.3",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
+ "num_enum_derive",
]
[[package]]
@@ -2234,7 +2174,7 @@ version = "3.6.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -2317,23 +2257,13 @@ dependencies = [
"uint",
]
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
-
[[package]]
name = "proc-macro-crate"
version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
]
[[package]]
@@ -3093,17 +3023,6 @@ dependencies = [
"chrono",
]
-[[package]]
-name = "rrs-succinct"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3372685893a9f67d18e98e792d690017287fd17379a83d798d958e517d380fa9"
-dependencies = [
- "downcast-rs",
- "num_enum 0.5.11",
- "paste",
-]
-
[[package]]
name = "ruint"
version = "1.12.3"
@@ -3236,7 +3155,7 @@ version = "2.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62"
dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -3480,45 +3399,11 @@ dependencies = [
"scale-info",
]
-[[package]]
-name = "sp1-core-executor"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4e28289e0dc59f08955c50cb89a406dd7943d48451e6bfb8bdf7d41f81019c8"
-dependencies = [
- "bincode",
- "bytemuck",
- "elf",
- "enum-map",
- "eyre",
- "hashbrown 0.14.5",
- "hex",
- "itertools 0.13.0",
- "log",
- "nohash-hasher",
- "num",
- "p3-field",
- "p3-maybe-rayon",
- "rand",
- "rrs-succinct",
- "serde",
- "sp1-curves",
- "sp1-primitives",
- "sp1-stark",
- "strum",
- "strum_macros",
- "thiserror",
- "tiny-keccak",
- "tracing",
- "typenum",
- "vec_map",
-]
-
[[package]]
name = "sp1-curves"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eaef1763516b57c6e845c74fbf7dede28a0930111e7eb62b97c923d869b195f6"
+checksum = "e4a68cf91e565d8d13a876775ec9a55b9e84078c99cf281fbd5ec2afafd72a93"
dependencies = [
"cfg-if",
"curve25519-dalek",
@@ -3538,9 +3423,9 @@ dependencies = [
[[package]]
name = "sp1-derive"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abc46a1a182a61be3cb3bb153368fe64f1c172ce439fe3ff03dda41573f8fa87"
+checksum = "9bdcf03d7e67fb93eb46d019e130be264258bef1412471b6e0950a5cd1ff5ac2"
dependencies = [
"quote",
"syn 1.0.109",
@@ -3560,7 +3445,6 @@ dependencies = [
"revm-precompile",
"secp256k1",
"sha2",
- "sp1-core-executor",
"sp1-curves",
"sp1-zkvm",
"substrate-bn",
@@ -3582,9 +3466,9 @@ dependencies = [
[[package]]
name = "sp1-lib"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14deb700469a37ec075bcf88dac3815b026dd9c4b9cb175980826f1fbb2e4e80"
+checksum = "fa1fe3d3e2a4cfe6b7259f0c00f770a4376fba892af20695b6ba450e0d02771c"
dependencies = [
"bincode",
"serde",
@@ -3592,9 +3476,9 @@ dependencies = [
[[package]]
name = "sp1-primitives"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a3a60fc832cfe2c7b5441b0f386f6ce7c768f62f3d49de20a76fa2648886373"
+checksum = "3442b59d2606ed4517c09b5daaa39e0e0d0ef75fb8e75b6f50334fd87a966b42"
dependencies = [
"bincode",
"hex",
@@ -3610,9 +3494,9 @@ dependencies = [
[[package]]
name = "sp1-stark"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfb820084dc880e82459d0988f5b379de79839a984d5dd668a4a4d8b9ca2b60f"
+checksum = "8fe6fec8caf6beffb063ce9aeda889dda156183d40c0b6da69ee521ee8b21e25"
dependencies = [
"arrayref",
"getrandom",
@@ -3646,9 +3530,9 @@ dependencies = [
[[package]]
name = "sp1-zkvm"
-version = "3.1.0"
+version = "3.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a5691948f95f2acbea5c7ccef08d70105a08b5fbbabe8dd5ed94b120bc2c9c3"
+checksum = "7123d0e616c6641a9088c604f5d00f728f396823e8a91ef805d54d6e1d8ccc1b"
dependencies = [
"cfg-if",
"getrandom",
@@ -3658,7 +3542,7 @@ dependencies = [
"p3-field",
"rand",
"sha2",
- "sp1-lib 3.1.0",
+ "sp1-lib 3.3.0",
"sp1-primitives",
]
@@ -3922,17 +3806,6 @@ version = "0.6.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap 2.4.0",
- "toml_datetime",
- "winnow",
-]
-
[[package]]
name = "toml_edit"
version = "0.21.1"
@@ -4158,15 +4031,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-dependencies = [
- "serde",
-]
-
[[package]]
name = "version_check"
version = "0.9.5"
diff --git a/provers/sp1/guest/Cargo.toml b/provers/sp1/guest/Cargo.toml
index 7ce0cabf3..286996e29 100644
--- a/provers/sp1/guest/Cargo.toml
+++ b/provers/sp1/guest/Cargo.toml
@@ -37,9 +37,8 @@ path = "src/benchmark/bn254_mul.rs"
[dependencies]
raiko-lib = { path = "../../../lib", features = ["std", "sp1"] }
-sp1-zkvm = { version = "3.0.0", features = ["verify"] }
-sp1-core = { package = "sp1-core-executor", version = "3.0.0" }
-sp1-curves = { version = "3.0.0" }
+sp1-zkvm = { version = "3.3.0", features = ["verify"] }
+sp1-curves = { version = "3.3.0" }
sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", branch = "patch-v0.10.8" }
secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", branch = "patch-secp256k1-v0.29.0" }
harness-core = { path = "../../../harness/core" }
@@ -67,7 +66,7 @@ blst = { git = "https://github.com/CeciliaZ030/blst.git", branch = "v0.3.12-seri
secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", branch = "patch-secp256k1-v0.29.0" }
sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", branch = "patch-v0.10.8", package = "sha2" }
sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", branch = "patch-sha3-v0.10.8", package = "sha3" }
-ecdsa-core = { git = "https://github.com/sp1-patches/signatures", package = "ecdsa", branch = "patch-ecdsa-v0.16.9" }
+ecdsa-core = { git = "https://github.com/sp1-patches/signatures", package = "ecdsa", tag = "ecdsa-v0.16.9-patch-v3.3.0" }
tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2" }
bn = { package = "substrate-bn", git = "https://github.com/sp1-patches/bn", branch = "chris/v0.6.0" }