zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Verify Halo2 proofs as part of V5 transaction verification (#3039)

This commit is contained in:
Deirdre Connolly 2021-11-17 00:54:14 -05:00 committed by GitHub
parent eda83ebe0e
commit 7218b4ffa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra-consensus/src/primitives/halo2.rs
View File

@ -75,8 +75,8 @@ impl BatchVerifier {
// === END TEMPORARY BATCH HALO2 SUBSTITUTE === // === END TEMPORARY BATCH HALO2 SUBSTITUTE ===
impl From<zebra_chain::orchard::ShieldedData> for Item { impl From<&zebra_chain::orchard::ShieldedData> for Item {
fn from(shielded_data: zebra_chain::orchard::ShieldedData) -> Item { fn from(shielded_data: &zebra_chain::orchard::ShieldedData) -> Item {
use orchard::{circuit, note, primitives::redpallas, tree, value}; use orchard::{circuit, note, primitives::redpallas, tree, value};
let anchor = tree::Anchor::from_bytes(shielded_data.shared_anchor.into()).unwrap(); let anchor = tree::Anchor::from_bytes(shielded_data.shared_anchor.into()).unwrap();
@ -108,7 +108,7 @@ impl From<zebra_chain::orchard::ShieldedData> for Item {
Item { Item {
instances, instances,
proof: orchard::circuit::Proof::new(shielded_data.proof.0), proof: orchard::circuit::Proof::new(shielded_data.proof.0.clone()),
} }
} }
} }

4
zebra-consensus/src/primitives/halo2/tests.rs
View File

@ -117,7 +117,7 @@ where
for sd in shielded_data { for sd in shielded_data {
tracing::trace!(?sd); tracing::trace!(?sd);
let rsp = verifier.ready().await?.call(Item::from(sd)); let rsp = verifier.ready().await?.call(Item::from(&sd));
async_checks.push(rsp); async_checks.push(rsp);
} }
@ -183,7 +183,7 @@ where
tracing::trace!(?sd); tracing::trace!(?sd);
let rsp = verifier.ready().await?.call(Item::from(sd)); let rsp = verifier.ready().await?.call(Item::from(&sd));
async_checks.push(rsp); async_checks.push(rsp);
} }

16
zebra-consensus/src/transaction.rs
View File

@ -737,6 +737,22 @@ where
if let Some(orchard_shielded_data) = orchard_shielded_data { if let Some(orchard_shielded_data) = orchard_shielded_data {
for authorized_action in orchard_shielded_data.actions.iter().cloned() { for authorized_action in orchard_shielded_data.actions.iter().cloned() {
let (action, spend_auth_sig) = authorized_action.into_parts(); let (action, spend_auth_sig) = authorized_action.into_parts();
// Consensus rule: The proof 𝜋 MUST be valid given a primary
// input (cv, rtOrchard, nf, rk, cm𝑥, enableSpends, enableOutputs)
//
// https://zips.z.cash/protocol/protocol.pdf#actiondesc
//
// Queue the verification of the Halo2 proof for each Action
// description while adding the resulting future to our
// collection of async checks that (at a minimum) must pass for
// the transaction to verify.
async_checks.push(
primitives::halo2::VERIFIER
.clone()
.oneshot(primitives::halo2::Item::from(orchard_shielded_data)),
);
// Consensus rule: The spend authorization signature // Consensus rule: The spend authorization signature
// MUST be a valid SpendAuthSig signature over // MUST be a valid SpendAuthSig signature over
// SigHash using rk as the validating key. // SigHash using rk as the validating key.