Constraints

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ark-poly-commit"
-version = "0.3.0"
+version = "0.3.1"
 authors = [
   "Alessandro Chiesa <[email protected]>",
   "Mary Maller <[email protected]>",
@@ -21,28 +21,29 @@ license = "MIT/Apache-2.0"
 edition = "2018"
 
 [dependencies]
-ark-serialize = { version = "^0.3.0", default-features = false, features = [ "derive" ] }
-ark-ff = { version = "^0.3.0", default-features = false }
-ark-ec = { version = "^0.3.0", default-features = false }
-ark-poly = {version = "^0.3.0", default-features = false }
-ark-sponge = {version = "^0.3.0", default-features = false}
+ark-serialize = { version = "0.3", default-features = false, features = [ "derive" ] }
+ark-ff = { version = "0.3", default-features = false }
+ark-ec = { version = "0.3", default-features = false }
+ark-poly = {version = "0.3", default-features = false }
+ark-sponge = {version = "0.3", default-features = false}
 
-ark-std = { version = "^0.3.0", default-features = false }
-ark-relations = { version = "^0.3.0", default-features = false, optional = true }
-ark-r1cs-std = { version = "^0.3.0", default-features = false, optional = true }
-ark-nonnative-field = { version = "^0.3.0", default-features = false, optional = true }
+ark-std = { version = "0.3", default-features = false }
+ark-relations = { version = "0.3", default-features = false, optional = true }
+ark-r1cs-std = { version = "0.3", default-features = false, optional = true }
+ark-nonnative-field = { version = "0.3", default-features = false, optional = true }
 hashbrown = { version = "0.9", optional = true }
 
 digest = "0.9"
 rayon = { version = "1", optional = true }
 derivative = { version = "2", features = [ "use_core" ] }
+tracing = { version = "0.1", default-features = false, features = [ "attributes" ] }
 
 [dev-dependencies]
-ark-ed-on-bls12-381 = { version = "^0.3.0", default-features = false }
-ark-bls12-381 = { version = "^0.3.0", default-features = false, features = [ "curve" ] }
-ark-bls12-377 = { version = "^0.3.0", default-features = false, features = [ "curve" ] }
+ark-ed-on-bls12-381 = { version = "0.3", default-features = false }
+ark-bls12-381 = { version = "0.3", default-features = false, features = [ "curve" ] }
+ark-bls12-377 = { version = "0.3", default-features = false, features = [ "curve" ] }
 blake2 = { version = "0.9", default-features = false }
-rand_chacha = { version = "0.3.0", default-features = false }
+rand_chacha = { version = "0.3", default-features = false }
 
 [profile.release]
 opt-level = 3
@@ -56,16 +57,6 @@ debug-assertions = true
 incremental = true
 debug = true
 
-# To be removed in the new release.
-[patch.crates-io]
-ark-std = { git = "https://github.com/arkworks-rs/std" }
-ark-ec = { git = "https://github.com/arkworks-rs/algebra" }
-ark-ff = { git = "https://github.com/arkworks-rs/algebra" }
-ark-serialize = { git = "https://github.com/arkworks-rs/algebra" }
-ark-bls12-381 = { git = "https://github.com/arkworks-rs/curves" }
-ark-bls12-377 = { git = "https://github.com/arkworks-rs/curves" }
-ark-ed-on-bls12-381 = { git = "https://github.com/arkworks-rs/curves" }
-
 [features]
 default = [ "std", "parallel" ]
 std = [ "ark-ff/std", "ark-ec/std", "ark-nonnative-field/std", "ark-poly/std", "ark-std/std", "ark-relations/std", "ark-serialize/std", "ark-sponge/std"]

src/data_structures.rs

@@ -108,6 +108,7 @@ pub struct BatchLCProof<F: PrimeField, T: Clone + CanonicalSerialize + Canonical
     /// Evaluation proof.
     pub proof: T,
     /// Evaluations required to verify the proof.
+    // TODO `Option<Vec<_>>` should be `Vec<_>`
     pub evals: Option<Vec<F>>,
 }
 

