diff --git a/Cargo.toml b/Cargo.toml index 6cb5a77..ebcaeb9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,5 +6,5 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -plonky2 = { git = "https://github.com/mir-protocol/plonky2", branch = "semaphore-example" } -anyhow = "1.0.56" \ No newline at end of file +plonky2 = { git = "https://github.com/mir-protocol/plonky2" } +anyhow = "1.0.56" diff --git a/src/access_set.rs b/src/access_set.rs index ed42fa9..58f4394 100644 --- a/src/access_set.rs +++ b/src/access_set.rs @@ -46,7 +46,7 @@ impl AccessSet { let mut pw = PartialWitness::new(); let targets = self.semaphore_circuit(&mut builder); - self.fill_semaphore_targets(&mut pw, private_key, topic, public_key_index, targets); + self.fill_semaphore_targets(&mut pw, private_key, topic, public_key_index, targets)?; let data = builder.build(); let proof = data.prove(pw)?; @@ -56,7 +56,7 @@ impl AccessSet { nullifier, proof: proof.proof, }, - data.to_verifier_data(), + data.verifier_data(), )) } } diff --git a/src/circuit.rs b/src/circuit.rs index f6a7258..f4f6941 100644 --- a/src/circuit.rs +++ b/src/circuit.rs @@ -1,9 +1,10 @@ -use plonky2::field::field_types::Field; -use plonky2::hash::hash_types::{HashOutTarget, MerkleCapTarget}; +use anyhow::Result; +use plonky2::field::types::Field; +use plonky2::hash::hash_types::HashOutTarget; use plonky2::hash::merkle_proofs::MerkleProofTarget; use plonky2::hash::poseidon::PoseidonHash; use plonky2::iop::target::Target; -use plonky2::iop::witness::{PartialWitness, Witness}; +use plonky2::iop::witness::{PartialWitness, WitnessWrite}; use plonky2::plonk::circuit_builder::CircuitBuilder; use crate::access_set::AccessSet; @@ -44,7 +45,7 @@ impl AccessSet { builder.verify_merkle_proof::( [private_key, [zero; 4]].concat(), &public_key_index_bits, - &MerkleCapTarget(vec![merkle_root]), + merkle_root, &merkle_proof, ); @@ -71,7 +72,7 @@ impl AccessSet { topic: Digest, public_key_index: usize, targets: SemaphoreTargets, - ) { + ) -> Result<()> { let SemaphoreTargets { merkle_root, topic: topic_target, @@ -80,13 +81,13 @@ impl AccessSet { public_key_index: public_key_index_target, } = targets; - pw.set_hash_target(merkle_root, self.0.cap.0[0]); - pw.set_targets(&private_key_target, &private_key); - pw.set_targets(&topic_target, &topic); + pw.set_hash_target(merkle_root, self.0.cap.0[0])?; + pw.set_target_arr(&private_key_target, &private_key)?; + pw.set_target_arr(&topic_target, &topic)?; pw.set_target( public_key_index_target, F::from_canonical_usize(public_key_index), - ); + )?; let merkle_proof = self.0.prove(public_key_index); for (ht, h) in merkle_proof_target @@ -94,7 +95,8 @@ impl AccessSet { .into_iter() .zip(merkle_proof.siblings) { - pw.set_hash_target(ht, h); + pw.set_hash_target(ht, h)?; } + Ok(()) } } diff --git a/src/recursion.rs b/src/recursion.rs index e90a478..bf0e836 100644 --- a/src/recursion.rs +++ b/src/recursion.rs @@ -1,6 +1,7 @@ -use plonky2::iop::witness::{PartialWitness, Witness}; +use anyhow::Result; +use plonky2::iop::witness::{PartialWitness, WitnessWrite}; use plonky2::plonk::circuit_builder::CircuitBuilder; -use plonky2::plonk::circuit_data::{CircuitConfig, VerifierCircuitData, VerifierCircuitTarget}; +use plonky2::plonk::circuit_data::{CircuitConfig, VerifierCircuitData}; use plonky2::plonk::proof::ProofWithPublicInputs; use crate::access_set::AccessSet; @@ -14,7 +15,7 @@ impl AccessSet { topic1: Digest, signal1: Signal, verifier_data: &VerifierCircuitData, - ) -> (Digest, Digest, PlonkyProof) { + ) -> Result<(Digest, Digest, PlonkyProof, VerifierCircuitData)> { let config = CircuitConfig::standard_recursion_zk_config(); let mut builder = CircuitBuilder::new(config); let mut pw = PartialWitness::new(); @@ -45,7 +46,7 @@ impl AccessSet { proof: signal0.proof, public_inputs: public_inputs0, }, - ); + )?; let proof_target1 = builder.add_virtual_proof_with_pis(&verifier_data.common); pw.set_proof_with_pis_target( &proof_target1, @@ -53,25 +54,28 @@ impl AccessSet { proof: signal1.proof, public_inputs: public_inputs1, }, - ); + )?; - let vd_target = VerifierCircuitTarget { - constants_sigmas_cap: builder - .add_virtual_cap(verifier_data.common.config.fri_config.cap_height), - }; + let vd_target = + builder.add_virtual_verifier_data(verifier_data.common.config.fri_config.cap_height); pw.set_cap_target( &vd_target.constants_sigmas_cap, &verifier_data.verifier_only.constants_sigmas_cap, - ); + )?; - builder.verify_proof(proof_target0, &vd_target, &verifier_data.common); - builder.verify_proof(proof_target1, &vd_target, &verifier_data.common); + builder.verify_proof::(&proof_target0, &vd_target, &verifier_data.common); + builder.verify_proof::(&proof_target1, &vd_target, &verifier_data.common); let data = builder.build(); let recursive_proof = data.prove(pw).unwrap(); data.verify(recursive_proof.clone()).unwrap(); - (signal0.nullifier, signal1.nullifier, recursive_proof.proof) + Ok(( + signal0.nullifier, + signal1.nullifier, + recursive_proof.proof, + data.verifier_data(), + )) } } diff --git a/src/signal.rs b/src/signal.rs index 846940e..e5681bc 100644 --- a/src/signal.rs +++ b/src/signal.rs @@ -16,7 +16,7 @@ pub struct Signal { #[cfg(test)] mod tests { use anyhow::Result; - use plonky2::field::field_types::Field; + use plonky2::field::types::{Field, Sample}; use plonky2::hash::merkle_tree::MerkleTree; use plonky2::hash::poseidon::PoseidonHash; use plonky2::plonk::config::Hasher; @@ -27,7 +27,7 @@ mod tests { #[test] fn test_semaphore() -> Result<()> { let n = 1 << 20; - let private_keys: Vec = (0..n).map(|_| F::rand_arr()).collect(); + let private_keys: Vec = (0..n).map(|_| F::rand_array()).collect(); let public_keys: Vec> = private_keys .iter() .map(|&sk| { @@ -39,7 +39,7 @@ mod tests { let access_set = AccessSet(MerkleTree::new(public_keys, 0)); let i = 12; - let topic = F::rand_arr(); + let topic = F::rand_array(); let (signal, vd) = access_set.make_signal(private_keys[i], topic, i)?; access_set.verify_signal(topic, signal, &vd)