mirror of
https://github.com/arnaucube/sonobe.git
synced 2026-01-28 14:56:40 +01:00
Unify the computation of digests and challenges in different folding schemes (#94)
* Remove the trait bound `C::BaseField: PrimeField` for better DX
* Methods in `TranscriptVar` now exactly matches the ones in `Transcript`
* Add `ProtoGalaxyTranscriptVar` and `CommittedInstanceVar` for protogalaxy
* betas are unnecessary in "plain" (incoming) instances
* Absorb the result of `get_challenge_nbits` as well
* `ProtoGalaxyTranscript` now allows absorbing mulitple instances
* Always return `Result<(), SynthesisError>` in `ProtoGalaxyTranscriptVar`
* Impl `Transcript{Var}` for `PoseidonSponge{Var}` directly and remove `PoseidonTranscript{Var}`
* `Transcript::absorb_point` doesn't need to return `Error`
* Add `AbsorbNonNative` trait for hashing non-native values
Note that now `absorb_point` only supports hashing points whose BaseField is equal to the sponge's field
* More efficient `TranscriptVar::absorb_point` by securely removing `is_inf`
* Use `sponge` and `transcript` consistently
* Clarify the usage of `AbsorbNonNative{Gadget}`
* Generic `sponge` and `transcript` params
* Avoid unstable `associated_type_bounds`
* Reuse `sponge` in hypernova
* Clean up redundant imports
* Remove unstable code
* Clarify the usage of `absorb_point` and `absorb_nonnative`
This commit is contained in:
@@ -1,11 +1,7 @@
|
||||
/// contains [Nova](https://eprint.iacr.org/2021/370.pdf) related circuits
|
||||
use ark_crypto_primitives::crh::{
|
||||
poseidon::constraints::{CRHGadget, CRHParametersVar},
|
||||
CRHSchemeGadget,
|
||||
};
|
||||
use ark_crypto_primitives::sponge::{
|
||||
constraints::CryptographicSpongeVar,
|
||||
poseidon::{constraints::PoseidonSpongeVar, PoseidonConfig, PoseidonSponge},
|
||||
constraints::{AbsorbGadget, CryptographicSpongeVar},
|
||||
poseidon::{constraints::PoseidonSpongeVar, PoseidonConfig},
|
||||
Absorb, CryptographicSponge,
|
||||
};
|
||||
use ark_ec::{CurveGroup, Group};
|
||||
@@ -17,6 +13,7 @@ use ark_r1cs_std::{
|
||||
fields::{fp::FpVar, FieldVar},
|
||||
groups::GroupOpsBounds,
|
||||
prelude::CurveVar,
|
||||
uint8::UInt8,
|
||||
R1CSVar, ToConstraintFieldGadget,
|
||||
};
|
||||
use ark_relations::r1cs::{ConstraintSynthesizer, ConstraintSystemRef, Namespace, SynthesisError};
|
||||
@@ -29,13 +26,11 @@ use crate::folding::circuits::{
|
||||
cyclefold::{
|
||||
CycleFoldChallengeGadget, CycleFoldCommittedInstanceVar, NIFSFullGadget, CF_IO_LEN,
|
||||
},
|
||||
nonnative::{
|
||||
affine::{nonnative_affine_to_field_elements, NonNativeAffineVar},
|
||||
uint::NonNativeUintVar,
|
||||
},
|
||||
nonnative::{affine::NonNativeAffineVar, uint::NonNativeUintVar},
|
||||
CF1, CF2,
|
||||
};
|
||||
use crate::frontend::FCircuit;
|
||||
use crate::transcript::{AbsorbNonNativeGadget, Transcript, TranscriptVar};
|
||||
|
||||
/// CommittedInstanceVar contains the u, x, cmE and cmW values which are folded on the main Nova
|
||||
/// constraints field (E1::Fr, where E1 is the main curve). The peculiarity is that cmE and cmW are
|
||||
@@ -78,6 +73,26 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
impl<C> AbsorbGadget<C::ScalarField> for CommittedInstanceVar<C>
|
||||
where
|
||||
C: CurveGroup,
|
||||
<C as ark_ec::CurveGroup>::BaseField: ark_ff::PrimeField,
|
||||
{
|
||||
fn to_sponge_bytes(&self) -> Result<Vec<UInt8<C::ScalarField>>, SynthesisError> {
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
fn to_sponge_field_elements(&self) -> Result<Vec<FpVar<C::ScalarField>>, SynthesisError> {
|
||||
Ok([
|
||||
vec![self.u.clone()],
|
||||
self.x.clone(),
|
||||
self.cmE.to_constraint_field()?,
|
||||
self.cmW.to_constraint_field()?,
|
||||
]
|
||||
.concat())
|
||||
}
|
||||
}
|
||||
|
||||
impl<C> CommittedInstanceVar<C>
|
||||
where
|
||||
C: CurveGroup,
|
||||
@@ -91,26 +106,22 @@ where
|
||||
/// Additionally it returns the vector of the field elements from the self parameters, so they
|
||||
/// can be reused in other gadgets avoiding recalculating (reconstraining) them.
|
||||
#[allow(clippy::type_complexity)]
|
||||
pub fn hash(
|
||||
pub fn hash<S: CryptographicSponge, T: TranscriptVar<CF1<C>, S>>(
|
||||
self,
|
||||
crh_params: &CRHParametersVar<CF1<C>>,
|
||||
sponge: &T,
|
||||
pp_hash: FpVar<CF1<C>>,
|
||||
i: FpVar<CF1<C>>,
|
||||
z_0: Vec<FpVar<CF1<C>>>,
|
||||
z_i: Vec<FpVar<CF1<C>>>,
|
||||
) -> Result<(FpVar<CF1<C>>, Vec<FpVar<CF1<C>>>), SynthesisError> {
|
||||
let U_vec = [
|
||||
vec![self.u],
|
||||
self.x,
|
||||
self.cmE.to_constraint_field()?,
|
||||
self.cmW.to_constraint_field()?,
|
||||
]
|
||||
.concat();
|
||||
let input = [vec![pp_hash, i], z_0, z_i, U_vec.clone()].concat();
|
||||
Ok((
|
||||
CRHGadget::<C::ScalarField>::evaluate(crh_params, &input)?,
|
||||
U_vec,
|
||||
))
|
||||
let mut sponge = sponge.clone();
|
||||
let U_vec = self.to_sponge_field_elements()?;
|
||||
sponge.absorb(&pp_hash)?;
|
||||
sponge.absorb(&i)?;
|
||||
sponge.absorb(&z_0)?;
|
||||
sponge.absorb(&z_i)?;
|
||||
sponge.absorb(&U_vec)?;
|
||||
Ok((sponge.squeeze_field_elements(1)?.pop().unwrap(), U_vec))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,67 +185,33 @@ where
|
||||
<C as CurveGroup>::BaseField: PrimeField,
|
||||
<C as Group>::ScalarField: Absorb,
|
||||
{
|
||||
pub fn get_challenge_native(
|
||||
poseidon_config: &PoseidonConfig<C::ScalarField>,
|
||||
pub fn get_challenge_native<T: Transcript<C::ScalarField>>(
|
||||
transcript: &mut T,
|
||||
pp_hash: C::ScalarField, // public params hash
|
||||
U_i: CommittedInstance<C>,
|
||||
u_i: CommittedInstance<C>,
|
||||
cmT: C,
|
||||
) -> Result<Vec<bool>, SynthesisError> {
|
||||
let (U_cmE_x, U_cmE_y) = nonnative_affine_to_field_elements::<C>(U_i.cmE)?;
|
||||
let (U_cmW_x, U_cmW_y) = nonnative_affine_to_field_elements::<C>(U_i.cmW)?;
|
||||
let (u_cmE_x, u_cmE_y) = nonnative_affine_to_field_elements::<C>(u_i.cmE)?;
|
||||
let (u_cmW_x, u_cmW_y) = nonnative_affine_to_field_elements::<C>(u_i.cmW)?;
|
||||
let (cmT_x, cmT_y) = nonnative_affine_to_field_elements::<C>(cmT)?;
|
||||
|
||||
let mut sponge = PoseidonSponge::<C::ScalarField>::new(poseidon_config);
|
||||
let input = vec![
|
||||
vec![pp_hash],
|
||||
vec![U_i.u],
|
||||
U_i.x.clone(),
|
||||
U_cmE_x,
|
||||
U_cmE_y,
|
||||
U_cmW_x,
|
||||
U_cmW_y,
|
||||
vec![u_i.u],
|
||||
u_i.x.clone(),
|
||||
u_cmE_x,
|
||||
u_cmE_y,
|
||||
u_cmW_x,
|
||||
u_cmW_y,
|
||||
cmT_x,
|
||||
cmT_y,
|
||||
]
|
||||
.concat();
|
||||
sponge.absorb(&input);
|
||||
let bits = sponge.squeeze_bits(N_BITS_RO);
|
||||
Ok(bits)
|
||||
) -> Vec<bool> {
|
||||
transcript.absorb(&pp_hash);
|
||||
transcript.absorb(&U_i);
|
||||
transcript.absorb(&u_i);
|
||||
transcript.absorb_nonnative(&cmT);
|
||||
transcript.squeeze_bits(N_BITS_RO)
|
||||
}
|
||||
|
||||
// compatible with the native get_challenge_native
|
||||
pub fn get_challenge_gadget(
|
||||
cs: ConstraintSystemRef<C::ScalarField>,
|
||||
poseidon_config: &PoseidonConfig<C::ScalarField>,
|
||||
pub fn get_challenge_gadget<S: CryptographicSponge, T: TranscriptVar<CF1<C>, S>>(
|
||||
transcript: &mut T,
|
||||
pp_hash: FpVar<CF1<C>>, // public params hash
|
||||
U_i_vec: Vec<FpVar<CF1<C>>>, // apready processed input, so we don't have to recompute these values
|
||||
u_i: CommittedInstanceVar<C>,
|
||||
cmT: NonNativeAffineVar<C>,
|
||||
) -> Result<Vec<Boolean<C::ScalarField>>, SynthesisError> {
|
||||
let mut sponge = PoseidonSpongeVar::<C::ScalarField>::new(cs, poseidon_config);
|
||||
|
||||
let input: Vec<FpVar<C::ScalarField>> = [
|
||||
vec![pp_hash],
|
||||
U_i_vec,
|
||||
vec![u_i.u.clone()],
|
||||
u_i.x.clone(),
|
||||
u_i.cmE.to_constraint_field()?,
|
||||
u_i.cmW.to_constraint_field()?,
|
||||
cmT.to_constraint_field()?,
|
||||
]
|
||||
.concat();
|
||||
sponge.absorb(&input)?;
|
||||
let bits = sponge.squeeze_bits(N_BITS_RO)?;
|
||||
Ok(bits)
|
||||
transcript.absorb(&pp_hash)?;
|
||||
transcript.absorb(&U_i_vec)?;
|
||||
transcript.absorb(&u_i)?;
|
||||
transcript.absorb_nonnative(&cmT)?;
|
||||
transcript.squeeze_bits(N_BITS_RO)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -367,10 +344,10 @@ where
|
||||
let cf1_cmT = GC2::new_witness(cs.clone(), || Ok(self.cf1_cmT.unwrap_or_else(C2::zero)))?;
|
||||
let cf2_cmT = GC2::new_witness(cs.clone(), || Ok(self.cf2_cmT.unwrap_or_else(C2::zero)))?;
|
||||
|
||||
let crh_params = CRHParametersVar::<C1::ScalarField>::new_constant(
|
||||
cs.clone(),
|
||||
self.poseidon_config.clone(),
|
||||
)?;
|
||||
// `sponge` is for digest computation.
|
||||
let sponge = PoseidonSpongeVar::<C1::ScalarField>::new(cs.clone(), &self.poseidon_config);
|
||||
// `transcript` is for challenge generation.
|
||||
let mut transcript = sponge.clone();
|
||||
|
||||
// get z_{i+1} from the F circuit
|
||||
let i_usize = self.i_usize.unwrap_or(0);
|
||||
@@ -384,14 +361,14 @@ where
|
||||
// P.1. Compute u_i.x
|
||||
// u_i.x[0] = H(i, z_0, z_i, U_i)
|
||||
let (u_i_x, U_i_vec) = U_i.clone().hash(
|
||||
&crh_params,
|
||||
&sponge,
|
||||
pp_hash.clone(),
|
||||
i.clone(),
|
||||
z_0.clone(),
|
||||
z_i.clone(),
|
||||
)?;
|
||||
// u_i.x[1] = H(cf_U_i)
|
||||
let (cf_u_i_x, cf_U_i_vec) = cf_U_i.clone().hash(&crh_params, pp_hash.clone())?;
|
||||
let (cf_u_i_x, cf_U_i_vec) = cf_U_i.clone().hash(&sponge, pp_hash.clone())?;
|
||||
|
||||
// P.2. Construct u_i
|
||||
let u_i = CommittedInstanceVar {
|
||||
@@ -411,8 +388,7 @@ where
|
||||
|
||||
// compute r = H(u_i, U_i, cmT)
|
||||
let r_bits = ChallengeGadget::<C1>::get_challenge_gadget(
|
||||
cs.clone(),
|
||||
&self.poseidon_config,
|
||||
&mut transcript,
|
||||
pp_hash.clone(),
|
||||
U_i_vec,
|
||||
u_i.clone(),
|
||||
@@ -438,14 +414,14 @@ where
|
||||
// Base case: u_{i+1}.x[0] == H((i+1, z_0, z_{i+1}, U_{\bot})
|
||||
// Non-base case: u_{i+1}.x[0] == H((i+1, z_0, z_{i+1}, U_{i+1})
|
||||
let (u_i1_x, _) = U_i1.clone().hash(
|
||||
&crh_params,
|
||||
&sponge,
|
||||
pp_hash.clone(),
|
||||
i + FpVar::<CF1<C1>>::one(),
|
||||
z_0.clone(),
|
||||
z_i1.clone(),
|
||||
)?;
|
||||
let (u_i1_x_base, _) = CommittedInstanceVar::new_constant(cs.clone(), u_dummy)?.hash(
|
||||
&crh_params,
|
||||
&sponge,
|
||||
pp_hash.clone(),
|
||||
FpVar::<CF1<C1>>::one(),
|
||||
z_0.clone(),
|
||||
@@ -499,8 +475,7 @@ where
|
||||
// compute cf1_r = H(cf1_u_i, cf_U_i, cf1_cmT)
|
||||
// cf_r_bits is denoted by rho* in the paper.
|
||||
let cf1_r_bits = CycleFoldChallengeGadget::<C2, GC2>::get_challenge_gadget(
|
||||
cs.clone(),
|
||||
&self.poseidon_config,
|
||||
&mut transcript,
|
||||
pp_hash.clone(),
|
||||
cf_U_i_vec,
|
||||
cf1_u_i.clone(),
|
||||
@@ -523,10 +498,9 @@ where
|
||||
|
||||
// same for cf2_r:
|
||||
let cf2_r_bits = CycleFoldChallengeGadget::<C2, GC2>::get_challenge_gadget(
|
||||
cs.clone(),
|
||||
&self.poseidon_config,
|
||||
&mut transcript,
|
||||
pp_hash.clone(),
|
||||
cf1_U_i1.to_constraint_field()?,
|
||||
cf1_U_i1.to_native_sponge_field_elements()?,
|
||||
cf2_u_i.clone(),
|
||||
cf2_cmT.clone(),
|
||||
)?;
|
||||
@@ -547,10 +521,10 @@ where
|
||||
// P.4.b compute and check the second output of F'
|
||||
// Base case: u_{i+1}.x[1] == H(cf_U_{\bot})
|
||||
// Non-base case: u_{i+1}.x[1] == H(cf_U_{i+1})
|
||||
let (cf_u_i1_x, _) = cf_U_i1.clone().hash(&crh_params, pp_hash.clone())?;
|
||||
let (cf_u_i1_x, _) = cf_U_i1.clone().hash(&sponge, pp_hash.clone())?;
|
||||
let (cf_u_i1_x_base, _) =
|
||||
CycleFoldCommittedInstanceVar::new_constant(cs.clone(), cf_u_dummy)?
|
||||
.hash(&crh_params, pp_hash)?;
|
||||
.hash(&sponge, pp_hash)?;
|
||||
let cf_x = FpVar::new_input(cs.clone(), || {
|
||||
Ok(self.cf_x.unwrap_or(cf_u_i1_x_base.value()?))
|
||||
})?;
|
||||
@@ -564,6 +538,7 @@ where
|
||||
pub mod tests {
|
||||
use super::*;
|
||||
use ark_bn254::{Fr, G1Projective as Projective};
|
||||
use ark_crypto_primitives::sponge::poseidon::PoseidonSponge;
|
||||
use ark_ff::BigInteger;
|
||||
use ark_relations::r1cs::ConstraintSystem;
|
||||
use ark_std::UniformRand;
|
||||
@@ -628,6 +603,7 @@ pub mod tests {
|
||||
fn test_committed_instance_hash() {
|
||||
let mut rng = ark_std::test_rng();
|
||||
let poseidon_config = poseidon_canonical_config::<Fr>();
|
||||
let sponge = PoseidonSponge::<Fr>::new(&poseidon_config);
|
||||
let pp_hash = Fr::from(42u32); // only for test
|
||||
|
||||
let i = Fr::from(3_u32);
|
||||
@@ -641,9 +617,7 @@ pub mod tests {
|
||||
};
|
||||
|
||||
// compute the CommittedInstance hash natively
|
||||
let h = ci
|
||||
.hash(&poseidon_config, pp_hash, i, z_0.clone(), z_i.clone())
|
||||
.unwrap();
|
||||
let h = ci.hash(&sponge, pp_hash, i, z_0.clone(), z_i.clone());
|
||||
|
||||
let cs = ConstraintSystem::<Fr>::new_ref();
|
||||
|
||||
@@ -654,11 +628,11 @@ pub mod tests {
|
||||
let ciVar =
|
||||
CommittedInstanceVar::<Projective>::new_witness(cs.clone(), || Ok(ci.clone())).unwrap();
|
||||
|
||||
let crh_params = CRHParametersVar::<Fr>::new_constant(cs.clone(), poseidon_config).unwrap();
|
||||
let sponge = PoseidonSpongeVar::<Fr>::new(cs.clone(), &poseidon_config);
|
||||
|
||||
// compute the CommittedInstance hash in-circuit
|
||||
let (hVar, _) = ciVar
|
||||
.hash(&crh_params, pp_hashVar, iVar, z_0Var, z_iVar)
|
||||
.hash(&sponge, pp_hashVar, iVar, z_0Var, z_iVar)
|
||||
.unwrap();
|
||||
assert!(cs.is_satisfied().unwrap());
|
||||
|
||||
@@ -671,6 +645,7 @@ pub mod tests {
|
||||
fn test_challenge_gadget() {
|
||||
let mut rng = ark_std::test_rng();
|
||||
let poseidon_config = poseidon_canonical_config::<Fr>();
|
||||
let mut transcript = PoseidonSponge::<Fr>::new(&poseidon_config);
|
||||
|
||||
let u_i = CommittedInstance::<Projective> {
|
||||
cmE: Projective::rand(&mut rng),
|
||||
@@ -690,13 +665,12 @@ pub mod tests {
|
||||
|
||||
// compute the challenge natively
|
||||
let r_bits = ChallengeGadget::<Projective>::get_challenge_native(
|
||||
&poseidon_config,
|
||||
&mut transcript,
|
||||
pp_hash,
|
||||
U_i.clone(),
|
||||
u_i.clone(),
|
||||
cmT,
|
||||
)
|
||||
.unwrap();
|
||||
);
|
||||
let r = Fr::from_bigint(BigInteger::from_bits_le(&r_bits)).unwrap();
|
||||
|
||||
let cs = ConstraintSystem::<Fr>::new_ref();
|
||||
@@ -708,6 +682,7 @@ pub mod tests {
|
||||
CommittedInstanceVar::<Projective>::new_witness(cs.clone(), || Ok(U_i.clone()))
|
||||
.unwrap();
|
||||
let cmTVar = NonNativeAffineVar::<Projective>::new_witness(cs.clone(), || Ok(cmT)).unwrap();
|
||||
let mut transcriptVar = PoseidonSpongeVar::<Fr>::new(cs.clone(), &poseidon_config);
|
||||
|
||||
// compute the challenge in-circuit
|
||||
let U_iVar_vec = [
|
||||
@@ -718,8 +693,7 @@ pub mod tests {
|
||||
]
|
||||
.concat();
|
||||
let r_bitsVar = ChallengeGadget::<Projective>::get_challenge_gadget(
|
||||
cs.clone(),
|
||||
&poseidon_config,
|
||||
&mut transcriptVar,
|
||||
pp_hashVar,
|
||||
U_iVar_vec,
|
||||
u_iVar,
|
||||
|
||||
@@ -317,13 +317,11 @@ fn point2_to_eth_format(p: ark_bn254::G2Affine) -> Result<Vec<u8>, Error> {
|
||||
|
||||
#[cfg(test)]
|
||||
pub mod tests {
|
||||
use ark_bn254::{constraints::GVar, Bn254, Fr, G1Projective as Projective};
|
||||
use ark_groth16::Groth16;
|
||||
use ark_bn254::{constraints::GVar, Fr, G1Projective as Projective};
|
||||
use ark_grumpkin::{constraints::GVar as GVar2, Projective as Projective2};
|
||||
use std::time::Instant;
|
||||
|
||||
use super::*;
|
||||
use crate::commitment::kzg::KZG;
|
||||
use crate::commitment::pedersen::Pedersen;
|
||||
use crate::folding::nova::PreprocessorParam;
|
||||
use crate::frontend::tests::CubicFCircuit;
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
/// This file implements the onchain (Ethereum's EVM) decider circuit. For non-ethereum use cases,
|
||||
/// other more efficient approaches can be used.
|
||||
use ark_crypto_primitives::crh::poseidon::constraints::CRHParametersVar;
|
||||
use ark_crypto_primitives::sponge::{poseidon::PoseidonConfig, Absorb};
|
||||
use ark_crypto_primitives::sponge::{
|
||||
constraints::CryptographicSpongeVar,
|
||||
poseidon::{constraints::PoseidonSpongeVar, PoseidonConfig, PoseidonSponge},
|
||||
Absorb, CryptographicSponge,
|
||||
};
|
||||
use ark_ec::{CurveGroup, Group};
|
||||
use ark_ff::{BigInteger, PrimeField};
|
||||
use ark_poly::Polynomial;
|
||||
@@ -23,18 +26,12 @@ use super::{circuits::ChallengeGadget, nifs::NIFS};
|
||||
use crate::arith::r1cs::R1CS;
|
||||
use crate::commitment::{pedersen::Params as PedersenParams, CommitmentScheme};
|
||||
use crate::folding::circuits::{
|
||||
nonnative::{
|
||||
affine::{nonnative_affine_to_field_elements, NonNativeAffineVar},
|
||||
uint::NonNativeUintVar,
|
||||
},
|
||||
nonnative::{affine::NonNativeAffineVar, uint::NonNativeUintVar},
|
||||
CF1, CF2,
|
||||
};
|
||||
use crate::folding::nova::{circuits::CommittedInstanceVar, CommittedInstance, Nova, Witness};
|
||||
use crate::frontend::FCircuit;
|
||||
use crate::transcript::{
|
||||
poseidon::{PoseidonTranscript, PoseidonTranscriptVar},
|
||||
Transcript, TranscriptVar,
|
||||
};
|
||||
use crate::transcript::{Transcript, TranscriptVar};
|
||||
use crate::utils::{
|
||||
gadgets::{MatrixGadget, SparseMatrixVar, VectorGadget},
|
||||
vec::poly_from_vec,
|
||||
@@ -264,6 +261,8 @@ where
|
||||
pub fn from_nova<FC: FCircuit<C1::ScalarField>>(
|
||||
nova: Nova<C1, GC1, C2, GC2, FC, CS1, CS2>,
|
||||
) -> Result<Self, Error> {
|
||||
let mut transcript = PoseidonSponge::<C1::ScalarField>::new(&nova.poseidon_config);
|
||||
|
||||
// compute the U_{i+1}, W_{i+1}
|
||||
let (T, cmT) = NIFS::<C1, CS1>::compute_cmT(
|
||||
&nova.cs_pp,
|
||||
@@ -274,12 +273,12 @@ where
|
||||
&nova.U_i.clone(),
|
||||
)?;
|
||||
let r_bits = ChallengeGadget::<C1>::get_challenge_native(
|
||||
&nova.poseidon_config,
|
||||
&mut transcript,
|
||||
nova.pp_hash,
|
||||
nova.U_i.clone(),
|
||||
nova.u_i.clone(),
|
||||
cmT,
|
||||
)?;
|
||||
);
|
||||
let r_Fr = C1::ScalarField::from_bigint(BigInteger::from_bits_le(&r_bits))
|
||||
.ok_or(Error::OutOfBounds)?;
|
||||
let (W_i1, U_i1) = NIFS::<C1, CS1>::fold_instances(
|
||||
@@ -288,7 +287,7 @@ where
|
||||
|
||||
// compute the KZG challenges used as inputs in the circuit
|
||||
let (kzg_challenge_W, kzg_challenge_E) =
|
||||
KZGChallengesGadget::<C1>::get_challenges_native(&nova.poseidon_config, U_i1.clone())?;
|
||||
KZGChallengesGadget::<C1>::get_challenges_native(&mut transcript, U_i1.clone());
|
||||
|
||||
// get KZG evals
|
||||
let mut W = W_i1.W.clone();
|
||||
@@ -410,10 +409,10 @@ where
|
||||
Ok(self.eval_E.unwrap_or_else(CF1::<C1>::zero))
|
||||
})?;
|
||||
|
||||
let crh_params = CRHParametersVar::<C1::ScalarField>::new_constant(
|
||||
cs.clone(),
|
||||
self.poseidon_config.clone(),
|
||||
)?;
|
||||
// `sponge` is for digest computation.
|
||||
let sponge = PoseidonSpongeVar::<C1::ScalarField>::new(cs.clone(), &self.poseidon_config);
|
||||
// `transcript` is for challenge generation.
|
||||
let mut transcript = sponge.clone();
|
||||
|
||||
// 1. check RelaxedR1CS of U_{i+1}
|
||||
let z_U1: Vec<FpVar<CF1<C1>>> =
|
||||
@@ -429,7 +428,7 @@ where
|
||||
|
||||
// 3.a u_i.x[0] == H(i, z_0, z_i, U_i)
|
||||
let (u_i_x, U_i_vec) = U_i.clone().hash(
|
||||
&crh_params,
|
||||
&sponge,
|
||||
pp_hash.clone(),
|
||||
i.clone(),
|
||||
z_0.clone(),
|
||||
@@ -465,7 +464,7 @@ where
|
||||
})?;
|
||||
|
||||
// 3.b u_i.x[1] == H(cf_U_i)
|
||||
let (cf_u_i_x, _) = cf_U_i.clone().hash(&crh_params, pp_hash.clone())?;
|
||||
let (cf_u_i_x, _) = cf_U_i.clone().hash(&sponge, pp_hash.clone())?;
|
||||
(u_i.x[1]).enforce_equal(&cf_u_i_x)?;
|
||||
|
||||
// 4. check Pedersen commitments of cf_U_i.{cmE, cmW}
|
||||
@@ -498,12 +497,23 @@ where
|
||||
RelaxedR1CSGadget::check_nonnative(cf_r1cs, cf_W_i.E, cf_U_i.u.clone(), cf_z_U)?;
|
||||
}
|
||||
|
||||
// 6. check KZG challenges
|
||||
let (incircuit_c_W, incircuit_c_E) = KZGChallengesGadget::<C1>::get_challenges_gadget(
|
||||
cs.clone(),
|
||||
&self.poseidon_config,
|
||||
U_i1.clone(),
|
||||
// 8.a, 6.a compute NIFS.V and KZG challenges.
|
||||
// We need to ensure the order of challenge generation is the same as
|
||||
// the native counterpart, so we first compute the challenges here and
|
||||
// do the actual checks later.
|
||||
let cmT =
|
||||
NonNativeAffineVar::new_input(cs.clone(), || Ok(self.cmT.unwrap_or_else(C1::zero)))?;
|
||||
let r_bits = ChallengeGadget::<C1>::get_challenge_gadget(
|
||||
&mut transcript,
|
||||
pp_hash,
|
||||
U_i_vec,
|
||||
u_i.clone(),
|
||||
cmT.clone(),
|
||||
)?;
|
||||
let (incircuit_c_W, incircuit_c_E) =
|
||||
KZGChallengesGadget::<C1>::get_challenges_gadget(&mut transcript, U_i1.clone())?;
|
||||
|
||||
// 6.b check KZG challenges
|
||||
incircuit_c_W.enforce_equal(&kzg_c_W)?;
|
||||
incircuit_c_E.enforce_equal(&kzg_c_E)?;
|
||||
|
||||
@@ -516,18 +526,8 @@ where
|
||||
// incircuit_eval_W.enforce_equal(&eval_W)?;
|
||||
// incircuit_eval_E.enforce_equal(&eval_E)?;
|
||||
|
||||
// 8. compute the NIFS.V challenge and check that matches the one from the public input (so we
|
||||
// 8.b check the NIFS.V challenge matches the one from the public input (so we
|
||||
// avoid the verifier computing it)
|
||||
let cmT =
|
||||
NonNativeAffineVar::new_input(cs.clone(), || Ok(self.cmT.unwrap_or_else(C1::zero)))?;
|
||||
let r_bits = ChallengeGadget::<C1>::get_challenge_gadget(
|
||||
cs.clone(),
|
||||
&self.poseidon_config,
|
||||
pp_hash,
|
||||
U_i_vec,
|
||||
u_i.clone(),
|
||||
cmT.clone(),
|
||||
)?;
|
||||
let r_Fr = Boolean::le_bits_to_fp_var(&r_bits)?;
|
||||
// check that the in-circuit computed r is equal to the inputted r
|
||||
let r =
|
||||
@@ -569,38 +569,28 @@ where
|
||||
<C as CurveGroup>::BaseField: PrimeField,
|
||||
C::ScalarField: Absorb,
|
||||
{
|
||||
pub fn get_challenges_native(
|
||||
poseidon_config: &PoseidonConfig<C::ScalarField>,
|
||||
pub fn get_challenges_native<T: Transcript<C::ScalarField>>(
|
||||
transcript: &mut T,
|
||||
U_i: CommittedInstance<C>,
|
||||
) -> Result<(C::ScalarField, C::ScalarField), Error> {
|
||||
let (cmE_x_limbs, cmE_y_limbs) = nonnative_affine_to_field_elements(U_i.cmE)?;
|
||||
let (cmW_x_limbs, cmW_y_limbs) = nonnative_affine_to_field_elements(U_i.cmW)?;
|
||||
|
||||
let transcript = &mut PoseidonTranscript::<C>::new(poseidon_config);
|
||||
) -> (C::ScalarField, C::ScalarField) {
|
||||
// compute the KZG challenges, which are computed in-circuit and checked that it matches
|
||||
// the inputted one
|
||||
transcript.absorb_vec(&cmW_x_limbs);
|
||||
transcript.absorb_vec(&cmW_y_limbs);
|
||||
transcript.absorb_nonnative(&U_i.cmW);
|
||||
let challenge_W = transcript.get_challenge();
|
||||
transcript.absorb_vec(&cmE_x_limbs);
|
||||
transcript.absorb_vec(&cmE_y_limbs);
|
||||
transcript.absorb_nonnative(&U_i.cmE);
|
||||
let challenge_E = transcript.get_challenge();
|
||||
|
||||
Ok((challenge_W, challenge_E))
|
||||
(challenge_W, challenge_E)
|
||||
}
|
||||
// compatible with the native get_challenges_native
|
||||
pub fn get_challenges_gadget(
|
||||
cs: ConstraintSystemRef<C::ScalarField>,
|
||||
poseidon_config: &PoseidonConfig<C::ScalarField>,
|
||||
pub fn get_challenges_gadget<S: CryptographicSponge, T: TranscriptVar<CF1<C>, S>>(
|
||||
transcript: &mut T,
|
||||
U_i: CommittedInstanceVar<C>,
|
||||
) -> Result<(FpVar<C::ScalarField>, FpVar<C::ScalarField>), SynthesisError> {
|
||||
let mut transcript =
|
||||
PoseidonTranscriptVar::<CF1<C>>::new(cs.clone(), &poseidon_config.clone());
|
||||
|
||||
transcript.absorb_vec(&U_i.cmW.to_constraint_field()?[..])?;
|
||||
transcript.absorb(&U_i.cmW.to_constraint_field()?)?;
|
||||
let challenge_W = transcript.get_challenge()?;
|
||||
|
||||
transcript.absorb_vec(&U_i.cmE.to_constraint_field()?[..])?;
|
||||
transcript.absorb(&U_i.cmE.to_constraint_field()?)?;
|
||||
let challenge_E = transcript.get_challenge()?;
|
||||
|
||||
Ok((challenge_W, challenge_E))
|
||||
@@ -852,6 +842,7 @@ pub mod tests {
|
||||
fn test_kzg_challenge_gadget() {
|
||||
let mut rng = ark_std::test_rng();
|
||||
let poseidon_config = poseidon_canonical_config::<Fr>();
|
||||
let mut transcript = PoseidonSponge::<Fr>::new(&poseidon_config);
|
||||
|
||||
let U_i = CommittedInstance::<Projective> {
|
||||
cmE: Projective::rand(&mut rng),
|
||||
@@ -862,21 +853,17 @@ pub mod tests {
|
||||
|
||||
// compute the challenge natively
|
||||
let (challenge_W, challenge_E) =
|
||||
KZGChallengesGadget::<Projective>::get_challenges_native(&poseidon_config, U_i.clone())
|
||||
.unwrap();
|
||||
KZGChallengesGadget::<Projective>::get_challenges_native(&mut transcript, U_i.clone());
|
||||
|
||||
let cs = ConstraintSystem::<Fr>::new_ref();
|
||||
let U_iVar =
|
||||
CommittedInstanceVar::<Projective>::new_witness(cs.clone(), || Ok(U_i.clone()))
|
||||
.unwrap();
|
||||
let mut transcript_var = PoseidonSpongeVar::<Fr>::new(cs.clone(), &poseidon_config);
|
||||
|
||||
let (challenge_W_Var, challenge_E_Var) =
|
||||
KZGChallengesGadget::<Projective>::get_challenges_gadget(
|
||||
cs.clone(),
|
||||
&poseidon_config,
|
||||
U_iVar,
|
||||
)
|
||||
.unwrap();
|
||||
KZGChallengesGadget::<Projective>::get_challenges_gadget(&mut transcript_var, U_iVar)
|
||||
.unwrap();
|
||||
assert!(cs.is_satisfied().unwrap());
|
||||
|
||||
// check that the natively computed and in-circuit computed hashes match
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
/// Implements the scheme described in [Nova](https://eprint.iacr.org/2021/370.pdf) and
|
||||
/// [CycleFold](https://eprint.iacr.org/2023/1192.pdf).
|
||||
use ark_crypto_primitives::{
|
||||
crh::{poseidon::CRH, CRHScheme},
|
||||
sponge::{poseidon::PoseidonConfig, Absorb},
|
||||
use ark_crypto_primitives::sponge::{
|
||||
poseidon::{PoseidonConfig, PoseidonSponge},
|
||||
Absorb, CryptographicSponge,
|
||||
};
|
||||
use ark_ec::{AffineRepr, CurveGroup, Group};
|
||||
use ark_ff::{BigInteger, Field, PrimeField, ToConstraintField};
|
||||
use ark_ff::{BigInteger, PrimeField};
|
||||
use ark_r1cs_std::{groups::GroupOpsBounds, prelude::CurveVar, ToConstraintFieldGadget};
|
||||
use ark_relations::r1cs::{ConstraintSynthesizer, ConstraintSystem};
|
||||
use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
|
||||
@@ -14,19 +14,18 @@ use ark_std::rand::RngCore;
|
||||
use ark_std::{One, Zero};
|
||||
use core::marker::PhantomData;
|
||||
|
||||
use crate::arith::r1cs::{extract_r1cs, extract_w_x, R1CS};
|
||||
use crate::commitment::CommitmentScheme;
|
||||
use crate::folding::circuits::{
|
||||
cyclefold::{fold_cyclefold_circuit, CycleFoldCircuit},
|
||||
nonnative::{
|
||||
affine::nonnative_affine_to_field_elements, uint::nonnative_field_to_field_elements,
|
||||
},
|
||||
CF2,
|
||||
};
|
||||
use crate::folding::circuits::cyclefold::{fold_cyclefold_circuit, CycleFoldCircuit};
|
||||
use crate::folding::circuits::CF2;
|
||||
use crate::frontend::FCircuit;
|
||||
use crate::utils::{get_cm_coordinates, pp_hash, vec::is_zero_vec};
|
||||
use crate::transcript::{AbsorbNonNative, Transcript};
|
||||
use crate::utils::vec::is_zero_vec;
|
||||
use crate::Error;
|
||||
use crate::FoldingScheme;
|
||||
use crate::{
|
||||
arith::r1cs::{extract_r1cs, extract_w_x, R1CS},
|
||||
utils::{get_cm_coordinates, pp_hash},
|
||||
};
|
||||
|
||||
pub mod circuits;
|
||||
pub mod decider_eth;
|
||||
@@ -57,6 +56,54 @@ impl<C: CurveGroup> CommittedInstance<C> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<C: CurveGroup> Absorb for CommittedInstance<C>
|
||||
where
|
||||
C::ScalarField: Absorb,
|
||||
{
|
||||
fn to_sponge_bytes(&self, _dest: &mut Vec<u8>) {
|
||||
// This is never called
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
fn to_sponge_field_elements<F: PrimeField>(&self, dest: &mut Vec<F>) {
|
||||
self.u.to_sponge_field_elements(dest);
|
||||
self.x.to_sponge_field_elements(dest);
|
||||
// We cannot call `to_native_sponge_field_elements(dest)` directly, as
|
||||
// `to_native_sponge_field_elements` needs `F` to be `C::ScalarField`,
|
||||
// but here `F` is a generic `PrimeField`.
|
||||
self.cmE
|
||||
.to_native_sponge_field_elements_as_vec()
|
||||
.to_sponge_field_elements(dest);
|
||||
self.cmW
|
||||
.to_native_sponge_field_elements_as_vec()
|
||||
.to_sponge_field_elements(dest);
|
||||
}
|
||||
}
|
||||
|
||||
impl<C: CurveGroup> AbsorbNonNative<C::BaseField> for CommittedInstance<C>
|
||||
where
|
||||
<C as ark_ec::CurveGroup>::BaseField: ark_ff::PrimeField + Absorb,
|
||||
{
|
||||
// Compatible with the in-circuit `CycleFoldCommittedInstanceVar::to_native_sponge_field_elements`
|
||||
// in `cyclefold.rs`.
|
||||
fn to_native_sponge_field_elements(&self, dest: &mut Vec<C::BaseField>) {
|
||||
[self.u].to_native_sponge_field_elements(dest);
|
||||
self.x.to_native_sponge_field_elements(dest);
|
||||
let (cmE_x, cmE_y) = match self.cmE.into_affine().xy() {
|
||||
Some((&x, &y)) => (x, y),
|
||||
None => (C::BaseField::zero(), C::BaseField::zero()),
|
||||
};
|
||||
let (cmW_x, cmW_y) = match self.cmW.into_affine().xy() {
|
||||
Some((&x, &y)) => (x, y),
|
||||
None => (C::BaseField::zero(), C::BaseField::zero()),
|
||||
};
|
||||
cmE_x.to_sponge_field_elements(dest);
|
||||
cmE_y.to_sponge_field_elements(dest);
|
||||
cmW_x.to_sponge_field_elements(dest);
|
||||
cmW_y.to_sponge_field_elements(dest);
|
||||
}
|
||||
}
|
||||
|
||||
impl<C: CurveGroup> CommittedInstance<C>
|
||||
where
|
||||
<C as Group>::ScalarField: Absorb,
|
||||
@@ -66,67 +113,21 @@ where
|
||||
/// nova/circuits.rs::CommittedInstanceVar.hash.
|
||||
/// Returns `H(i, z_0, z_i, U_i)`, where `i` can be `i` but also `i+1`, and `U_i` is the
|
||||
/// `CommittedInstance`.
|
||||
pub fn hash(
|
||||
pub fn hash<T: Transcript<C::ScalarField>>(
|
||||
&self,
|
||||
poseidon_config: &PoseidonConfig<C::ScalarField>,
|
||||
sponge: &T,
|
||||
pp_hash: C::ScalarField, // public params hash
|
||||
i: C::ScalarField,
|
||||
z_0: Vec<C::ScalarField>,
|
||||
z_i: Vec<C::ScalarField>,
|
||||
) -> Result<C::ScalarField, Error> {
|
||||
let (cmE_x, cmE_y) = nonnative_affine_to_field_elements::<C>(self.cmE)?;
|
||||
let (cmW_x, cmW_y) = nonnative_affine_to_field_elements::<C>(self.cmW)?;
|
||||
|
||||
CRH::<C::ScalarField>::evaluate(
|
||||
poseidon_config,
|
||||
vec![
|
||||
vec![pp_hash, i],
|
||||
z_0,
|
||||
z_i,
|
||||
vec![self.u],
|
||||
self.x.clone(),
|
||||
cmE_x,
|
||||
cmE_y,
|
||||
cmW_x,
|
||||
cmW_y,
|
||||
]
|
||||
.concat(),
|
||||
)
|
||||
.map_err(|e| Error::Other(e.to_string()))
|
||||
}
|
||||
}
|
||||
|
||||
impl<C: CurveGroup> ToConstraintField<C::BaseField> for CommittedInstance<C>
|
||||
where
|
||||
<C as ark_ec::CurveGroup>::BaseField: ark_ff::PrimeField + Absorb,
|
||||
{
|
||||
fn to_field_elements(&self) -> Option<Vec<C::BaseField>> {
|
||||
let u = nonnative_field_to_field_elements(&self.u);
|
||||
let x = self
|
||||
.x
|
||||
.iter()
|
||||
.flat_map(nonnative_field_to_field_elements)
|
||||
.collect::<Vec<_>>();
|
||||
let (cmE_x, cmE_y, cmE_is_inf) = match self.cmE.into_affine().xy() {
|
||||
Some((&x, &y)) => (x, y, C::BaseField::zero()),
|
||||
None => (
|
||||
C::BaseField::zero(),
|
||||
C::BaseField::zero(),
|
||||
C::BaseField::one(),
|
||||
),
|
||||
};
|
||||
let (cmW_x, cmW_y, cmW_is_inf) = match self.cmW.into_affine().xy() {
|
||||
Some((&x, &y)) => (x, y, C::BaseField::zero()),
|
||||
None => (
|
||||
C::BaseField::zero(),
|
||||
C::BaseField::zero(),
|
||||
C::BaseField::one(),
|
||||
),
|
||||
};
|
||||
// Concatenate `cmE_is_inf` and `cmW_is_inf` to save constraints for CRHGadget::evaluate in the corresponding circuit
|
||||
let is_inf = cmE_is_inf.double() + cmW_is_inf;
|
||||
|
||||
Some([u, x, vec![cmE_x, cmE_y, cmW_x, cmW_y, is_inf]].concat())
|
||||
) -> C::ScalarField {
|
||||
let mut sponge = sponge.clone();
|
||||
sponge.absorb(&pp_hash);
|
||||
sponge.absorb(&i);
|
||||
sponge.absorb(&z_0);
|
||||
sponge.absorb(&z_i);
|
||||
sponge.absorb(&self);
|
||||
sponge.squeeze_field_elements(1)[0]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -137,16 +138,15 @@ where
|
||||
/// hash_cyclefold implements the committed instance hash compatible with the gadget implemented in
|
||||
/// nova/cyclefold.rs::CycleFoldCommittedInstanceVar.hash.
|
||||
/// Returns `H(U_i)`, where `U_i` is the `CommittedInstance` for CycleFold.
|
||||
pub fn hash_cyclefold(
|
||||
pub fn hash_cyclefold<T: Transcript<C::BaseField>>(
|
||||
&self,
|
||||
poseidon_config: &PoseidonConfig<C::BaseField>,
|
||||
sponge: &T,
|
||||
pp_hash: C::BaseField, // public params hash
|
||||
) -> Result<C::BaseField, Error> {
|
||||
CRH::<C::BaseField>::evaluate(
|
||||
poseidon_config,
|
||||
[vec![pp_hash], self.to_field_elements().unwrap()].concat(),
|
||||
)
|
||||
.map_err(|e| Error::Other(e.to_string()))
|
||||
) -> C::BaseField {
|
||||
let mut sponge = sponge.clone();
|
||||
sponge.absorb(&pp_hash);
|
||||
sponge.absorb_nonnative(self);
|
||||
sponge.squeeze_field_elements(1)[0]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -453,6 +453,11 @@ where
|
||||
_rng: impl RngCore,
|
||||
external_inputs: Vec<C1::ScalarField>,
|
||||
) -> Result<(), Error> {
|
||||
// `sponge` is for digest computation.
|
||||
let sponge = PoseidonSponge::<C1::ScalarField>::new(&self.poseidon_config);
|
||||
// `transcript` is for challenge generation.
|
||||
let mut transcript = sponge.clone();
|
||||
|
||||
let augmented_F_circuit: AugmentedFCircuit<C1, C2, GC2, FC>;
|
||||
|
||||
if self.z_i.len() != self.F.state_len() {
|
||||
@@ -488,12 +493,12 @@ where
|
||||
|
||||
// r_bits is the r used to the RLC of the F' instances
|
||||
let r_bits = ChallengeGadget::<C1>::get_challenge_native(
|
||||
&self.poseidon_config,
|
||||
&mut transcript,
|
||||
self.pp_hash,
|
||||
self.U_i.clone(),
|
||||
self.u_i.clone(),
|
||||
cmT,
|
||||
)?;
|
||||
);
|
||||
let r_Fr = C1::ScalarField::from_bigint(BigInteger::from_bits_le(&r_bits))
|
||||
.ok_or(Error::OutOfBounds)?;
|
||||
let r_Fq = C1::BaseField::from_bigint(BigInteger::from_bits_le(&r_bits))
|
||||
@@ -507,19 +512,17 @@ where
|
||||
// folded instance output (public input, x)
|
||||
// u_{i+1}.x[0] = H(i+1, z_0, z_{i+1}, U_{i+1})
|
||||
let u_i1_x = U_i1.hash(
|
||||
&self.poseidon_config,
|
||||
&sponge,
|
||||
self.pp_hash,
|
||||
self.i + C1::ScalarField::one(),
|
||||
self.z_0.clone(),
|
||||
z_i1.clone(),
|
||||
)?;
|
||||
);
|
||||
// u_{i+1}.x[1] = H(cf_U_{i+1})
|
||||
let cf_u_i1_x: C1::ScalarField;
|
||||
|
||||
if self.i == C1::ScalarField::zero() {
|
||||
cf_u_i1_x = self
|
||||
.cf_U_i
|
||||
.hash_cyclefold(&self.poseidon_config, self.pp_hash)?;
|
||||
cf_u_i1_x = self.cf_U_i.hash_cyclefold(&sponge, self.pp_hash);
|
||||
// base case
|
||||
augmented_F_circuit = AugmentedFCircuit::<C1, C2, GC2, FC> {
|
||||
_gc2: PhantomData,
|
||||
@@ -584,16 +587,22 @@ where
|
||||
|
||||
// fold self.cf_U_i + cfW_U -> folded running with cfW
|
||||
let (_cfW_w_i, cfW_u_i, cfW_W_i1, cfW_U_i1, cfW_cmT, _) = self.fold_cyclefold_circuit(
|
||||
&mut transcript,
|
||||
self.cf_W_i.clone(), // CycleFold running instance witness
|
||||
self.cf_U_i.clone(), // CycleFold running instance
|
||||
cfW_u_i_x,
|
||||
cfW_circuit,
|
||||
)?;
|
||||
// fold [the output from folding self.cf_U_i + cfW_U] + cfE_U = folded_running_with_cfW + cfE
|
||||
let (_cfE_w_i, cfE_u_i, cf_W_i1, cf_U_i1, cf_cmT, _) =
|
||||
self.fold_cyclefold_circuit(cfW_W_i1, cfW_U_i1.clone(), cfE_u_i_x, cfE_circuit)?;
|
||||
let (_cfE_w_i, cfE_u_i, cf_W_i1, cf_U_i1, cf_cmT, _) = self.fold_cyclefold_circuit(
|
||||
&mut transcript,
|
||||
cfW_W_i1,
|
||||
cfW_U_i1.clone(),
|
||||
cfE_u_i_x,
|
||||
cfE_circuit,
|
||||
)?;
|
||||
|
||||
cf_u_i1_x = cf_U_i1.hash_cyclefold(&self.poseidon_config, self.pp_hash)?;
|
||||
cf_u_i1_x = cf_U_i1.hash_cyclefold(&sponge, self.pp_hash);
|
||||
|
||||
augmented_F_circuit = AugmentedFCircuit::<C1, C2, GC2, FC> {
|
||||
_gc2: PhantomData,
|
||||
@@ -697,6 +706,8 @@ where
|
||||
incoming_instance: Self::IncomingInstance,
|
||||
cyclefold_instance: Self::CFInstance,
|
||||
) -> Result<(), Error> {
|
||||
let sponge = PoseidonSponge::<C1::ScalarField>::new(&vp.poseidon_config);
|
||||
|
||||
if num_steps == C1::ScalarField::zero() {
|
||||
if z_0 != z_i {
|
||||
return Err(Error::IVCVerificationFail);
|
||||
@@ -716,12 +727,12 @@ where
|
||||
|
||||
// check that u_i's output points to the running instance
|
||||
// u_i.X[0] == H(i, z_0, z_i, U_i)
|
||||
let expected_u_i_x = U_i.hash(&vp.poseidon_config, pp_hash, num_steps, z_0, z_i.clone())?;
|
||||
let expected_u_i_x = U_i.hash(&sponge, pp_hash, num_steps, z_0, z_i.clone());
|
||||
if expected_u_i_x != u_i.x[0] {
|
||||
return Err(Error::IVCVerificationFail);
|
||||
}
|
||||
// u_i.X[1] == H(cf_U_i)
|
||||
let expected_cf_u_i_x = cf_U_i.hash_cyclefold(&vp.poseidon_config, pp_hash)?;
|
||||
let expected_cf_u_i_x = cf_U_i.hash_cyclefold(&sponge, pp_hash);
|
||||
if expected_cf_u_i_x != u_i.x[1] {
|
||||
return Err(Error::IVCVerificationFail);
|
||||
}
|
||||
@@ -790,8 +801,9 @@ where
|
||||
{
|
||||
// folds the given cyclefold circuit and its instances
|
||||
#[allow(clippy::type_complexity)]
|
||||
fn fold_cyclefold_circuit(
|
||||
fn fold_cyclefold_circuit<T: Transcript<C1::ScalarField>>(
|
||||
&self,
|
||||
transcript: &mut T,
|
||||
cf_W_i: Witness<C2>, // witness of the running instance
|
||||
cf_U_i: CommittedInstance<C2>, // running instance
|
||||
cf_u_i_x: Vec<C2::ScalarField>,
|
||||
@@ -808,7 +820,7 @@ where
|
||||
Error,
|
||||
> {
|
||||
fold_cyclefold_circuit::<C1, GC1, C2, GC2, FC, CS1, CS2>(
|
||||
&self.poseidon_config,
|
||||
transcript,
|
||||
self.cf_r1cs.clone(),
|
||||
self.cf_cs_pp.clone(),
|
||||
self.pp_hash,
|
||||
|
||||
@@ -183,7 +183,7 @@ where
|
||||
}
|
||||
|
||||
pub fn prove_commitments(
|
||||
tr: &mut impl Transcript<C>,
|
||||
tr: &mut impl Transcript<C::ScalarField>,
|
||||
cs_prover_params: &CS::ProverParams,
|
||||
w: &Witness<C>,
|
||||
ci: &CommittedInstance<C>,
|
||||
@@ -200,7 +200,10 @@ where
|
||||
#[cfg(test)]
|
||||
pub mod tests {
|
||||
use super::*;
|
||||
use ark_crypto_primitives::sponge::poseidon::PoseidonConfig;
|
||||
use ark_crypto_primitives::sponge::{
|
||||
poseidon::{PoseidonConfig, PoseidonSponge},
|
||||
CryptographicSponge,
|
||||
};
|
||||
use ark_ff::{BigInteger, PrimeField};
|
||||
use ark_pallas::{Fr, Projective};
|
||||
use ark_std::{ops::Mul, UniformRand};
|
||||
@@ -209,7 +212,7 @@ pub mod tests {
|
||||
use crate::commitment::pedersen::{Params as PedersenParams, Pedersen};
|
||||
use crate::folding::nova::circuits::ChallengeGadget;
|
||||
use crate::folding::nova::traits::NovaR1CS;
|
||||
use crate::transcript::poseidon::{poseidon_canonical_config, PoseidonTranscript};
|
||||
use crate::transcript::poseidon::poseidon_canonical_config;
|
||||
|
||||
#[allow(clippy::type_complexity)]
|
||||
pub(crate) fn prepare_simple_fold_inputs<C>() -> (
|
||||
@@ -258,16 +261,16 @@ pub mod tests {
|
||||
.unwrap();
|
||||
|
||||
let poseidon_config = poseidon_canonical_config::<C::ScalarField>();
|
||||
let mut transcript = PoseidonSponge::<C::ScalarField>::new(&poseidon_config);
|
||||
|
||||
let pp_hash = C::ScalarField::from(42u32); // only for test
|
||||
let r_bits = ChallengeGadget::<C>::get_challenge_native(
|
||||
&poseidon_config,
|
||||
&mut transcript,
|
||||
pp_hash,
|
||||
ci1.clone(),
|
||||
ci2.clone(),
|
||||
cmT,
|
||||
)
|
||||
.unwrap();
|
||||
);
|
||||
let r_Fr = C::ScalarField::from_bigint(BigInteger::from_bits_le(&r_bits)).unwrap();
|
||||
|
||||
let (w3, ci3) =
|
||||
@@ -364,9 +367,9 @@ pub mod tests {
|
||||
.unwrap();
|
||||
|
||||
// init Prover's transcript
|
||||
let mut transcript_p = PoseidonTranscript::<Projective>::new(&poseidon_config);
|
||||
let mut transcript_p = PoseidonSponge::<Fr>::new(&poseidon_config);
|
||||
// init Verifier's transcript
|
||||
let mut transcript_v = PoseidonTranscript::<Projective>::new(&poseidon_config);
|
||||
let mut transcript_v = PoseidonSponge::<Fr>::new(&poseidon_config);
|
||||
|
||||
// prove the ci3.cmE, ci3.cmW, cmT commitments
|
||||
let cm_proofs = NIFS::<Projective, Pedersen<Projective>>::prove_commitments(
|
||||
|
||||
Reference in New Issue
Block a user