src/ipa_pc/mod.rs

@@ -3,7 +3,7 @@ use crate::{BatchLCProof, Error, Evaluations, QuerySet, UVPolynomial};
 use crate::{LabeledCommitment, LabeledPolynomial, LinearCombination};
 use crate::{PCCommitterKey, PCRandomness, PCUniversalParams, PolynomialCommitment};
 
-use ark_ec::{msm::VariableBase, AffineCurve, ProjectiveCurve};
+use ark_ec::{msm::VariableBaseMSM, AffineCurve, ProjectiveCurve};
 use ark_ff::{to_bytes, Field, One, PrimeField, UniformRand, Zero};
 use ark_std::rand::RngCore;
 use ark_std::{convert::TryInto, format, marker::PhantomData, vec};
@@ -65,7 +65,7 @@ where
             .map(|s| s.into_repr())
             .collect::<Vec<_>>();
 
-        let mut comm = VariableBase::msm(comm_key, &scalars_bigint);
+        let mut comm = VariableBaseMSM::multi_scalar_mul(comm_key, &scalars_bigint);
 
         if randomizer.is_some() {
             assert!(hiding_generator.is_some());
@@ -701,14 +701,14 @@ where
         })
     }
 
-    fn check<'a>(
+    fn check<'a, R: RngCore>(
         vk: &Self::VerifierKey,
         commitments: impl IntoIterator<Item = &'a LabeledCommitment<Self::Commitment>>,
         point: &'a P::Point,
         values: impl IntoIterator<Item = G::ScalarField>,
         proof: &Self::Proof,
         opening_challenges: &mut ChallengeGenerator<G::ScalarField, S>,
-        _rng: Option<&mut dyn RngCore>,
+        _rng: Option<&mut R>,
     ) -> Result<bool, Self::Error>
     where
         Self::Commitment: 'a,
@@ -759,11 +759,12 @@ where
         values: &Evaluations<G::ScalarField, P::Point>,
         proof: &Self::BatchProof,
         opening_challenges: &mut ChallengeGenerator<G::ScalarField, S>,
-        rng: &mut R,
+        rng: Option<&mut R>,
     ) -> Result<bool, Self::Error>
     where
         Self::Commitment: 'a,
     {
+        let rng = &mut crate::optional_rng::OptionalRng(rng);
         let commitments: BTreeMap<_, _> = commitments.into_iter().map(|c| (c.label(), c)).collect();
         let mut query_to_labels_map = BTreeMap::new();
 
@@ -956,7 +957,7 @@ where
         eqn_evaluations: &Evaluations<P::Point, G::ScalarField>,
         proof: &BatchLCProof<G::ScalarField, Self::BatchProof>,
         opening_challenges: &mut ChallengeGenerator<G::ScalarField, S>,
-        rng: &mut R,
+        rng: Option<&mut R>,
     ) -> Result<bool, Self::Error>
     where
         Self::Commitment: 'a,

src/kzg10/mod.rs

@@ -6,7 +6,7 @@
 //! This construction achieves extractability in the algebraic group model (AGM).
 
 use crate::{BTreeMap, Error, LabeledPolynomial, PCRandomness, ToString, Vec};
-use ark_ec::msm::{FixedBase, VariableBase};
+use ark_ec::msm::{FixedBaseMSM, VariableBaseMSM};
 use ark_ec::{group::Group, AffineCurve, PairingEngine, ProjectiveCurve};
 use ark_ff::{One, PrimeField, UniformRand, Zero};
 use ark_poly::UVPolynomial;
@@ -58,17 +58,21 @@ where
             cur *= β
         }
 
-        let window_size = FixedBase::get_mul_window_size(max_degree + 1);
+        let window_size = FixedBaseMSM::get_mul_window_size(max_degree + 1);
 
         let scalar_bits = E::Fr::size_in_bits();
         let g_time = start_timer!(|| "Generating powers of G");
