Revert "refactor multilinear PCS opening" (#112)

This reverts commit f16db389e3.

subroutines/src/pcs/multilinear_kzg/mod.rs

@@ -209,10 +209,11 @@ impl PolynomialCommitmentScheme for MultilinearKzgPCS {
 /// same. This function does not need to take the evaluation value as an
 /// input.
 ///
-/// This function takes 2^{num_var} number of scalar multiplications over
+/// This function takes 2^{num_var +1} number of scalar multiplications over
 /// G1:
 /// - it proceeds with `num_var` number of rounds,
-/// - at round i, we compute an MSM for `2^{num_var - i}` number of G1 elements.
+/// - at round i, we compute an MSM for `2^{num_var - i + 1}` number of G2
+///   elements.
 fn open_internal<E: PairingEngine>(
     prover_param: &MultilinearProverParam<E>,
     polynomial: &DenseMultilinearExtension<E::Fr>,
@@ -236,34 +237,41 @@ fn open_internal(
     }
 
     let nv = polynomial.num_vars();
+    let ignored = prover_param.num_vars - nv;
+    let mut r: Vec<Vec<E::Fr>> = (0..nv + 1).map(|_| Vec::new()).collect();
+    let mut q: Vec<Vec<E::Fr>> = (0..nv + 1).map(|_| Vec::new()).collect();
 
-    let mut f = polynomial.to_evaluations();
+    r[nv] = polynomial.to_evaluations();
 
     let mut proofs = Vec::new();
 
     for (i, (&point_at_k, gi)) in point
         .iter()
-        .zip(prover_param.powers_of_g[1..nv + 1].iter())
+        .zip(prover_param.powers_of_g[ignored..].iter())
+        .take(nv)
         .enumerate()
     {
         let ith_round = start_timer!(|| format!("{}-th round", i));
 
-        let k = nv - 1 - i;
-        let cur_dim = 1 << k;
-        let mut q = vec![E::Fr::zero(); cur_dim];
-        let mut r = vec![E::Fr::zero(); cur_dim];
+        let k = nv - i;
+        let cur_dim = 1 << (k - 1);
+        let mut cur_q = vec![E::Fr::zero(); cur_dim];
+        let mut cur_r = vec![E::Fr::zero(); cur_dim];
+        let one_minus_point_at_k = E::Fr::one() - point_at_k;
 
         let ith_round_eval = start_timer!(|| format!("{}-th round eval", i));
-        for b in 0..(1 << k) {
-            // q[b] = f[1, b] - f[0, b]
-            q[b] = f[(b << 1) + 1] - f[b << 1];
+        for b in 0..(1 << (k - 1)) {
+            // q_b = pre_r [2^b + 1] - pre_r [2^b]
+            cur_q[b] = r[k][(b << 1) + 1] - r[k][b << 1];
 
-            // r[b] = f[0, b] + q[b] * p
-            r[b] = f[b << 1] + (q[b] * point_at_k);
+            // r_b = pre_r [2^b]*(1-p) + pre_r [2^b + 1] * p
+            cur_r[b] = r[k][b << 1] * one_minus_point_at_k + (r[k][(b << 1) + 1] * point_at_k);
         }
-        f = r;
         end_timer!(ith_round_eval);
-        let scalars: Vec<_> = q.iter().map(|x| x.into_repr()).collect();
+        let scalars: Vec<_> = (0..(1 << k)).map(|x| cur_q[x >> 1].into_repr()).collect();
+
+        q[k] = cur_q;
+        r[k - 1] = cur_r;
 
         // this is a MSM over G1 and is likely to be the bottleneck
         let msm_timer = start_timer!(|| format!("msm of size {} at round {}", gi.evals.len(), i));
@@ -301,6 +309,7 @@ fn verify_internal(
         )));
     }
 
+    let ignored = verifier_param.num_vars - num_var;
     let prepare_inputs_timer = start_timer!(|| "prepare pairing inputs");
 
     let scalar_size = E::Fr::size_in_bits();
@@ -315,7 +324,7 @@ fn verify_internal(
         FixedBaseMSM::multi_scalar_mul(scalar_size, window_size, &h_table, point);
 
     let h_vec: Vec<_> = (0..num_var)
-        .map(|i| verifier_param.h_mask[i].into_projective() - h_mul[i])
+        .map(|i| verifier_param.h_mask[ignored + i].into_projective() - h_mul[i])
         .collect();
     let h_vec: Vec<E::G2Affine> = E::G2Projective::batch_normalization_into_affine(&h_vec);
     end_timer!(prepare_inputs_timer);
@@ -361,7 +370,7 @@ mod tests {
     ) -> Result<(), PCSError> {
         let nv = poly.num_vars();
         assert_ne!(nv, 0);
-        let (ck, vk) = MultilinearKzgPCS::trim(params, None, Some(nv))?;
+        let (ck, vk) = MultilinearKzgPCS::trim(params, None, Some(nv + 1))?;
         let point: Vec<_> = (0..nv).map(|_| Fr::rand(rng)).collect();
         let com = MultilinearKzgPCS::commit(&ck, poly)?;
         let (proof, value) = MultilinearKzgPCS::open(&ck, poly, &point)?;

subroutines/src/pcs/multilinear_kzg/srs.rs

@@ -44,9 +44,8 @@ pub struct MultilinearUniversalParams {
 pub struct MultilinearProverParam<E: PairingEngine> {
     /// number of variables
     pub num_vars: usize,
-    /// `pp_{0}`, `pp_{1}`, ...,pp_{nu_vars} defined
-    /// by XZZPD19 where pp_{nv-0}=g and
-    /// pp_{nv-i}=g^{eq((t_1,..t_i),(X_1,..X_i))}
+    /// `pp_{num_vars}`, `pp_{num_vars - 1}`, `pp_{num_vars - 2}`, ..., defined
+    /// by XZZPD19
     pub powers_of_g: Vec<Evaluations<E::G1Affine>>,
     /// generator for G1
     pub g: E::G1Affine,
@@ -191,10 +190,6 @@ impl StructuredReferenceString for MultilinearUniversalPara
             powers_of_g.push(pp_k_g);
             start += size;
         }
-        let gg = Evaluations {
-            evals: [g.into_affine()].to_vec(),
-        };
-        powers_of_g.push(gg);
 
         let pp = Self::ProverParam {
             num_vars,
@@ -250,11 +245,7 @@ mod tests {
     fn test_srs_gen() -> Result<(), PCSError> {
         let mut rng = test_rng();
         for nv in 4..10 {
-            let params = MultilinearUniversalParams::<E>::gen_srs_for_testing(&mut rng, nv)?;
-            assert_eq!(
-                params.prover_param.g,
-                params.prover_param.powers_of_g[0].evals[0]
-            );
+            let _ = MultilinearUniversalParams::<E>::gen_srs_for_testing(&mut rng, nv)?;
         }
 
         Ok(())