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

update orchard for zebra-consensus (#8529)

This commit is contained in:
Alfredo Garcia 2024-05-18 16:59:08 -03:00 committed by GitHub
parent 1484d3de70
commit e0da45bc1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock
View File

@ -6067,7 +6067,7 @@ dependencies = [
"metrics 0.22.3", "metrics 0.22.3",
"num-integer", "num-integer",
"once_cell", "once_cell",
"orchard 0.6.0", "orchard 0.7.1",
"proptest", "proptest",
"proptest-derive", "proptest-derive",
"rand 0.8.5", "rand 0.8.5",

2
zebra-consensus/Cargo.toml
View File

@ -58,7 +58,7 @@ tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
tracing = "0.1.39" tracing = "0.1.39"
tracing-futures = "0.2.5" tracing-futures = "0.2.5"
orchard = "0.6.0" orchard = "0.7.0"
zcash_proofs = { version = "0.13.0-rc.1", features = ["multicore" ] } zcash_proofs = { version = "0.13.0-rc.1", features = ["multicore" ] }
wagyu-zcash-parameters = "0.2.0" wagyu-zcash-parameters = "0.2.0"

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

@ -7,7 +7,7 @@ use tower::ServiceExt;
use halo2::pasta::{group::ff::PrimeField, pallas}; use halo2::pasta::{group::ff::PrimeField, pallas};
use orchard::{ use orchard::{
builder::Builder, builder::{Builder, BundleType},
bundle::Flags, bundle::Flags,
circuit::ProvingKey, circuit::ProvingKey,
keys::{FullViewingKey, Scope, SpendingKey}, keys::{FullViewingKey, Scope, SpendingKey},
@ -32,8 +32,6 @@ fn generate_test_vectors() {
let sk = SpendingKey::from_bytes([7; 32]).unwrap(); let sk = SpendingKey::from_bytes([7; 32]).unwrap();
let recipient = FullViewingKey::from(&sk).address_at(0u32, Scope::External); let recipient = FullViewingKey::from(&sk).address_at(0u32, Scope::External);
let enable_spends = true;
let enable_outputs = true;
let flags = let flags =
zebra_chain::orchard::Flags::ENABLE_SPENDS | zebra_chain::orchard::Flags::ENABLE_OUTPUTS; zebra_chain::orchard::Flags::ENABLE_SPENDS | zebra_chain::orchard::Flags::ENABLE_OUTPUTS;
@ -43,17 +41,20 @@ fn generate_test_vectors() {
let shielded_data: Vec<zebra_chain::orchard::ShieldedData> = (1..=4) let shielded_data: Vec<zebra_chain::orchard::ShieldedData> = (1..=4)
.map(|num_recipients| { .map(|num_recipients| {
let mut builder = Builder::new( let mut builder = Builder::new(
Flags::from_parts(enable_spends, enable_outputs), BundleType::Transactional {
flags: Flags::from_byte(flags.bits()).unwrap(),
bundle_required: true,
},
Anchor::from_bytes(anchor_bytes).unwrap(), Anchor::from_bytes(anchor_bytes).unwrap(),
); );
for _ in 0..num_recipients { for _ in 0..num_recipients {
builder builder
.add_recipient(None, recipient, NoteValue::from_raw(note_value), None) .add_output(None, recipient, NoteValue::from_raw(note_value), None)
.unwrap(); .unwrap();
} }
let bundle: Bundle<_, i64> = builder.build(rng).unwrap(); let bundle: Bundle<_, i64> = builder.build(rng).unwrap().unwrap().0;
let bundle = bundle let bundle = bundle
.create_proof(&proving_key, rng) .create_proof(&proving_key, rng)