-        let g_table = FixedBase::get_window_table(scalar_bits, window_size, g);
-        let powers_of_g =
-            FixedBase::msm::<E::G1Projective>(scalar_bits, window_size, &g_table, &powers_of_beta);
+        let g_table = FixedBaseMSM::get_window_table(scalar_bits, window_size, g);
+        let powers_of_g = FixedBaseMSM::multi_scalar_mul::<E::G1Projective>(
+            scalar_bits,
+            window_size,
+            &g_table,
+            &powers_of_beta,
+        );
         end_timer!(g_time);
         let gamma_g_time = start_timer!(|| "Generating powers of gamma * G");
-        let gamma_g_table = FixedBase::get_window_table(scalar_bits, window_size, gamma_g);
-        let mut powers_of_gamma_g = FixedBase::msm::<E::G1Projective>(
+        let gamma_g_table = FixedBaseMSM::get_window_table(scalar_bits, window_size, gamma_g);
+        let mut powers_of_gamma_g = FixedBaseMSM::multi_scalar_mul::<E::G1Projective>(
             scalar_bits,
             window_size,
             &gamma_g_table,
@@ -95,8 +99,8 @@ where
                 cur /= &beta;
             }
 
-            let neg_h_table = FixedBase::get_window_table(scalar_bits, window_size, h);
-            let neg_powers_of_h = FixedBase::msm::<E::G2Projective>(
+            let neg_h_table = FixedBaseMSM::get_window_table(scalar_bits, window_size, h);
+            let neg_powers_of_h = FixedBaseMSM::multi_scalar_mul::<E::G2Projective>(
                 scalar_bits,
                 window_size,
                 &neg_h_table,
@@ -152,8 +156,10 @@ where
             skip_leading_zeros_and_convert_to_bigints(polynomial);
 
         let msm_time = start_timer!(|| "MSM to compute commitment to plaintext poly");
-        let mut commitment =
-            VariableBase::msm(&powers.powers_of_g[num_leading_zeros..], &plain_coeffs);
+        let mut commitment = VariableBaseMSM::multi_scalar_mul(
+            &powers.powers_of_g[num_leading_zeros..],
+            &plain_coeffs,
+        );
         end_timer!(msm_time);
 
         let mut randomness = Randomness::<E::Fr, P>::empty();
@@ -175,7 +181,8 @@ where
         let random_ints = convert_to_bigints(&randomness.blinding_polynomial.coeffs());
         let msm_time = start_timer!(|| "MSM to compute commitment to random poly");
         let random_commitment =
-            VariableBase::msm(&powers.powers_of_gamma_g, random_ints.as_slice()).into_affine();
+            VariableBaseMSM::multi_scalar_mul(&powers.powers_of_gamma_g, random_ints.as_slice())
+                .into_affine();
         end_timer!(msm_time);
 
         commitment.add_assign_mixed(&random_commitment);
@@ -226,7 +233,10 @@ where
             skip_leading_zeros_and_convert_to_bigints(witness_polynomial);
 
         let witness_comm_time = start_timer!(|| "Computing commitment to witness polynomial");
-        let mut w = VariableBase::msm(&powers.powers_of_g[num_leading_zeros..], &witness_coeffs);
+        let mut w = VariableBaseMSM::multi_scalar_mul(
+            &powers.powers_of_g[num_leading_zeros..],
+            &witness_coeffs,
+        );
         end_timer!(witness_comm_time);
 
         let random_v = if let Some(hiding_witness_polynomial) = hiding_witness_polynomial {
@@ -238,7 +248,10 @@ where
             let random_witness_coeffs = convert_to_bigints(&hiding_witness_polynomial.coeffs());
             let witness_comm_time =
                 start_timer!(|| "Computing commitment to random witness polynomial");
-            w += &VariableBase::msm(&powers.powers_of_gamma_g, &random_witness_coeffs);
+            w += &VariableBaseMSM::multi_scalar_mul(
+                &powers.powers_of_gamma_g,
+                &random_witness_coeffs,
+            );
             end_timer!(witness_comm_time);
             Some(blinding_evaluation)
         } else {
@@ -308,11 +321,12 @@ where
         points: &[E::Fr],
         values: &[E::Fr],
         proofs: &[Proof<E>],
-        rng: &mut R,
+        rng: Option<&mut R>,
     ) -> Result<bool, Error> {
         let check_time =
             start_timer!(|| format!("Checking {} evaluation proofs", commitments.len()));
 
+        let rng = &mut crate::optional_rng::OptionalRng(rng);
         let mut total_c = <E::G1Projective>::zero();
         let mut total_w = <E::G1Projective>::zero();
 
@@ -603,7 +617,12 @@ mod tests {
                 proofs.push(proof);
             }
             assert!(KZG10::<E, P>::batch_check(
-                &vk, &comms, &points, &values, &proofs, rng
+                &vk,
+                &comms,
+                &points,
+                &values,
+                &proofs,
+                Some(rng)
             )?);
         }
         Ok(())

src/lib.rs

@@ -222,14 +222,14 @@ pub trait PolynomialCommitment<F: PrimeField, P: Polynomial<F>, S: Cryptographic
         Self::Commitment: 'a;
 
     /// check but with individual challenges
-    fn check<'a>(
+    fn check<'a, R: RngCore>(
         vk: &Self::VerifierKey,
         commitments: impl IntoIterator<Item = &'a LabeledCommitment<Self::Commitment>>,
         point: &'a P::Point,
         values: impl IntoIterator<Item = F>,
         proof: &Self::Proof,
         challenge_generator: &mut ChallengeGenerator<F, S>,
-        rng: Option<&mut dyn RngCore>,
+        rng: Option<&mut R>,
     ) -> Result<bool, Self::Error>
     where
         Self::Commitment: 'a;
@@ -242,7 +242,7 @@ pub trait PolynomialCommitment<F: PrimeField, P: Polynomial<F>, S: Cryptographic
         evaluations: &Evaluations<P::Point, F>,
         proof: &Self::BatchProof,
         challenge_generator: &mut ChallengeGenerator<F, S>,
-        rng: &mut R,
+        mut rng: Option<&mut R>,
     ) -> Result<bool, Self::Error>
     where
         Self::Commitment: 'a,
@@ -289,7 +289,7 @@ pub trait PolynomialCommitment<F: PrimeField, P: Polynomial<F>, S: Cryptographic
                 values,
                 &proof,
                 challenge_generator,
-                Some(rng),
+                rng.as_mut(),
             )?;
             end_timer!(proof_time);
         }
@@ -341,7 +341,7 @@ pub trait PolynomialCommitment<F: PrimeField, P: Polynomial<F>, S: Cryptographic
         eqn_evaluations: &Evaluations<P::Point, F>,
         proof: &BatchLCProof<F, Self::BatchProof>,
         challenge_generator: &mut ChallengeGenerator<F, S>,
-        rng: &mut R,
+        rng: Option<&mut R>,
     ) -> Result<bool, Self::Error>
     where
         Self::Commitment: 'a,
@@ -638,7 +638,7 @@ pub mod tests {
                     &values,
                     &proof,
                     &mut (challenge_gen.clone()),
-                    rng,
+                    Some(rng),
                 )?;
                 assert!(result, "proof was incorrect, Query set: {:#?}", query_set);
             }
@@ -774,7 +774,7 @@ pub mod tests {
                     &values,
                     &proof,
                     &mut (challenge_gen.clone()),
-                    rng,
+                    Some(rng),
                 )?;
                 if !result {
                     println!(
@@ -955,7 +955,7 @@ pub mod tests {
                     &values,
                     &proof,
                     &mut (challenge_gen.clone()),
-                    rng,
+                    Some(rng),
                 )?;
                 if !result {
                     println!(