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

Remove query allocations from Proof::verify 

multiopen::Proof::verify takes `queries: IntoIterator`, so we can just
pass it an iterator directly.
This commit is contained in:
Jack Grigg 2020-10-21 17:10:57 +01:00
parent 7f29ab913d
commit 6360da1f4e
1 changed files with 91 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

179
src/plonk/verifier.rs
View File

@ -1,3 +1,5 @@
use std::iter;
use super::{Error, Proof, VerifyingKey}; use super::{Error, Proof, VerifyingKey};
use crate::arithmetic::{get_challenge_scalar, Challenge, CurveAffine, Field}; use crate::arithmetic::{get_challenge_scalar, Challenge, CurveAffine, Field};
use crate::poly::{ use crate::poly::{
@ -69,6 +71,7 @@ impl<'a, C: CurveAffine> Proof<C> {
// Sample x_3 challenge, which is used to ensure the circuit is // Sample x_3 challenge, which is used to ensure the circuit is
// satisfied with high probability. // satisfied with high probability.
let x_3: C::Scalar = get_challenge_scalar(Challenge(transcript.squeeze().get_lower_128())); let x_3: C::Scalar = get_challenge_scalar(Challenge(transcript.squeeze().get_lower_128()));
let x_3_inv = vk.domain.rotate_omega(x_3, Rotation(-1));
// This check ensures the circuit is satisfied so long as the polynomial // This check ensures the circuit is satisfied so long as the polynomial
// commitments open to the correct values. // commitments open to the correct values.
@ -87,100 +90,100 @@ impl<'a, C: CurveAffine> Proof<C> {
transcript.absorb_scalar(*eval); transcript.absorb_scalar(*eval);
} }
let mut queries: Vec<VerifierQuery<'a, C>> = Vec::new(); let queries =
iter::empty()
for (query_index, &(column, at)) in vk.cs.advice_queries.iter().enumerate() { .chain(vk.cs.advice_queries.iter().enumerate().map(
let point = vk.domain.rotate_omega(x_3, at); |(query_index, &(column, at))| VerifierQuery {
queries.push(VerifierQuery { point: vk.domain.rotate_omega(x_3, at),
point, commitment: &self.advice_commitments[column.index()],
commitment: &self.advice_commitments[column.index()], eval: self.advice_evals[query_index],
eval: self.advice_evals[query_index], },
}); ))
} .chain(
vk.cs
for (query_index, &(column, at)) in vk.cs.aux_queries.iter().enumerate() { .aux_queries
let point = vk.domain.rotate_omega(x_3, at); .iter()
queries.push(VerifierQuery { .enumerate()
point, .map(|(query_index, &(column, at))| VerifierQuery {
commitment: &aux_commitments[column.index()], point: vk.domain.rotate_omega(x_3, at),
eval: self.aux_evals[query_index], commitment: &aux_commitments[column.index()],
}); eval: self.aux_evals[query_index],
} }),
)
for (query_index, &(column, at)) in vk.cs.fixed_queries.iter().enumerate() { .chain(vk.cs.fixed_queries.iter().enumerate().map(
let point = vk.domain.rotate_omega(x_3, at); |(query_index, &(column, at))| VerifierQuery {
queries.push(VerifierQuery { point: vk.domain.rotate_omega(x_3, at),
point, commitment: &vk.fixed_commitments[column.index()],
commitment: &vk.fixed_commitments[column.index()], eval: self.fixed_evals[query_index],
eval: self.fixed_evals[query_index], },
}); ))
} .chain(
self.h_commitments
for ((idx, _), &eval) in self .iter()
.h_commitments .enumerate()
.iter() .zip(self.h_evals.iter())
.enumerate() .map(|((idx, _), &eval)| VerifierQuery {
.zip(self.h_evals.iter()) point: x_3,
{ commitment: &self.h_commitments[idx],
let commitment = &self.h_commitments[idx]; eval,
queries.push(VerifierQuery { }),
point: x_3, );
commitment,
eval,
});
}
// Handle permutation arguments, if any exist // Handle permutation arguments, if any exist
if !vk.cs.permutations.is_empty() { let permutation_queries = if !vk.cs.permutations.is_empty() {
// Open permutation product commitments at x_3 Some(
for ((idx, _), &eval) in self iter::empty()
.permutation_product_commitments // Open permutation product commitments at x_3
.iter() .chain(
.enumerate() self.permutation_product_commitments
.zip(self.permutation_product_evals.iter()) .iter()
{ .enumerate()
let commitment = &self.permutation_product_commitments[idx]; .zip(self.permutation_product_evals.iter())
queries.push(VerifierQuery { .map(|((idx, _), &eval)| VerifierQuery {
point: x_3, point: x_3,
commitment, commitment: &self.permutation_product_commitments[idx],
eval, eval,
}); }),
} )
// Open permutation commitments for each permutation argument at x_3 // Open permutation commitments for each permutation argument at x_3
for outer_idx in 0..vk.permutation_commitments.len() { .chain(
let inner_len = vk.permutation_commitments[outer_idx].len(); (0..vk.permutation_commitments.len())
for inner_idx in 0..inner_len { .map(|outer_idx| {
let commitment = &vk.permutation_commitments[outer_idx][inner_idx]; let inner_len = vk.permutation_commitments[outer_idx].len();
let eval = self.permutation_evals[outer_idx][inner_idx]; (0..inner_len).map(move |inner_idx| VerifierQuery {
queries.push(VerifierQuery { point: x_3,
point: x_3, commitment: &vk.permutation_commitments[outer_idx][inner_idx],
commitment, eval: self.permutation_evals[outer_idx][inner_idx],
eval, })
}); })
} .flatten(),
} )
// Open permutation product commitments at \omega^{-1} x_3
// Open permutation product commitments at \omega^{-1} x_3 .chain(
let x_3_inv = vk.domain.rotate_omega(x_3, Rotation(-1)); self.permutation_product_commitments
for ((idx, _), &eval) in self .iter()
.permutation_product_commitments .enumerate()
.iter() .zip(self.permutation_product_inv_evals.iter())
.enumerate() .map(|((idx, _), &eval)| VerifierQuery {
.zip(self.permutation_product_inv_evals.iter()) point: x_3_inv,
{ commitment: &self.permutation_product_commitments[idx],
let commitment = &self.permutation_product_commitments[idx]; eval,
queries.push(VerifierQuery { }),
point: x_3_inv, ),
commitment, )
eval, } else {
}); None
} };
}
// We are now convinced the circuit is satisfied so long as the // We are now convinced the circuit is satisfied so long as the
// polynomial commitments open to the correct values. // polynomial commitments open to the correct values.
self.multiopening self.multiopening
.verify(params, &mut transcript, queries, msm) .verify(
params,
&mut transcript,
queries.chain(permutation_queries.into_iter().flatten()),
msm,
)
.map_err(|_| Error::OpeningError) .map_err(|_| Error::OpeningError)
} }