Upgrade to v0.4.0

CHANGELOG.md

@@ -14,6 +14,11 @@
 
 ### Bug fixes
 
+## v0.4.0
+
+- Change dependency to version `0.4.0` of other arkwork-rs crates.
+- Fiat-Shamir transformation for the AHP uses the Poseidon sponge function.
+
 ## v0.3.0
 
 - Change dependency to version `0.3.0` of other arkworks-rs crates.

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ark-marlin"
-version = "0.3.0"
+version = "0.4.0"
 authors = [
   "Alessandro Chiesa <[email protected]>",
   "Mary Maller <[email protected]>",
@@ -17,28 +17,30 @@ keywords = ["cryptography", "commitments", "zkSNARK"]
 categories = ["cryptography"]
 include = ["Cargo.toml", "src", "README.md", "LICENSE-APACHE", "LICENSE-MIT"]
 license = "MIT/Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
-ark-serialize = { version = "^0.3.0", default-features = false, features = [ "derive" ] }
-ark-ff = { version = "^0.3.0", default-features = false }
-ark-std = { version = "^0.3.0", default-features = false }
-ark-poly = { version = "^0.3.0", default-features = false }
-ark-relations = { version = "^0.3.0", default-features = false }
-ark-poly-commit = { version = "^0.3.0", default-features = false }
+ark-serialize = { version = "^0.4.0", default-features = false, features = [ "derive" ] }
+ark-ff = { version = "^0.4.0", default-features = false }
+ark-ec = { version = "^0.4.0", default-features = false }
+ark-std = { version = "^0.4.0", default-features = false }
+ark-poly = { version = "^0.4.0", default-features = false }
+ark-relations = { version = "^0.4.0", default-features = false }
+ark-poly-commit = { version = "^0.4.0", default-features = false }
+ark-crypto-primitives = { version = "^0.4.0", default-features = false, features = [ "r1cs" ] }
 
 rayon = { version = "1", optional = true }
 digest = { version = "0.9" }
 derivative = { version = "2", features = ["use_core"] }
 
 [dev-dependencies]
-rand_chacha = { version = "0.3.0", default-features = false }
+rand_chacha = { version = "^0.3.0", default-features = false }
 blake2 = { version = "0.9", default-features = false }
-ark-bls12-381 = { version = "^0.3.0", default-features = false, features = [ "curve" ] }
-ark-mnt4-298 = { version = "^0.3.0", default-features = false, features = ["r1cs", "curve"] }
-ark-mnt6-298 = { version = "^0.3.0", default-features = false, features = ["r1cs"] }
-ark-mnt4-753 = { version = "^0.3.0", default-features = false, features = ["r1cs", "curve"] }
-ark-mnt6-753 = { version = "^0.3.0", default-features = false, features = ["r1cs"] }
+ark-bls12-381 = { version = "^0.4.0", default-features = false, features = [ "curve" ] }
+ark-mnt4-298 = { version = "^0.4.0", default-features = false, features = ["r1cs", "curve"] }
+ark-mnt6-298 = { version = "^0.4.0", default-features = false, features = ["r1cs"] }
+ark-mnt4-753 = { version = "^0.4.0", default-features = false, features = ["r1cs", "curve"] }
+ark-mnt6-753 = { version = "^0.4.0", default-features = false, features = ["r1cs"] }
 
 [profile.release]
 opt-level = 3

benches/bench.rs

@@ -3,8 +3,9 @@
 // where N is the number of threads you want to use (N = 1 for single-thread).
 
 use ark_bls12_381::{Bls12_381, Fr as BlsFr};
+use ark_ec::pairing::Pairing;
 use ark_ff::PrimeField;
-use ark_marlin::{Marlin, SimpleHashFiatShamirRng};
+use ark_marlin::{Marlin, SimplePoseidonRng};
 use ark_mnt4_298::{Fr as MNT4Fr, MNT4_298};
 use ark_mnt4_753::{Fr as MNT4BigFr, MNT4_753};
 use ark_mnt6_298::{Fr as MNT6Fr, MNT6_298};
@@ -16,8 +17,8 @@ use ark_relations::{
     r1cs::{ConstraintSynthesizer, ConstraintSystemRef, SynthesisError},
 };
 use ark_std::{ops::Mul, UniformRand};
-use blake2::Blake2s;
-use rand_chacha::ChaChaRng;
+
+
 
 const NUM_PROVE_REPEATITIONS: usize = 10;
 const NUM_VERIFY_REPEATITIONS: usize = 50;
@@ -78,14 +79,22 @@ macro_rules! marlin_prove_bench {
 
         let srs = Marlin::<
             $bench_field,
-            SonicKZG10<$bench_pairing_engine, DensePolynomial<$bench_field>>,
-            SimpleHashFiatShamirRng<Blake2s, ChaChaRng>,
+            SonicKZG10<
+                $bench_pairing_engine,
+                DensePolynomial<$bench_field>,
+                SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
+            >,
+            SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
         >::universal_setup(65536, 65536, 3 * 65536, rng)
         .unwrap();
         let (pk, _) = Marlin::<
             $bench_field,
-            SonicKZG10<$bench_pairing_engine, DensePolynomial<$bench_field>>,
-            SimpleHashFiatShamirRng<Blake2s, ChaChaRng>,
+            SonicKZG10<
+                $bench_pairing_engine,
+                DensePolynomial<$bench_field>,
+                SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
+            >,
+            SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
         >::index(&srs, c)
         .unwrap();
 
@@ -94,8 +103,12 @@ macro_rules! marlin_prove_bench {
         for _ in 0..NUM_PROVE_REPEATITIONS {
             let _ = Marlin::<
                 $bench_field,
-                SonicKZG10<$bench_pairing_engine, DensePolynomial<$bench_field>>,
-                SimpleHashFiatShamirRng<Blake2s, ChaChaRng>,
+                SonicKZG10<
+                    $bench_pairing_engine,
+                    DensePolynomial<$bench_field>,
+                    SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
+                >,
+                SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
             >::prove(&pk, c.clone(), rng)
             .unwrap();
         }
@@ -120,20 +133,32 @@ macro_rules! marlin_verify_bench {
 
         let srs = Marlin::<
             $bench_field,
-            SonicKZG10<$bench_pairing_engine, DensePolynomial<$bench_field>>,
-            SimpleHashFiatShamirRng<Blake2s, ChaChaRng>,
+            SonicKZG10<
+                $bench_pairing_engine,
+                DensePolynomial<$bench_field>,
+                SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
+            >,
+            SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
         >::universal_setup(65536, 65536, 3 * 65536, rng)
         .unwrap();
         let (pk, vk) = Marlin::<
             $bench_field,
-            SonicKZG10<$bench_pairing_engine, DensePolynomial<$bench_field>>,
-            SimpleHashFiatShamirRng<Blake2s, ChaChaRng>,
+            SonicKZG10<
+                $bench_pairing_engine,
+                DensePolynomial<$bench_field>,
+                SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
+            >,
+            SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
         >::index(&srs, c)
         .unwrap();
         let proof = Marlin::<
             $bench_field,
-            SonicKZG10<$bench_pairing_engine, DensePolynomial<$bench_field>>,
-            SimpleHashFiatShamirRng<Blake2s, ChaChaRng>,
+            SonicKZG10<
+                $bench_pairing_engine,
+                DensePolynomial<$bench_field>,
+                SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
+            >,
+            SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
         >::prove(&pk, c.clone(), rng)
         .unwrap();
 
@@ -144,8 +169,12 @@ macro_rules! marlin_verify_bench {
         for _ in 0..NUM_VERIFY_REPEATITIONS {
             let _ = Marlin::<
                 $bench_field,
-                SonicKZG10<$bench_pairing_engine, DensePolynomial<$bench_field>>,
-                SimpleHashFiatShamirRng<Blake2s, ChaChaRng>,
+                SonicKZG10<
+                    $bench_pairing_engine,
+                    DensePolynomial<$bench_field>,
+                    SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
+                >,
+                SimplePoseidonRng<<$bench_pairing_engine as Pairing>::BaseField>,
             >::verify(&vk, &vec![v], &proof, rng)
             .unwrap();
         }

src/ahp/constraint_systems.rs

@@ -6,11 +6,8 @@ use crate::BTreeMap;
 use ark_ff::{Field, PrimeField};
 use ark_poly::{EvaluationDomain, Evaluations as EvaluationsOnDomain, GeneralEvaluationDomain};
 use ark_relations::{lc, r1cs::ConstraintSystemRef};
-use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, SerializationError};
-use ark_std::{
-    cfg_iter_mut,
-    io::{Read, Write},
-};
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
+use ark_std::cfg_iter_mut;
 use derivative::Derivative;
 
 /* ************************************************************************* */

src/ahp/indexer.rs

@@ -7,16 +7,13 @@ use crate::ahp::{
     AHPForR1CS, Error, LabeledPolynomial,
 };
 use crate::Vec;
-use ark_ff::PrimeField;
+use ark_ff::{Field, PrimeField};
 use ark_poly::{EvaluationDomain, GeneralEvaluationDomain};
 use ark_relations::r1cs::{
     ConstraintSynthesizer, ConstraintSystem, OptimizationGoal, SynthesisError, SynthesisMode,
 };
-use ark_serialize::{CanonicalDeserialize, CanonicalSerialize, SerializationError};
-use ark_std::{
-    io::{Read, Write},
-    marker::PhantomData,
-};
+use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
+use ark_std::marker::PhantomData;
 use derivative::Derivative;
 
 use crate::ahp::constraint_systems::{
@@ -28,7 +25,7 @@ use crate::ahp::constraint_systems::{
 /// entries in any of the constraint matrices.
 #[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]
 #[derivative(Clone(bound = ""), Copy(bound = ""))]
-pub struct IndexInfo<F> {
+pub struct IndexInfo<F: Field> {
     /// The total number of variables in the constraint system.
     pub num_variables: usize,
     /// The number of constraints.
@@ -42,7 +39,7 @@ pub struct IndexInfo<F> {
     f: PhantomData<F>,
 }
 
-impl<F> IndexInfo<F> {
+impl<F: Field> IndexInfo<F> {
     /// Construct a new index info
     pub fn new(
         num_variables: usize,
@@ -60,14 +57,6 @@ impl<F> IndexInfo<F> {
     }
 }
 
-impl<F: PrimeField> ark_ff::ToBytes for IndexInfo<F> {
-    fn write<W: Write>(&self, mut w: W) -> ark_std::io::Result<()> {
-        (self.num_variables as u64).write(&mut w)?;
-        (self.num_constraints as u64).write(&mut w)?;
-        (self.num_non_zero as u64).write(&mut w)
-    }
-}
-
 impl<F: PrimeField> IndexInfo<F> {
     /// The maximum degree of polynomial required to represent this index in the
     /// the AHP.

src/ahp/mod.rs

@@ -334,7 +334,7 @@ mod tests {
     use ark_ff::{One, UniformRand, Zero};
     use ark_poly::{
         univariate::{DenseOrSparsePolynomial, DensePolynomial},
-        Polynomial, UVPolynomial,
+        DenseUVPolynomial, Polynomial,
     };
 
     #[test]
@@ -414,11 +414,7 @@ mod tests {
             divisor
                 .coeffs
                 .iter()
-                .filter_map(|f| if !f.is_zero() {
-                    Some(f.into_repr())
-                } else {
-                    None
-                })
+                .filter_map(|f| if !f.is_zero() { Some(f) } else { None })
                 .collect::<Vec<_>>()
         );
 
@@ -446,11 +442,7 @@ mod tests {
             quotient
                 .coeffs
                 .iter()
-                .filter_map(|f| if !f.is_zero() {
-                    Some(f.into_repr())
-                } else {
-                    None
-                })
+                .filter_map(|f| if !f.is_zero() { Some(f) } else { None })
                 .collect::<Vec<_>>()
         );