arnaucube/Nova
1
0
Fork 0
mirror of https://github.com/arnaucube/Nova.git synced 2026-01-10 16:11:29 +01:00
Code Issues Projects Releases Wiki Activity

add hash(params, U, z0, zi, i) when generating a challenge (#51)

Browse Source 
* add hash(params, U, z0, zi, i) when generating a challenge

* address clippy
This commit is contained in:
Srinath Setty
2022-05-13 11:04:12 +05:30
committed by GitHub
parent ccc6dc3a04
commit 706d688a13
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/circuit.rs
View File

@@ -201,7 +201,7 @@ where
u: AllocatedR1CSInstance<G>, u: AllocatedR1CSInstance<G>,
T: AllocatedPoint<G::Base>, T: AllocatedPoint<G::Base>,
) -> Result<(AllocatedRelaxedR1CSInstance<G>, AllocatedBit), SynthesisError> { ) -> Result<(AllocatedRelaxedR1CSInstance<G>, AllocatedBit), SynthesisError> {
// Check that u.x[0] = Hash(params, U,i,z0,zi) // Check that u.x[0] = Hash(params, U, i, z0, zi)
let mut ro: PoseidonROGadget<G::Base> = PoseidonROGadget::new(self.poseidon_constants.clone()); let mut ro: PoseidonROGadget<G::Base> = PoseidonROGadget::new(self.poseidon_constants.clone());
ro.absorb(params); ro.absorb(params);
ro.absorb(i); ro.absorb(i);
@@ -220,6 +220,7 @@ where
// Run NIFS Verifier // Run NIFS Verifier
let U_fold = U.fold_with_r1cs( let U_fold = U.fold_with_r1cs(
cs.namespace(|| "compute fold of U and u"), cs.namespace(|| "compute fold of U and u"),
hash, // hash of the (params, U, i, z0, zi)
u, u,
T, T,
self.poseidon_constants.clone(), self.poseidon_constants.clone(),

3
src/gadgets/r1cs.rs
View File

@@ -212,9 +212,11 @@ where
} }
/// Folds self with a relaxed r1cs instance and returns the result /// Folds self with a relaxed r1cs instance and returns the result
#[allow(clippy::too_many_arguments)]
pub fn fold_with_r1cs<CS: ConstraintSystem<<G as Group>::Base>>( pub fn fold_with_r1cs<CS: ConstraintSystem<<G as Group>::Base>>(
&self, &self,
mut cs: CS, mut cs: CS,
hash: AllocatedNum<G::Base>, // hash of (params, running_instance, i, z0, zi)
u: AllocatedR1CSInstance<G>, u: AllocatedR1CSInstance<G>,
T: AllocatedPoint<G::Base>, T: AllocatedPoint<G::Base>,
poseidon_constants: NovaPoseidonConstants<G::Base>, poseidon_constants: NovaPoseidonConstants<G::Base>,
@@ -223,6 +225,7 @@ where
) -> Result<AllocatedRelaxedR1CSInstance<G>, SynthesisError> { ) -> Result<AllocatedRelaxedR1CSInstance<G>, SynthesisError> {
// Compute r: // Compute r:
let mut ro: PoseidonROGadget<G::Base> = PoseidonROGadget::new(poseidon_constants); let mut ro: PoseidonROGadget<G::Base> = PoseidonROGadget::new(poseidon_constants);
ro.absorb(hash);
u.absorb_in_ro(&mut ro); u.absorb_in_ro(&mut ro);
ro.absorb(T.x.clone()); ro.absorb(T.x.clone());
ro.absorb(T.y.clone()); ro.absorb(T.y.clone());

14
src/poseidon.rs
View File

@@ -12,7 +12,7 @@ use bellperson::{
}; };
use core::marker::PhantomData; use core::marker::PhantomData;
use ff::{PrimeField, PrimeFieldBits}; use ff::{PrimeField, PrimeFieldBits};
use generic_array::typenum::{U27, U8}; use generic_array::typenum::{U27, U9};
use neptune::{ use neptune::{
circuit::poseidon_hash, circuit::poseidon_hash,
poseidon::{Poseidon, PoseidonConstants}, poseidon::{Poseidon, PoseidonConstants},
@@ -25,7 +25,7 @@ pub struct NovaPoseidonConstants<Scalar>
where where
Scalar: PrimeField, Scalar: PrimeField,
{ {
constants8: PoseidonConstants<Scalar, U8>, constants9: PoseidonConstants<Scalar, U9>,
constants27: PoseidonConstants<Scalar, U27>, constants27: PoseidonConstants<Scalar, U27>,
} }
@@ -36,10 +36,10 @@ where
/// Generate Poseidon constants for the arities that Nova uses /// Generate Poseidon constants for the arities that Nova uses
#[allow(clippy::new_without_default)] #[allow(clippy::new_without_default)]
fn new() -> Self { fn new() -> Self {
let constants8 = PoseidonConstants::<Scalar, U8>::new_with_strength(Strength::Strengthened); let constants9 = PoseidonConstants::<Scalar, U9>::new_with_strength(Strength::Strengthened);
let constants27 = PoseidonConstants::<Scalar, U27>::new_with_strength(Strength::Strengthened); let constants27 = PoseidonConstants::<Scalar, U27>::new_with_strength(Strength::Strengthened);
Self { Self {
constants8, constants9,
constants27, constants27,
} }
} }
@@ -65,7 +65,7 @@ where
{ {
fn hash_inner(&self) -> Base { fn hash_inner(&self) -> Base {
match self.state.len() { match self.state.len() {
8 => Poseidon::<Base, U8>::new_with_preimage(&self.state, &self.constants.constants8).hash(), 9 => Poseidon::<Base, U9>::new_with_preimage(&self.state, &self.constants.constants9).hash(),
27 => { 27 => {
Poseidon::<Base, U27>::new_with_preimage(&self.state, &self.constants.constants27).hash() Poseidon::<Base, U27>::new_with_preimage(&self.state, &self.constants.constants27).hash()
} }
@@ -169,10 +169,10 @@ where
CS: ConstraintSystem<Scalar>, CS: ConstraintSystem<Scalar>,
{ {
let out = match self.state.len() { let out = match self.state.len() {
8 => poseidon_hash( 9 => poseidon_hash(
cs.namespace(|| "Posideon hash"), cs.namespace(|| "Posideon hash"),
self.state.clone(), self.state.clone(),
&self.constants.constants8, &self.constants.constants9,
)?, )?,
27 => poseidon_hash( 27 => poseidon_hash(
cs.namespace(|| "Poseidon hash"), cs.namespace(|| "Poseidon hash"),