chore: upgrade sp1 to v4 (#15)

* chore: upgrade sp1 to 4.0.0-rc.11 * fix: update fibonacci_proof.bin * fix: update groth16_vk * add * add --------- Co-authored-by: Ratan Kaliani <[email protected]>
succinctlabs · Jan 15, 2025 · ca2730c · ca2730c
1 parent 9e9a29c
commit ca2730c
Show file tree

Hide file tree

Showing 8 changed files with 792 additions and 873 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,10 @@
 [workspace]
-members = ["verifier", "example/script", "example/program", "example/sp1-program"]
+members = [
+    "verifier",
+    "example/script",
+    "example/program",
+    "example/sp1-program",
+]
 resolver = "2"
 
 [workspace.dependencies]
@@ -24,8 +29,6 @@ tokio = "1.40.0"
 sha2 = "0.10.8"
 
 # sp1
-sp1-sdk = { version = "3.0.0" }
-sp1-zkvm = { version = "3.0.0" }
-sp1-build = { version = "3.0.0" }
-
-
+sp1-sdk = "4.0.0"
+sp1-zkvm = "4.0.0"
+sp1-build = "4.0.0"
diff --git a/example/program/src/lib.rs b/example/program/src/lib.rs
@@ -36,7 +36,7 @@ pub fn process_instruction(
         .map_err(|_| ProgramError::InvalidInstructionData)?;
 
     // Get the SP1 Groth16 verification key from the `sp1-solana` crate.
-    let vk = sp1_solana::GROTH16_VK_3_0_0_BYTES;
+    let vk = sp1_solana::GROTH16_VK_4_0_0_RC3_BYTES;
 
     // Verify the proof.
     verify_proof(

diff --git a/example/script/src/main.rs b/example/script/src/main.rs
@@ -63,7 +63,7 @@ async fn main() {
     // Only generate a proof if the prove flag is set.
     if args.prove {
         // Initialize the prover client
-        let client = ProverClient::new();
+        let client = ProverClient::from_env();
         let (pk, vk) = client.setup(ELF);
 
         println!(
@@ -77,7 +77,7 @@ async fn main() {
 
         // Generate a proof for the fibonacci program.
         let proof = client
-            .prove(&pk, stdin)
+            .prove(&pk, &stdin)
             .groth16()
             .run()
             .expect("Groth16 proof generation failed");

diff --git a/proofs/fibonacci_proof.bin b/proofs/fibonacci_proof.bin
diff --git a/verifier/src/lib.rs b/verifier/src/lib.rs
@@ -32,6 +32,7 @@ mod utils;
 use utils::*;
 
 /// Groth16 verification keys for different SP1 versions.
+pub const GROTH16_VK_4_0_0_RC3_BYTES: &[u8] = include_bytes!("../vk/v4.0.0-rc.3/groth16_vk.bin");
 pub const GROTH16_VK_3_0_0_BYTES: &[u8] = include_bytes!("../vk/v3.0.0/groth16_vk.bin");
 pub const GROTH16_VK_3_0_0_RC4_BYTES: &[u8] = include_bytes!("../vk/v3.0.0rc4/groth16_vk.bin");
 pub const GROTH16_VK_2_0_0_BYTES: &[u8] = include_bytes!("../vk/v2.0.0/groth16_vk.bin");

diff --git a/verifier/src/test.rs b/verifier/src/test.rs
@@ -4,7 +4,7 @@ use sp1_sdk::SP1ProofWithPublicValues;
 
 #[test]
 fn test_verify_from_sp1() {
-    use crate::{verify_proof, GROTH16_VK_3_0_0_BYTES};
+    use crate::{verify_proof, GROTH16_VK_4_0_0_RC3_BYTES};
 
     // Read the serialized SP1ProofWithPublicValues from the file.
     let sp1_proof_with_public_values_file = "../proofs/fibonacci_proof.bin";
@@ -35,7 +35,7 @@ fn test_verify_from_sp1() {
         &proof_bytes,
         &sp1_public_inputs,
         &sp1_vkey_hash,
-        &GROTH16_VK_3_0_0_BYTES
+        &GROTH16_VK_4_0_0_RC3_BYTES
     )
     .is_ok());
 }

diff --git a/verifier/vk/v4.0.0-rc.3/groth16_vk.bin b/verifier/vk/v4.0.0-rc.3/groth16_vk.bin