Update the sp1 to 4.2.1

Author: NDobrev

Cargo.toml

@@ -25,7 +25,7 @@ members = [
 
 [dependencies]
 hex = "0.4.3"
-sp1-sdk = "3.4.0"
+sp1-sdk = "4.2.1"
 
 text_io = "0.1.12"
 serde = { version = "1.0", features = ["derive"] }
@@ -42,4 +42,4 @@ axum        = "0.7"
 tokio       = { version = "1", features = ["full"] }
 
 [build-dependencies]
-sp1-build = "4.0.0"
+sp1-build = "4.2.1"

crates/bad_encrypted_share_prove/Cargo.toml

@@ -5,14 +5,14 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp1-zkvm = "3.4.0"
+sp1-zkvm = "4.2.1"
 ff = "0.13.0"
 rand = "0.8.5"
 group = "0.13.0"
 serde = "1.0.216"
 serde_cbor = "0.10"
 dkg = { path = "../dkg" }
-bls12_381 = { git = "https://github.com/NDobrev/bls12_381", branch="fp-to-bytes", features = ["experimental"]}
+bls12_381 =  { git = "https://github.com/sp1-patches/bls12_381", tag = "patch-0.8.0-sp1-4.0.0-v2", features = ["experimental"]}
 hex = "0.4"
 chacha20 = "0.9.1"
 sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", tag= "sha2-v0.9.9-patch-v1" }

crates/bad_parial_key_prove/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp1-zkvm = "3.4.0"
+sp1-zkvm = "4.2.1"
 ff = "0.13.0"
 rand = "0.8.5"
 group = "0.13.0"

crates/bad_share_exchange_prove/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp1-zkvm = "3.4.0"
+sp1-zkvm = "4.2.1"
 ff = "0.13.0"
 rand = "0.8.5"
 group = "0.13.0"

crates/dkg/Cargo.toml

@@ -15,7 +15,7 @@ schemars = "0.8.22"
 serde_yaml = "0.9.34"
 paste = "1.0"
 hex = "0.4"
-sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", tag= "sha2-v0.9.9-patch-v1" }
+sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "patch-sha2-0.10.8-sp1-4.0.0" }
 bls_org = { package = "bls12_381", version = "0.8.0"}
-secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", tag = "secp256k1-v0.29.1-patch-v1"}
-bls12_381 = { git = "https://github.com/sp1-patches/bls12_381", tag = "bls12_381-v0.8.0-patch-v1" , features = ["experimental"]}
+secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", tag = "patch-0.29.1-sp1-4.1.0"}
+bls12_381 =  { git = "https://github.com/sp1-patches/bls12_381", tag = "patch-0.8.0-sp1-4.0.0-v2", features = ["experimental"]}

crates/dkg/src/crypto/bls_common.rs

@@ -3,12 +3,24 @@ use bls12_381::{
     pairing, G1Affine, G1Projective, G2Affine, G2Projective, Scalar,
 };
 
+use core::convert::AsRef;
+
 use crate::types::*;
 use sha2::Sha256;
 
 pub fn hash_message_to_g2(msg: &[u8]) -> G2Projective {
     let domain = b"BLS_SIG_BLS12381G2_XMD:SHA-256_SSWU_RO_POP_";
-    <G2Projective as HashToCurve<ExpandMsgXmd<Sha256>>>::hash_to_curve(msg, domain)
+
+    struct MsgInternal<'a> {
+        msg: &'a [u8],
+    }
+
+    impl bls12_381::hash_to_curve::Message for MsgInternal<'_> {
+        fn input_message(self, mut f: impl FnMut(&[u8])) {
+            f(self.msg);
+        }
+    }
+    <G2Projective as HashToCurve<ExpandMsgXmd<Sha256>>>::hash_to_curve(MsgInternal { msg }, domain)
 }
 
 pub fn bls_verify_precomputed_hash(

crates/finalization_prove/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-sp1-zkvm = "3.4.0"
+sp1-zkvm = "4.2.1"
 ff = "0.13.0"
 rand = "0.8.5"
 group = "0.13.0"

src/main.rs

@@ -435,9 +435,9 @@ where
     let bin = serde_cbor::to_vec(data).expect("Failed to serialize data");
     println!("input len: {}", bin.len());
     stdin.write(&bin);
-    let client = ProverClient::new();
+    let client = ProverClient::from_env();
     let (_public_values, report) = client
-        .execute(elf, stdin)
+        .execute(elf, &stdin)
         .run()
         .map_err(|e| style_error(format!("Verification failed: {e}")))?;
     if show_report {
@@ -458,10 +458,10 @@ where
     let mut stdin = SP1Stdin::new();
     let bin = serde_cbor::to_vec(data).expect("Failed to serialize data");
     stdin.write(&bin);
-    let client = ProverClient::new();
+    let client = ProverClient::from_env();
     let (pk, _) = client.setup(elf);
     let proof = client
-        .prove(&pk, stdin)
+        .prove(&pk, &stdin)
         .run()
         .map_err(|e| style_error(format!("Proof generation failed: {e}")))?;
 
@@ -478,7 +478,7 @@ where
 }
 
 fn verify_proof(elf: &[u8], proof_file: &str, show_report: bool) -> Result<(), Box<dyn Error>> {
-    let client = ProverClient::new();
+    let client = ProverClient::from_env();
     let (_, vk) = client.setup(elf);
 
     let proof_with_pub_values = SP1ProofWithPublicValues::load(proof_file).map_err(|e| {
@@ -496,7 +496,7 @@ fn verify_proof(elf: &[u8], proof_file: &str, show_report: bool) -> Result<(), B
     stdin.write(&vk);
 
     let (_, report) = client
-        .execute(elf, stdin)
+        .execute(elf, &stdin)
         .run()
         .map_err(|e| style_error(format!("Verification failed: {e}")))?;