Integrate arkworks patch for deserializing group elements

.github/workflows/ci.yml

@@ -37,7 +37,9 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with: 
+          lfs: 'true'
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: stable

Cargo.toml

@@ -59,13 +59,13 @@ ark-crypto-primitives = { git = "https://github.com/arkworks-rs/crypto-primitive
 
 ark-r1cs-std = { git = "https://github.com/arkworks-rs/r1cs-std/", rev = "2ca3bd7" }
 
-ark-ff = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
-ark-ec = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
-ark-serialize = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
-ark-poly = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
-ark-test-curves = { git = "https://github.com/arkworks-rs/algebra/", rev = "c92be0e" }
+ark-ff = { git = "https://github.com/arkworks-rs/algebra/", rev = "2a80c54" }
+ark-ec = { git = "https://github.com/arkworks-rs/algebra/", rev = "2a80c54" }
+ark-serialize = { git = "https://github.com/arkworks-rs/algebra/", rev = "2a80c54" }
+ark-poly = { git = "https://github.com/arkworks-rs/algebra/", rev = "2a80c54" }
+ark-test-curves = { git = "https://github.com/arkworks-rs/algebra/", rev = "2a80c54" }
 
-ark-poly-commit = { git = "https://github.com/arkworks-rs/poly-commit/", rev = "c724fa6" }
+ark-poly-commit = { git = "https://github.com/arkworks-rs/poly-commit/", rev = "12f5529" }
 
 # note bls is using a different commit from the other curves
 ark-bn254 = { git = "https://github.com/arkworks-rs/curves/", rev = "8c0256a" }

prover/src/srs.rs

@@ -10,9 +10,9 @@ pub fn load_srs(file: &str) -> Result<SRS, ProofError> {
     let f = File::open(file)?;
     let mut dec = Decoder::new(&f)?;
     // The `unchecked` here refers to a check that the point is in the correct
-    // prime-order subgroup of the curve group: this is automatic for the 
+    // prime-order subgroup of the curve group: this is automatic for the
     // `bn254` and `grumpkin` curves, which are prime order (as is always the)
-    // case for a cycle of curves). 
+    // case for a cycle of curves).
     let srs = SRS::deserialize_compressed_unchecked(&mut dec)?;
     Ok(srs)
 }

spartan/src/polycommitments/zeromorph/mod.rs

@@ -1,14 +1,13 @@
-use ark_ec::{pairing::Pairing, scalar_mul::fixed_base::FixedBase, AffineRepr, CurveGroup};
-use ark_ff::PrimeField;
+use ark_ec::{pairing::Pairing, scalar_mul::ScalarMul, AffineRepr, CurveGroup};
 use ark_poly::{univariate::DensePolynomial as DenseUnivarPolynomial, DenseUVPolynomial};
 use ark_poly_commit::{
   error::Error,
   kzg10::{Commitment as KZGCommitment, KZG10},
   PCUniversalParams,
 };
 use ark_std::{
-  collections::BTreeMap, end_timer, marker::PhantomData, ops::Mul, rand::RngCore, start_timer,
-  vec::Vec, One, UniformRand, Zero,
+  end_timer, marker::PhantomData, ops::Mul, rand::RngCore, start_timer, vec::Vec, One, UniformRand,
+  Zero,
 };
 use merlin::Transcript;
 
@@ -277,43 +276,31 @@ where
       let beta = E::ScalarField::rand(rng);
       let g = E::G1::rand(rng);
       let h = E::G2::rand(rng);
+
+      // powers_of_beta = [1, b, ..., b^(max_degree + 1)], len = max_degree + 2
       let mut powers_of_beta = vec![E::ScalarField::one()];
 
       let mut cur = beta;
-      for _ in 0..max_degree {
+      for _ in 0..=max_degree {
         powers_of_beta.push(cur);
         cur *= β
       }
 
-      let window_size = FixedBase::get_mul_window_size(max_degree + 1);
-
-      let scalar_bits = E::ScalarField::MODULUS_BIT_SIZE as usize;
       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::G1>(scalar_bits, window_size, &g_table, &powers_of_beta);
+      let powers_of_g = g.batch_mul(&powers_of_beta[0..max_degree + 1]);
       end_timer!(g_time);
 
-      let powers_of_g = E::G1::normalize_batch(&powers_of_g);
-
       let powers_of_h_time = start_timer!(|| "Generating powers of h in G2");
       let shift_powers_of_tau_h = {
         let mut shift_powers_of_beta = vec![powers_of_beta[max_degree] * beta];
         for n in 1..=max_num_poly_vars {
           // powers_of_beta[k] = beta^k and N_max = max_degree + 1; we want shift_powers_of_beta[n] = beta^(N_max - 2^n + 1)
           shift_powers_of_beta.push(powers_of_beta[max_degree + 1 - Math::pow2(n) + 1]);
         }
-        let window_size = FixedBase::get_mul_window_size(max_num_poly_vars + 1);
-        let h_table = FixedBase::get_window_table(scalar_bits, window_size, h);
-        let powers_of_h =
-          FixedBase::msm::<E::G2>(scalar_bits, window_size, &h_table, &shift_powers_of_beta);
-
-        let affines = E::G2::normalize_batch(&powers_of_h);
-        let mut affines_map = BTreeMap::new();
-        affines.into_iter().enumerate().for_each(|(i, a)| {
-          affines_map.insert(i, a);
-        });
-        affines_map
+        h.batch_mul(&shift_powers_of_beta)
+          .into_iter()
+          .enumerate()
+          .collect()
       };
 
       end_timer!(powers_of_h_time);

supernova/src/ml_sumcheck/data_structures.rs

@@ -4,7 +4,7 @@ use std::collections::HashMap;
 
 use ark_crypto_primitives::sponge::Absorb;
 use ark_ff::{Field, PrimeField};
-use ark_poly::{DenseMultilinearExtension, MultilinearExtension};
+use ark_poly::{DenseMultilinearExtension, MultilinearExtension, Polynomial};
 use ark_serialize::{CanonicalDeserialize, CanonicalSerialize};
 use ark_std::{cmp::max, rc::Rc};
 
@@ -118,7 +118,7 @@ impl<F: Field> ListOfProductsOfPolynomials<F> {
             .map(|(c, p)| {
                 *c * p
                     .iter()
-                    .map(|&i| self.flattened_ml_extensions[i].evaluate(point).unwrap())
+                    .map(|&i| self.flattened_ml_extensions[i].evaluate(&point.to_vec()))
                     .product::<F>()
             })
             .sum()