zs_root -> zs_partial_products_root

This commit is contained in:
wborgeaud 2021-07-15 10:59:53 +02:00
parent a6bc83217b
commit 4bc06deed8
6 changed files with 14 additions and 11 deletions

View File

@ -165,7 +165,7 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
// - one for polynomials opened at `x` and `g x`
// - one for polynomials opened at `x` and `x.frobenius()`
// Polynomials opened at `x`, i.e., the constants, sigmas and quotient polynomials.
// Polynomials opened at `x`, i.e., the constants, sigmas, quotient and partial products polynomials.
let single_evals = [
PlonkPolynomials::CONSTANTS_SIGMAS,
PlonkPolynomials::QUOTIENT,

View File

@ -163,7 +163,7 @@ fn fri_combine_initial<F: Field + Extendable<D>, const D: usize>(
// - one for Zs, which are opened at `x` and `g x`
// - one for wire polynomials, which are opened at `x` and `x.frobenius()`
// Polynomials opened at `x`, i.e., the constants, sigmas and quotient polynomials.
// Polynomials opened at `x`, i.e., the constants, sigmas, quotient and partial products polynomials.
let single_evals = [
PlonkPolynomials::CONSTANTS_SIGMAS,
PlonkPolynomials::QUOTIENT,

View File

@ -66,7 +66,7 @@ pub struct Proof<F: Extendable<D>, const D: usize> {
/// Merkle root of LDEs of wire values.
pub wires_root: Hash<F>,
/// Merkle root of LDEs of Z, in the context of Plonk's permutation argument.
pub plonk_zs_root: Hash<F>,
pub plonk_zs_partial_products_root: Hash<F>,
/// Merkle root of LDEs of the quotient polynomial components.
pub quotient_polys_root: Hash<F>,
/// Purported values of each polynomial at the challenge point.
@ -77,7 +77,7 @@ pub struct Proof<F: Extendable<D>, const D: usize> {
pub struct ProofTarget<const D: usize> {
pub wires_root: HashTarget,
pub plonk_zs_root: HashTarget,
pub plonk_zs_partial_products_root: HashTarget,
pub quotient_polys_root: HashTarget,
pub openings: OpeningSetTarget<D>,
pub opening_proof: OpeningProofTarget<D>,

View File

@ -180,7 +180,7 @@ pub(crate) fn prove<F: Extendable<D>, const D: usize>(
Proof {
wires_root: wires_commitment.merkle_tree.root,
plonk_zs_root: zs_partial_products_commitment.merkle_tree.root,
plonk_zs_partial_products_root: zs_partial_products_commitment.merkle_tree.root,
quotient_polys_root: quotient_polys_commitment.merkle_tree.root,
openings,
opening_proof,

View File

@ -36,7 +36,7 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
let betas = challenger.get_n_challenges(self, num_challenges);
let gammas = challenger.get_n_challenges(self, num_challenges);
challenger.observe_hash(&proof.plonk_zs_root);
challenger.observe_hash(&proof.plonk_zs_partial_products_root);
let alphas = challenger.get_n_challenges(self, num_challenges);
challenger.observe_hash(&proof.quotient_polys_root);
@ -93,7 +93,7 @@ impl<F: Extendable<D>, const D: usize> CircuitBuilder<F, D> {
let merkle_roots = &[
inner_verifier_data.constants_sigmas_root,
proof.wires_root,
proof.plonk_zs_root,
proof.plonk_zs_partial_products_root,
proof.quotient_polys_root,
];
@ -201,7 +201,7 @@ mod tests {
ProofTarget {
wires_root,
plonk_zs_root,
plonk_zs_partial_products_root: plonk_zs_root,
quotient_polys_root,
openings,
opening_proof,
@ -215,7 +215,10 @@ mod tests {
pw: &mut PartialWitness<F>,
) {
pw.set_hash_target(pt.wires_root, proof.wires_root);
pw.set_hash_target(pt.plonk_zs_root, proof.plonk_zs_root);
pw.set_hash_target(
pt.plonk_zs_partial_products_root,
proof.plonk_zs_partial_products_root,
);
pw.set_hash_target(pt.quotient_polys_root, proof.quotient_polys_root);
for (&t, &x) in pt.openings.wires.iter().zip(&proof.openings.wires) {

View File

@ -26,7 +26,7 @@ pub(crate) fn verify<F: Extendable<D>, const D: usize>(
let betas = challenger.get_n_challenges(num_challenges);
let gammas = challenger.get_n_challenges(num_challenges);
challenger.observe_hash(&proof.plonk_zs_root);
challenger.observe_hash(&proof.plonk_zs_partial_products_root);
let alphas = challenger.get_n_challenges(num_challenges);
challenger.observe_hash(&proof.quotient_polys_root);
@ -78,7 +78,7 @@ pub(crate) fn verify<F: Extendable<D>, const D: usize>(
let merkle_roots = &[
verifier_data.constants_sigmas_root,
proof.wires_root,
proof.plonk_zs_root,
proof.plonk_zs_partial_products_root,
proof.quotient_polys_root,
];