Simplify PolynomialCommitment trait: remove the generic on `S: Cryp…

…tographicSponge` (#145) * `PolynomialCommitment` trait is no longer generic on `S` Instead, pass `&mut impl CryptographicSponge` as an argument to the functions that need it * fix example in README * fmt * remove the now-redundant definitions of Sponge in tests * clean up all imports clean up imports acc to nightly Revert "dont need to use full path" This reverts commit b272524abeaa9f7d6697539f22682bc081e3e8a5. more fmt * fix the constraints mod * fix imports in tests * Test to see * Revert "Test to see" This reverts commit acdbaae. * Add `std` to patch * Revert "Revert "Test to see"" This reverts commit 3448c90. * Reorder imports and simplify * Update dependency on `hashbrown`, temporarily update `crypto-primitive` * Update `Cargo.toml` --------- Co-authored-by: autquis <autquis@gmail.com>
arkworks-rs · Oct 17, 2024 · fdf0642 · fdf0642
1 parent 12f5529
commit fdf0642
Show file tree

Hide file tree

Showing 29 changed files with 347 additions and 403 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,11 +28,12 @@ incremental = true
 debug = true
 
 [patch.crates-io]
+ark-std = { git = "https://github.com/arkworks-rs/std/" }
 ark-ff = { git = "https://github.com/arkworks-rs/algebra/" }
 ark-ec = { git = "https://github.com/arkworks-rs/algebra/" }
 ark-serialize = { git = "https://github.com/arkworks-rs/algebra/" }
-ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitives" }
+ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitives/" }
 ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/" }
 
-ark-bls12-377 = { git = "https://github.com/arkworks-rs/curves/" }
-ark-bls12-381 = { git = "https://github.com/arkworks-rs/curves/" }
+ark-bls12-377 = { git = "https://github.com/arkworks-rs/algebra/" }
+ark-bls12-381 = { git = "https://github.com/arkworks-rs/algebra/" }
diff --git a/README.md b/README.md
@@ -69,8 +69,7 @@ use rand_chacha::ChaCha20Rng;
 use ark_ff::PrimeField;
 
 type UniPoly_377 = DensePolynomial<<Bls12_377 as Pairing>::ScalarField>;
-type Sponge_Bls12_377 = PoseidonSponge<<Bls12_377 as Pairing>::ScalarField>;
-type PCS = MarlinKZG10<Bls12_377, UniPoly_377, Sponge_Bls12_377>;
+type PCS = MarlinKZG10<Bls12_377, UniPoly_377>;
 
 let rng = &mut test_rng();
 

diff --git a/bench-templates/src/lib.rs b/bench-templates/src/lib.rs
@@ -17,11 +17,7 @@ pub use criterion::*;
 pub use paste::paste;
 
 /// Measure the time cost of {commit/open/verify} across a range of num_vars
-pub fn bench_pcs_method<
-    F: PrimeField,
-    P: Polynomial<F>,
-    PCS: PolynomialCommitment<F, P, PoseidonSponge<F>>,
->(
+pub fn bench_pcs_method<F: PrimeField, P: Polynomial<F>, PCS: PolynomialCommitment<F, P>>(
     c: &mut Criterion,
     range: Vec<usize>,
     msg: &str,
@@ -53,11 +49,7 @@ pub fn bench_pcs_method<
 }
 
 /// Report the time cost of a commitment
-pub fn commit<
-    F: PrimeField,
-    P: Polynomial<F>,
-    PCS: PolynomialCommitment<F, P, PoseidonSponge<F>>,
->(
+pub fn commit<F: PrimeField, P: Polynomial<F>, PCS: PolynomialCommitment<F, P>>(
     ck: &PCS::CommitterKey,
     _vk: &PCS::VerifierKey,
     num_vars: usize,
@@ -74,11 +66,7 @@ pub fn commit<
 }
 
 /// Report the size of a commitment
-pub fn commitment_size<
-    F: PrimeField,
-    P: Polynomial<F>,
-    PCS: PolynomialCommitment<F, P, PoseidonSponge<F>>,
->(
+pub fn commitment_size<F: PrimeField, P: Polynomial<F>, PCS: PolynomialCommitment<F, P>>(
     num_vars: usize,
     rand_poly: fn(usize, &mut ChaCha20Rng) -> P,
 ) -> usize {
@@ -106,7 +94,7 @@ pub fn open<F, P, PCS>(
 where
     F: PrimeField,
     P: Polynomial<F>,
-    PCS: PolynomialCommitment<F, P, PoseidonSponge<F>>,
+    PCS: PolynomialCommitment<F, P>,
     P::Point: UniformRand,
 {
     let rng = &mut ChaCha20Rng::from_rng(test_rng()).unwrap();
@@ -123,7 +111,7 @@ where
         [&labeled_poly],
         &coms,
         &point,
-        &mut test_sponge(),
+        &mut test_sponge::<F>(),
         &states,
         Some(rng),
     )
@@ -136,7 +124,7 @@ pub fn proof_size<F, P, PCS>(num_vars: usize, rand_poly: fn(usize, &mut ChaCha20
 where
     F: PrimeField,
     P: Polynomial<F>,
-    PCS: PolynomialCommitment<F, P, PoseidonSponge<F>>,
+    PCS: PolynomialCommitment<F, P>,
 
     P::Point: UniformRand,
 {
@@ -156,7 +144,7 @@ where
         [&labeled_poly],
         &coms,
         &point,
-        &mut test_sponge(),
+        &mut test_sponge::<F>(),
         &states,
         Some(rng),
     )
@@ -177,7 +165,7 @@ pub fn verify<F, P, PCS>(
 where
     F: PrimeField,
     P: Polynomial<F>,
-    PCS: PolynomialCommitment<F, P, PoseidonSponge<F>>,
+    PCS: PolynomialCommitment<F, P>,
     P::Point: UniformRand,
 {
     let rng = &mut ChaCha20Rng::from_rng(test_rng()).unwrap();
@@ -193,7 +181,7 @@ where
         [&labeled_poly],
         &coms,
         &point,
-        &mut test_sponge(),
+        &mut test_sponge::<F>(),
         &states,
         Some(rng),
     )
@@ -206,7 +194,7 @@ where
         &point,
         [claimed_eval],
         &proof,
-        &mut test_sponge(),
+        &mut test_sponge::<F>(),
         None,
     )
     .unwrap();

diff --git a/poly-commit/Cargo.toml b/poly-commit/Cargo.toml
@@ -18,7 +18,7 @@ ark-std = { version = "^0.4.0", default-features = false }
 
 ark-relations = { version = "^0.4.0", default-features = false, optional = true }
 ark-r1cs-std = { version = "^0.4.0", default-features = false, optional = true }
-hashbrown = { version = "0.13", default-features = false, optional = true }
+hashbrown = { version = "0.14", default-features = false, optional = true }
 
 digest = "0.10"
 derivative = { version = "2", features = [ "use_core" ] }

diff --git a/poly-commit/benches/pcs.rs b/poly-commit/benches/pcs.rs
@@ -1,9 +1,7 @@
-use ark_ec::AffineRepr;
 use ark_pcs_bench_templates::*;
 use ark_poly::DenseUVPolynomial;
 use blake2::Blake2s256;
 
-use ark_crypto_primitives::sponge::poseidon::PoseidonSponge;
 use ark_ed_on_bls12_381::{EdwardsAffine, Fr};
 use ark_ff::PrimeField;
 use ark_poly::univariate::DensePolynomial as DenseUnivariatePoly;
@@ -12,11 +10,10 @@ use ark_poly_commit::ipa_pc::InnerProductArgPC;
 use rand_chacha::ChaCha20Rng;
 
 type UniPoly = DenseUnivariatePoly<Fr>;
-type Sponge = PoseidonSponge<<EdwardsAffine as AffineRepr>::ScalarField>;
 
 // IPA_PC over the JubJub curve with Blake2s as the hash function
 #[allow(non_camel_case_types)]
-type IPA_JubJub = InnerProductArgPC<EdwardsAffine, Blake2s256, UniPoly, Sponge>;
+type IPA_JubJub = InnerProductArgPC<EdwardsAffine, Blake2s256, UniPoly>;
 
 fn rand_poly_ipa_pc<F: PrimeField>(degree: usize, rng: &mut ChaCha20Rng) -> DenseUnivariatePoly<F> {
     DenseUnivariatePoly::rand(degree, rng)

diff --git a/poly-commit/benches/size.rs b/poly-commit/benches/size.rs
@@ -1,9 +1,7 @@
-use ark_ec::AffineRepr;
 use ark_pcs_bench_templates::*;
 use ark_poly::DenseUVPolynomial;
 use blake2::Blake2s256;
 
-use ark_crypto_primitives::sponge::poseidon::PoseidonSponge;
 use ark_ed_on_bls12_381::{EdwardsAffine, Fr};
 use ark_ff::PrimeField;
 use ark_poly::univariate::DensePolynomial as DenseUnivariatePoly;
@@ -12,12 +10,11 @@ use ark_poly_commit::ipa_pc::InnerProductArgPC;
 use rand_chacha::ChaCha20Rng;
 
 type UniPoly = DenseUnivariatePoly<Fr>;
-type Sponge = PoseidonSponge<<EdwardsAffine as AffineRepr>::ScalarField>;
-type PC<E, D, P, S> = InnerProductArgPC<E, D, P, S>;
+type PC<E, D, P> = InnerProductArgPC<E, D, P>;
 
 // IPA_PC over the JubJub curve with Blake2s as the hash function
 #[allow(non_camel_case_types)]
-type IPA_JubJub = PC<EdwardsAffine, Blake2s256, UniPoly, Sponge>;
+type IPA_JubJub = PC<EdwardsAffine, Blake2s256, UniPoly>;
 
 fn rand_poly_ipa_pc<F: PrimeField>(degree: usize, rng: &mut ChaCha20Rng) -> DenseUnivariatePoly<F> {
     DenseUnivariatePoly::rand(degree, rng)

diff --git a/poly-commit/src/constraints.rs b/poly-commit/src/constraints.rs
@@ -1,14 +1,17 @@
 use crate::{
     data_structures::LabeledCommitment, BatchLCProof, LCTerm, LinearCombination,
-    PCPreparedCommitment, PCPreparedVerifierKey, PolynomialCommitment, String, Vec,
+    PCPreparedCommitment, PCPreparedVerifierKey, PolynomialCommitment,
 };
-use ark_crypto_primitives::sponge::CryptographicSponge;
 use ark_ff::PrimeField;
 use ark_poly::Polynomial;
-use ark_r1cs_std::fields::emulated_fp::EmulatedFpVar;
-use ark_r1cs_std::{fields::fp::FpVar, prelude::*};
+use ark_r1cs_std::{
+    fields::{emulated_fp::EmulatedFpVar, fp::FpVar},
+    prelude::*,
+};
 use ark_relations::r1cs::{ConstraintSystemRef, Namespace, Result as R1CSResult, SynthesisError};
-use ark_std::{borrow::Borrow, cmp::Eq, cmp::PartialEq, hash::Hash, marker::Sized};
+use ark_std::{borrow::Borrow, cmp::Eq, cmp::PartialEq, hash::Hash};
+#[cfg(not(feature = "std"))]
+use ark_std::{string::String, vec::Vec};
 use hashbrown::{HashMap, HashSet};
 
 /// Define the minimal interface of prepared allocated structures.
@@ -94,9 +97,8 @@ pub struct PCCheckRandomDataVar<TargetField: PrimeField, BaseField: PrimeField>
 pub trait PCCheckVar<
     PCF: PrimeField,
     P: Polynomial<PCF>,
-    PC: PolynomialCommitment<PCF, P, S>,
+    PC: PolynomialCommitment<PCF, P>,
     ConstraintF: PrimeField,
-    S: CryptographicSponge,
 >: Clone
 {
     /// The prepared verifier key for the scheme; used to check an evaluation proof.

diff --git a/poly-commit/src/data_structures.rs b/poly-commit/src/data_structures.rs
@@ -1,12 +1,14 @@
-use crate::{Polynomial, String, Vec};
+use crate::Polynomial;
 use ark_ff::{Field, PrimeField, ToConstraintField};
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
-use ark_std::rand::RngCore;
 use ark_std::{
     borrow::Borrow,
     marker::PhantomData,
     ops::{AddAssign, MulAssign, SubAssign},
+    rand::RngCore,
 };
+#[cfg(not(feature = "std"))]
+use ark_std::{string::String, vec::Vec};
 
 /// Labels a `LabeledPolynomial` or a `LabeledCommitment`.
 pub type PolynomialLabel = String;

diff --git a/poly-commit/src/error.rs b/poly-commit/src/error.rs
@@ -1,4 +1,5 @@
-use crate::String;
+#[cfg(not(feature = "std"))]
+use ark_std::string::String;
 
 /// The error type for `PolynomialCommitment`.
 #[derive(Debug)]

diff --git a/poly-commit/src/ipa_pc/data_structures.rs b/poly-commit/src/ipa_pc/data_structures.rs
@@ -1,10 +1,7 @@
 use crate::*;
-use crate::{PCCommitterKey, PCVerifierKey, Vec};
 use ark_ec::AffineRepr;
-use ark_ff::{Field, UniformRand, Zero};
+use ark_ff::{UniformRand, Zero};
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
-use ark_std::rand::RngCore;
-use ark_std::vec;
 
 /// `UniversalParams` are the universal parameters for the inner product arg scheme.
 #[derive(Derivative, CanonicalSerialize, CanonicalDeserialize)]