Update sp1

Author: MauroToscano

batcher/Cargo.lock

@@ -0,0 +1,36 @@
+[package]
+name = "aligned-batcher"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+tokio-tungstenite = "0.21.0"
+futures-util = "0.3.30"
+tokio = { version = "1.37.0", features = ["rt", "rt-multi-thread", "macros"] }
+log = "0.4.21"
+env_logger = "0.11.3"
+serde_json = "1.0.117"
+serde = { version = "1.0.201", features = ["derive"] }
+clap = { version = "4.5.4", features = ["derive"] }
+sha3 = "0.10.8"
+aws-config = "1.4.0"
+aws-sdk-s3 = "1.29.0"
+bytes = "1.7.1"
+hex = "0.4.3"
+dotenvy = "0.15.0"
+anyhow = "1.0.83"
+ethers = { version = "2.0", features = ["ws", "rustls"] }
+lambdaworks-crypto = { git = "https://github.com/lambdaclass/lambdaworks.git", rev = "efd46f0b0aea3aa95d94bba7de86cb96611b40d3", features = ["serde"] }
+serde_yaml = "0.9.34"
+sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v4.1.3" }
+risc0-zkvm = { git = "https://github.com/risc0/risc0", tag = "v1.1.2" }
+bincode = "1.3.3"
+aligned-sdk = { path = "../aligned-sdk" }
+ciborium = "=0.2.2"
+priority-queue = "2.1.0"
+reqwest = { version = "0.12", features = ["json"] }
+
+once_cell = "1.20.2"
+warp = "0.3.7"
+prometheus = { version = "0.13.4", features = ["process"] }
+backon = "1.2.0"

batcher/aligned-batcher/Cargo copy.toml

@@ -22,7 +22,7 @@ anyhow = "1.0.83"
 ethers = { version = "2.0", features = ["ws", "rustls"] }
 lambdaworks-crypto = { git = "https://github.com/lambdaclass/lambdaworks.git", rev = "efd46f0b0aea3aa95d94bba7de86cb96611b40d3", features = ["serde"] }
 serde_yaml = "0.9.34"
-sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v3.0.0" }
+sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v4.1.3" }
 risc0-zkvm = { git = "https://github.com/risc0/risc0", tag = "v1.1.2" }
 bincode = "1.3.3"
 aligned-sdk = { path = "../aligned-sdk" }

batcher/aligned-batcher/Cargo.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-04-17"
+channel = "stable"
 components = ["llvm-tools", "rustc-dev"]

batcher/aligned-batcher/rust-toolchain

@@ -1,8 +1,8 @@
 use log::{debug, error, warn};
-use sp1_sdk::ProverClient;
+use sp1_sdk::{EnvProver, ProverClient};
 use std::sync::OnceLock;
 
-static SP1_PROVER_CLIENT: OnceLock<ProverClient> = OnceLock::new();
+static SP1_PROVER_CLIENT: OnceLock<EnvProver> = OnceLock::new();
 
 pub fn verify_sp1_proof(proof: &[u8], elf: &[u8]) -> bool {
     if proof.is_empty() || elf.is_empty() {
@@ -11,10 +11,11 @@ pub fn verify_sp1_proof(proof: &[u8], elf: &[u8]) -> bool {
     }
 
     debug!("Verifying SP1 proof");
-    let prover_client = SP1_PROVER_CLIENT.get_or_init(ProverClient::new);
+    let prover_client = SP1_PROVER_CLIENT.get_or_init(ProverClient::from_env);
 
     let (_pk, vk) = prover_client.setup(elf);
     if let Ok(proof) = bincode::deserialize(proof) {
+        //client.verify(&proof, &vk).expect("failed to verify proof");
         let res = prover_client.verify(&proof, &vk).is_ok();
         debug!("SP1 proof is valid: {}", res);
         if res {

batcher/aligned-batcher/src/sp1/mod.rs

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2024-04-17"
+channel = "stable"
 components = ["llvm-tools", "rustc-dev"]

batcher/aligned/rust-toolchain

@@ -4,4 +4,4 @@ name = "fibonacci-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "v3.0.0"  }
+sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "v4.1.3"  }

examples/validating-public-input/sp1/fibonacci/program/Cargo.toml

@@ -9,7 +9,7 @@ name = "fibonacci"
 path = "src/main.rs"
 
 [dependencies]
-sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v3.0.0" }
+sp1-sdk = { git = "https://github.com/succinctlabs/sp1.git", rev = "v4.1.3" }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 clap = { version = "4.0", features = ["derive", "env"] }
@@ -19,5 +19,5 @@ alloy-sol-types = { workspace = true }
 bincode = "1.3.3"
 
 [build-dependencies]
-sp1-helper = { git = "https://github.com/succinctlabs/sp1.git", rev = "v3.0.0"  }
+sp1-helper = { git = "https://github.com/succinctlabs/sp1.git", rev = "v4.1.3"  }
 sp1-build = "3.0.0"

examples/validating-public-input/sp1/fibonacci/script/Cargo.toml

@@ -8,7 +8,7 @@ fn main() {
     sp1_sdk::utils::setup_logger();
 
     // Setup the prover client.
-    let client = ProverClient::new();
+    let client = ProverClient::from_env();
 
     // Setup the inputs.
     let n = 500;

examples/validating-public-input/sp1/fibonacci/script/src/main.rs

@@ -5,7 +5,7 @@ name = "quiz-program"
 edition = "2021"
 
 [dependencies]
-sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "v3.0.0" }
+sp1-zkvm = { git = "https://github.com/succinctlabs/sp1.git", rev = "v4.1.3" }
 tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2", features = [
     "sha3",
 ] }