WIP

Author: aoengin

Cargo.lock

@@ -62,7 +62,7 @@ hyper-util = { version = "0.1" }
 sha2 = { version = "=0.10.8", default-features = false }
 crypto-bigint = { version = "=0.5.5", features = ["rand_core"] }
 borsh = { version = "1.5.1", features = ["derive"] }
-k256 = { version = "=0.13.3", default-features = false }
+k256 = { version = "=0.13.4" }
 risc0-build = "1.2"
 risc0-zkvm = { version = "1.2" }
 ripemd = "0.1.3"

Cargo.toml

@@ -9,15 +9,13 @@ use bitcoin::{consensus::Decodable, hashes::Hash};
 use borsh::{self, BorshDeserialize};
 use circuits_lib::bridge_circuit::groth16::CircuitGroth16Proof;
 use circuits_lib::bridge_circuit::structs::{BridgeCircuitInput, WorkOnlyCircuitInput};
-use circuits_lib::bridge_circuit::winternitz::verify_winternitz_signature;
 use circuits_lib::bridge_circuit::HEADER_CHAIN_METHOD_ID;
 use final_spv::merkle_tree::BitcoinMerkleTree;
 use final_spv::spv::SPV;
 use header_chain::header_chain::CircuitBlockHeader;
 use header_chain::mmr_native::MMRNative;
 
 use risc0_zkvm::{compute_image_id, default_prover, ExecutorEnv, ProverOpts, Receipt};
-use sha2::{Digest, Sha256};
 
 const _BRIDGE_CIRCUIT_ELF: &[u8] =
     include_bytes!("../../risc0-circuits/elfs/prod-testnet4-bridge-circuit-guest");
@@ -82,7 +80,6 @@ pub fn prove_bridge_circuit(
     //     panic!("Light client proof receipt verification failed");
     // }
 
-
     // Header chain verification
     if header_chain_proof_output_serialized
         != bridge_circuit_host_params.headerchain_receipt.journal.bytes
@@ -339,6 +336,7 @@ mod tests {
         include_bytes!("../../risc0-circuits/elfs/test-testnet4-bridge-circuit-guest");
     const WORK_ONLY_ELF: &[u8] =
         include_bytes!("../../risc0-circuits/elfs/testnet4-work-only-guest");
+
     pub static WORK_ONLY_IMAGE_ID: [u8; 32] =
         hex_literal::hex!("1ff9f5b6d77bbd4296e1749049d4a841088fb72f7a324da71e31fa1576d4bc0b");
 
@@ -433,13 +431,16 @@ mod tests {
             .try_into()
             .unwrap();
 
-        println!("commited_total_work: {:?}", commited_total_work);
-
         let input: u64 = 1;
 
         let compressed_proof_and_total_work: Vec<u8> =
             [compressed_proof.as_ref(), commited_total_work.as_ref()].concat();
 
+        println!(
+            "Compressed proof and total work: {:?}",
+            hex::encode(compressed_proof_and_total_work.clone())
+        );
+
         let len = compressed_proof_and_total_work.len();
         let n0 = u32::try_from(len).expect("Length exceeds u32 max value");
         let params = Parameters::new(n0, 8);

bridge-circuit-host/src/bridge_circuit_host.rs

@@ -43,8 +43,7 @@ itertools = { workspace = true }
 final-spv = { workspace = true }
 header-chain = { workspace = true }
 
-
-secp256k1 = { version = "=0.29.0", default-features = false }
+k256 = { workspace = true }
 
 [features]
 not_patched = []

circuits-lib/Cargo.toml

@@ -13,4 +13,4 @@ hex-literal = "0.4.1"
 [patch.crates-io]
 sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
 crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
-secp256k1 = { git = "https://github.com/Sovereign-Labs/rust-secp256k1.git", branch = "risc0-compatible-0-29-0" }
+k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.1" }

circuits-lib/src/bridge_circuit/mod.rs

@@ -7,9 +7,8 @@ edition = "2021"
 
 [dependencies]
 circuits-lib = { path = "../../../circuits-lib" }
-cc = { version = "=1.1.31" }
 
 [patch.crates-io]
 sha2 = { git = "https://github.com/risc0/RustCrypto-hashes", tag = "sha2-v0.10.8-risczero.0" }
 crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
-secp256k1 = { git = "https://github.com/Sovereign-Labs/rust-secp256k1.git", branch = "risc0-compatible-0-29-0" }
+k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.1" }