Some renaming

src/fri/recursive_verifier.rs

@@ -183,7 +183,7 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 
         // Polynomials opened at `x` and `g x`, i.e., the Zs polynomials.
         let zs_evals = proof
-            .unsalted_evals(PlonkPolynomials::ZS)
+            .unsalted_evals(PlonkPolynomials::ZS_PARTIAL_PRODUCTS)
             .iter()
             .map(|&e| self.convert_to_ext(e))
             .collect::<Vec<_>>();

src/fri/verifier.rs

@@ -185,7 +185,7 @@ fn fri_combine_initial<F: Field + Extendable<D>, const D: usize>(
 
     // Polynomials opened at `x` and `g x`, i.e., the Zs polynomials.
     let zs_evals = proof
-        .unsalted_evals(PlonkPolynomials::ZS)
+        .unsalted_evals(PlonkPolynomials::ZS_PARTIAL_PRODUCTS)
         .iter()
         .map(|&e| F::Extension::from_basefield(e));
     let zs_composition_eval = alpha.clone().reduce(zs_evals);

src/plonk_challenger.rs

@@ -72,6 +72,7 @@ impl<F: Field> Challenger<F> {
             wires,
             plonk_zs,
             plonk_zs_right,
+            partial_products,
             quotient_polys,
         } = os;
         for v in &[
@@ -80,6 +81,7 @@ impl<F: Field> Challenger<F> {
             wires,
             plonk_zs,
             plonk_zs_right,
+            partial_products,
             quotient_polys,
         ] {
             self.observe_extension_elements(v);

src/plonk_common.rs

@@ -38,7 +38,7 @@ impl PlonkPolynomials {
         index: 1,
         blinding: true,
     };
-    pub const ZS: PolynomialsIndexBlinding = PolynomialsIndexBlinding {
+    pub const ZS_PARTIAL_PRODUCTS: PolynomialsIndexBlinding = PolynomialsIndexBlinding {
         index: 2,
         blinding: true,
     };
@@ -51,7 +51,7 @@ impl PlonkPolynomials {
         match i {
             0 => Self::CONSTANTS_SIGMAS,
             1 => Self::WIRES,
-            2 => Self::ZS,
+            2 => Self::ZS_PARTIAL_PRODUCTS,
             3 => Self::QUOTIENT,
             _ => panic!("There are only 4 sets of polynomials in Plonk."),
         }

src/polynomial/commitment.rs

@@ -162,7 +162,7 @@ impl<F: Field> ListPolynomialCommitment<F> {
         alpha.reset();
 
         // Zs polynomials are opened at `zeta` and `g*zeta`.
-        let zs_polys = commitments[PlonkPolynomials::ZS.index]
+        let zs_polys = commitments[PlonkPolynomials::ZS_PARTIAL_PRODUCTS.index]
             .polynomials
             .iter()
             .map(|p| p.to_extension());

src/proof.rs

@@ -154,6 +154,7 @@ pub struct OpeningSet<F: Field + Extendable<D>, const D: usize> {
     pub wires: Vec<F::Extension>,
     pub plonk_zs: Vec<F::Extension>,
     pub plonk_zs_right: Vec<F::Extension>,
+    pub partial_products: Vec<F::Extension>,
     pub quotient_polys: Vec<F::Extension>,
 }
 
@@ -163,7 +164,7 @@ impl<F: Field + Extendable<D>, const D: usize> OpeningSet<F, D> {
         g: F::Extension,
         constants_sigmas_commitment: &ListPolynomialCommitment<F>,
         wires_commitment: &ListPolynomialCommitment<F>,
-        plonk_zs_commitment: &ListPolynomialCommitment<F>,
+        zs_partial_products_commitment: &ListPolynomialCommitment<F>,
         quotient_polys_commitment: &ListPolynomialCommitment<F>,
         common_data: &CommonCircuitData<F, D>,
     ) -> Self {
@@ -174,12 +175,17 @@ impl<F: Field + Extendable<D>, const D: usize> OpeningSet<F, D> {
                 .collect::<Vec<_>>()
         };
         let constants_sigmas_eval = eval_commitment(z, constants_sigmas_commitment);
+        let zs_partial_products_eval = eval_commitment(z, zs_partial_products_commitment);
         Self {
             constants: constants_sigmas_eval[common_data.constants_range()].to_vec(),
             plonk_s_sigmas: constants_sigmas_eval[common_data.sigmas_range()].to_vec(),
             wires: eval_commitment(z, wires_commitment),
-            plonk_zs: eval_commitment(z, plonk_zs_commitment),
-            plonk_zs_right: eval_commitment(g * z, plonk_zs_commitment),
+            plonk_zs: zs_partial_products_eval[common_data.zs_range()].to_vec(),
+            plonk_zs_right: eval_commitment(g * z, zs_partial_products_commitment)
+                [common_data.zs_range()]
+            .to_vec(),
+            partial_products: zs_partial_products_eval[common_data.partial_products_range()]
+                .to_vec(),
             quotient_polys: eval_commitment(z, quotient_polys_commitment),
         }
     }

src/prover.rs

@@ -98,7 +98,7 @@ pub(crate) fn prove<F: Extendable<D>, const D: usize>(
         ListPolynomialCommitment::new(
             zs_partial_products,
             fri_config.rate_bits,
-            PlonkPolynomials::ZS.blinding
+            PlonkPolynomials::ZS_PARTIAL_PRODUCTS.blinding
         ),
         "to commit to Z's"
     );