From 0ad7730a0ccd22325cb88ff9394d032e37c133b0 Mon Sep 17 00:00:00 2001 From: Ignacio Hagopian Date: Tue, 29 Jul 2025 17:04:20 +0200 Subject: [PATCH] sp1: update sdk (#69) Signed-off-by: Ignacio Hagopian --- Cargo.lock | 160 +++++++++++++++++++++++++++++--------- crates/ere-sp1/Cargo.toml | 2 +- docker/sp1/Dockerfile | 2 +- 3 files changed, 124 insertions(+), 40 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d4ad189..7d771f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,21 +129,35 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09" dependencies = [ - "alloy-sol-macro-expander", - "alloy-sol-macro-input", + "alloy-sol-macro-expander 0.7.7", + "alloy-sol-macro-input 0.7.7", "proc-macro-error", "proc-macro2", "quote", "syn 2.0.101", ] +[[package]] +name = "alloy-sol-macro" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aedac07a10d4c2027817a43cc1f038313fc53c7ac866f7363239971fd01f9f18" +dependencies = [ + "alloy-sol-macro-expander 1.3.0", + "alloy-sol-macro-input 1.3.0", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "alloy-sol-macro-expander" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525" dependencies = [ - "alloy-sol-macro-input", + "alloy-sol-macro-input 0.7.7", "const-hex", "heck 0.5.0", "indexmap 2.9.0", @@ -151,7 +165,25 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.101", - "syn-solidity", + "syn-solidity 0.7.7", + "tiny-keccak", +] + +[[package]] +name = "alloy-sol-macro-expander" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f9a598f010f048d8b8226492b6401104f5a5c1273c2869b72af29b48bb4ba9" +dependencies = [ + "alloy-sol-macro-input 1.3.0", + "const-hex", + "heck 0.5.0", + "indexmap 2.9.0", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.101", + "syn-solidity 1.3.0", "tiny-keccak", ] @@ -167,7 +199,23 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.101", - "syn-solidity", + "syn-solidity 0.7.7", +] + +[[package]] +name = "alloy-sol-macro-input" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f494adf9d60e49aa6ce26dfd42c7417aa6d4343cf2ae621f20e4d92a5ad07d85" +dependencies = [ + "const-hex", + "dunce", + "heck 0.5.0", + "macro-string", + "proc-macro2", + "quote", + "syn 2.0.101", + "syn-solidity 1.3.0", ] [[package]] @@ -177,11 +225,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" dependencies = [ "alloy-primitives 0.7.7", - "alloy-sol-macro", + "alloy-sol-macro 0.7.7", "const-hex", "serde", ] +[[package]] +name = "alloy-sol-types" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5460a975434ae594fe2b91586253c1beb404353b78f0a55bf124abcd79557b15" +dependencies = [ + "alloy-primitives 1.1.0", + "alloy-sol-macro 1.3.0", + "const-hex", +] + [[package]] name = "android-tzdata" version = "0.1.1" @@ -3671,7 +3730,7 @@ version = "0.1.0" source = "git+https://github.com/kevaundray/jolt?branch=kw%2Fere-fork#831dd937303b1055f995d3836d0dd61a818969fe" dependencies = [ "alloy-primitives 0.7.7", - "alloy-sol-types", + "alloy-sol-types 0.7.7", "anyhow", "ark-bn254", "ark-ec", @@ -3936,6 +3995,17 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "macro-string" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "malachite" version = "0.4.22" @@ -8126,7 +8196,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8738,9 +8808,9 @@ dependencies = [ [[package]] name = "sp1-build" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5563b406d74b417ce07c0d7e0d8184b423f3bc3eacd1e98b105691a167f47c8f" +checksum = "a8b0ae601dd5e1ed72e8f7bfdb3db25409daa3975f1f34b7e4c6dc11cb7756bd" dependencies = [ "anyhow", "cargo_metadata 0.18.1", @@ -8752,9 +8822,9 @@ dependencies = [ [[package]] name = "sp1-core-executor" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291c086ca35f43725b33337a7a33c64418d89033d8d6e5586f82b9de2cf90dcb" +checksum = "2a585a154b0b43d75481c5e58057c3dd72d88c8a36b30205a2365718e493cd2d" dependencies = [ "bincode", "bytemuck", @@ -8791,9 +8861,9 @@ dependencies = [ [[package]] name = "sp1-core-machine" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "236d063c38900e8346342af0b352a23d25b9806b624ee30fcae4c0cc7ddbed27" +checksum = "20e23baf403939adcbe73070bf03f41da26e0d4a18382408a945606cb168fb0d" dependencies = [ "bincode", "cbindgen", @@ -8836,6 +8906,7 @@ dependencies = [ "static_assertions", "strum", "strum_macros", + "sysinfo", "tempfile", "thiserror 1.0.69", "tracing", @@ -8847,9 +8918,9 @@ dependencies = [ [[package]] name = "sp1-cuda" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c81ab46ba84d41e471351329a69ac43be7da1aa701ed29c70048c83c0fe28c" +checksum = "a2efa1d0adcc7744ca6427898ba8ce4e8a5d94540e674b5c2e136821f086376f" dependencies = [ "bincode", "ctrlc", @@ -8864,9 +8935,9 @@ dependencies = [ [[package]] name = "sp1-curves" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4d6faecc70f0ca84d0e1259ab2f5eb6d2d351d263c3cd00edf654f8530c0473" +checksum = "9208e3831da02d1327bd33d852d06770a1c6dbd291591e5a6f0f6a3f4fc44ff9" dependencies = [ "cfg-if", "dashu", @@ -8886,9 +8957,9 @@ dependencies = [ [[package]] name = "sp1-derive" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c25a3bd262f3b0b0ab59d9bc86638ebd895ade9c16526203023c08f926d62732" +checksum = "5efc1439094c4dc86e35e2ded63ef2b56b2717671adc0582373e9a7ac76c8b34" dependencies = [ "quote", "syn 1.0.109", @@ -8907,9 +8978,9 @@ dependencies = [ [[package]] name = "sp1-primitives" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "699935774a5131c1a8b371108d0666c0c80c43611045fb77fae43f2f242676d5" +checksum = "5504d5a422be065fa8f1fc49ff5208017d6e3fe7e392a7761e73178581f5f35d" dependencies = [ "bincode", "blake3", @@ -8927,9 +8998,9 @@ dependencies = [ [[package]] name = "sp1-prover" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9381b478115137a435d02756dae7f3da01abaa0b1b9db8c0973389bd5bfaa9" +checksum = "afaa1d5a3ccb8b366ec109c396681fdc07d8c637aa6003889f171aaac86d18ed" dependencies = [ "anyhow", "bincode", @@ -8972,9 +9043,9 @@ dependencies = [ [[package]] name = "sp1-recursion-circuit" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e56f69b0e112a7fbba23cbef61fb37f6092ba6897425859b30c4cd2786450179" +checksum = "df69d5d8fac13f45cf4f2d79e27204091fde377ec71253dd7b55101de675d5fb" dependencies = [ "hashbrown 0.14.5", "itertools 0.13.0", @@ -9007,9 +9078,9 @@ dependencies = [ [[package]] name = "sp1-recursion-compiler" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6101a4c46d55206a5f0d312fd6f663248cbdb49c90f1662138f20472bef31b71" +checksum = "315f723325c6029c0716ff3b272aaffe4c0a7f9612d2b3fe5b3d4838895f9e3d" dependencies = [ "backtrace", "itertools 0.13.0", @@ -9029,9 +9100,9 @@ dependencies = [ [[package]] name = "sp1-recursion-core" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fa9644be4e3b9cf0b1f0976b2c3814dbd5b6d6f47dc8662d6a22828f2c3dd7" +checksum = "70c10b0080100f579c90914c1587414a4adc3a102e2d607566f3ac8a60f67536" dependencies = [ "backtrace", "cbindgen", @@ -9072,9 +9143,9 @@ dependencies = [ [[package]] name = "sp1-recursion-derive" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e6d5c7e2620d61956e6f75026a88ef2f714dab4abf84e870f13145e6bbec79" +checksum = "6e2016c366414f7ae15f1f45c87082ca39a6b12edf5573cfef324d534e558972" dependencies = [ "quote", "syn 1.0.109", @@ -9082,9 +9153,9 @@ dependencies = [ [[package]] name = "sp1-recursion-gnark-ffi" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40fc06701180ce02d6079370d00ca74b8d86c84d85909a3684eddc8bfd8c1bf" +checksum = "b10e8e6519c601ee244ff29d2746787d524034b4dbe42a1d66f901386396febd" dependencies = [ "anyhow", "bincode", @@ -9108,11 +9179,12 @@ dependencies = [ [[package]] name = "sp1-sdk" -version = "5.0.8" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6f73c5efb1f55c0b6dca8a9427124eff4e36bd57108a96a7eb5a6034cf61a1" +checksum = "107fab01d5f78c4d3537ddd768de9b22d9ba442aea50d404c2a988265bdb00ba" dependencies = [ "alloy-primitives 1.1.0", + "alloy-sol-types 1.1.0", "anyhow", "async-trait", "backoff", @@ -9153,9 +9225,9 @@ dependencies = [ [[package]] name = "sp1-stark" -version = "5.0.5" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a795a0a309949772a6f26480f5d844e9f2fad9ef82e4caef9e7b0cec98daffe" +checksum = "dbe80bdd3bb89d1543c1ad53a47fd902fe20293d4e1ccc20ca2ecff600f32477" dependencies = [ "arrayref", "hashbrown 0.14.5", @@ -9421,6 +9493,18 @@ dependencies = [ "syn 2.0.101", ] +[[package]] +name = "syn-solidity" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a985ff4ffd7373e10e0fb048110fb11a162e5a4c47f92ddb8787a6f766b769" +dependencies = [ + "paste", + "proc-macro2", + "quote", + "syn 2.0.101", +] + [[package]] name = "sync_wrapper" version = "1.0.2" diff --git a/crates/ere-sp1/Cargo.toml b/crates/ere-sp1/Cargo.toml index 1449b67..c30efe5 100644 --- a/crates/ere-sp1/Cargo.toml +++ b/crates/ere-sp1/Cargo.toml @@ -8,7 +8,7 @@ license.workspace = true [dependencies] zkvm-interface = { workspace = true } build-utils.workspace = true -sp1-sdk = "5.0.8" +sp1-sdk = "5.1.0" tempfile = "3.3" bincode = "1.3" thiserror = "2" diff --git a/docker/sp1/Dockerfile b/docker/sp1/Dockerfile index fd4bafa..263e700 100644 --- a/docker/sp1/Dockerfile +++ b/docker/sp1/Dockerfile @@ -27,7 +27,7 @@ RUN chmod +x /tmp/install_sp1_sdk.sh # The install_sp1_sdk.sh script will respect these ENV variables. # TODO: we are hardcoding /root which may not work for other users ENV SP1UP_HOME="/root/.sp1up" \ - SP1UP_SDK_INSTALL_VERSION="v5.0.8" \ + SP1UP_SDK_INSTALL_VERSION="v5.1.0" \ SP1_HOME="/root/.sp1" # Run the SP1 SDK installation script