zec
/
halo2
mirror of https://github.com/zcash/halo2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

permutation: Clean up opening chains

This commit is contained in:
Jack Grigg 2020-12-01 22:09:50 +00:00
parent dd3d1dd68b
commit 3d6afd7b8e
2 changed files with 30 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/plonk/permutation/prover.rs
View File

@ -348,18 +348,28 @@ impl<C: CurveAffine> Evaluated<C> {
let x_inv = pk.vk.domain.rotate_omega(*x, Rotation(-1));
iter::empty()
// Open permutation product commitments at x
// Open permutation product commitments at x and \omega^{-1} x
.chain(
self.constructed
.permutation_product_polys
.iter()
.zip(self.constructed.permutation_product_blinds.iter())
.zip(self.permutation_product_evals.iter())
.map(move |((poly, blind), eval)| ProverQuery {
point: *x,
poly,
blind: *blind,
eval: *eval,
.zip(self.permutation_product_inv_evals.iter())
.flat_map(move |(((poly, blind), eval), inv_eval)| {
iter::empty()
.chain(Some(ProverQuery {
point: *x,
poly,
blind: *blind,
eval: *eval,
}))
.chain(Some(ProverQuery {
point: x_inv,
poly,
blind: *blind,
eval: *inv_eval,
}))
}),
)
// Open permutation polynomial commitments at x
@ -369,20 +379,6 @@ impl<C: CurveAffine> Evaluated<C> {
.zip(self.permutation_evals.iter())
.flat_map(move |(permutation, evals)| permutation.open(evals, x)),
)
// Open permutation product commitments at \omega^{-1} x
.chain(
self.constructed
.permutation_product_polys
.iter()
.zip(self.constructed.permutation_product_blinds.iter())
.zip(self.permutation_product_inv_evals.iter())
.map(move |((poly, blind), eval)| ProverQuery {
point: x_inv,
poly,
blind: *blind,
eval: *eval,
}),
)
}
pub(crate) fn build(self) -> Proof<C> {

31
src/plonk/permutation/verifier.rs
View File

@ -117,16 +117,25 @@ impl<C: CurveAffine> Proof<C> {
let x_inv = vk.domain.rotate_omega(*x, Rotation(-1));
iter::empty()
// Open permutation product commitments at x
// Open permutation product commitments at x and \omega^{-1} x
.chain(
self.permutation_product_commitments
.iter()
.enumerate()
.zip(self.permutation_product_evals.iter())
.map(move |((idx, _), &eval)| VerifierQuery {
point: *x,
commitment: &self.permutation_product_commitments[idx],
eval,
.zip(self.permutation_product_inv_evals.iter())
.flat_map(move |(((idx, _), &eval), &inv_eval)| {
iter::empty()
.chain(Some(VerifierQuery {
point: *x,
commitment: &self.permutation_product_commitments[idx],
eval,
}))
.chain(Some(VerifierQuery {
point: x_inv,
commitment: &self.permutation_product_commitments[idx],
eval: inv_eval,
}))
}),
)
// Open permutation commitments for each permutation argument at x
@ -142,17 +151,5 @@ impl<C: CurveAffine> Proof<C> {
})
.flatten(),
)
// Open permutation product commitments at \omega^{-1} x
.chain(
self.permutation_product_commitments
.iter()
.enumerate()
.zip(self.permutation_product_inv_evals.iter())
.map(move |((idx, _), &eval)| VerifierQuery {
point: x_inv,
commitment: &self.permutation_product_commitments[idx],
eval,
}),
)
}
}