Qortal/pirate-librustzcash
3
0
Fork 0
mirror of https://github.com/Qortal/pirate-librustzcash.git synced 2025-01-30 15:32:14 +00:00
Code Issues Projects Releases Wiki Activity

Move cmu and epk parsing onto CompactOutput struct

Browse Source
This commit is contained in:
Jack Grigg 2019-08-26 11:59:07 +01:00
parent 789e2ff216
commit 8cd6666e56
No known key found for this signature in database
GPG Key ID: 9E8255172BBF9898
2 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
zcash_client_backend/src/proto/mod.rs
View File

@ -1,6 +1,12 @@
//! Generated code for handling light client protobuf structs.
use zcash_primitives::block::{BlockHash, BlockHeader};
use ff::{PrimeField, PrimeFieldRepr};
use pairing::bls12_381::{Bls12, Fr, FrRepr};
use zcash_primitives::{
block::{BlockHash, BlockHeader},
jubjub::{edwards, PrimeOrder},
JUBJUB,
};
pub mod compact_formats;
@ -52,3 +58,26 @@ impl compact_formats::CompactBlock {
}
}
}
impl compact_formats::CompactOutput {
/// Returns the note commitment for this output.
///
/// A convenience method that parses [`CompactOutput.cmu`].
///
/// [`CompactOutput.cmu`]: #structfield.cmu
pub fn cmu(&self) -> Result<Fr, ()> {
let mut repr = FrRepr::default();
repr.read_le(&self.cmu[..]).map_err(|_| ())?;
Fr::from_repr(repr).map_err(|_| ())
}
/// Returns the ephemeral public key for this output.
///
/// A convenience method that parses [`CompactOutput.epk`].
///
/// [`CompactOutput.epk`]: #structfield.epk
pub fn epk(&self) -> Result<edwards::Point<Bls12, PrimeOrder>, ()> {
let p = edwards::Point::<Bls12, _>::read(&self.epk[..], &JUBJUB).map_err(|_| ())?;
p.as_prime_order(&JUBJUB).ok_or(())
}
}

25
zcash_client_backend/src/welding_rig.rs
View File

@ -1,17 +1,15 @@
//! Tools for scanning a compact representation of the Zcash block chain.
use ff::{PrimeField, PrimeFieldRepr};
use pairing::bls12_381::{Bls12, Fr, FrRepr};
use ff::PrimeField;
use std::collections::HashSet;
use subtle::{ConditionallySelectable, ConstantTimeEq, CtOption};
use zcash_primitives::{
jubjub::{edwards, fs::Fs},
jubjub::fs::Fs,
merkle_tree::{CommitmentTree, IncrementalWitness},
note_encryption::try_sapling_compact_note_decryption,
sapling::Node,
transaction::TxId,
zip32::ExtendedFullViewingKey,
JUBJUB,
};
use crate::proto::compact_formats::{CompactBlock, CompactOutput};
@ -33,23 +31,8 @@ fn scan_output(
block_witnesses: &mut [&mut IncrementalWitness<Node>],
new_witnesses: &mut [IncrementalWitness<Node>],
) -> Option<(WalletShieldedOutput, IncrementalWitness<Node>)> {
let mut repr = FrRepr::default();
if repr.read_le(&output.cmu[..]).is_err() {
return None;
}
let cmu = match Fr::from_repr(repr) {
Ok(cmu) => cmu,
Err(_) => return None,
};
let epk = match edwards::Point::<Bls12, _>::read(&output.epk[..], &JUBJUB) {
Ok(p) => match p.as_prime_order(&JUBJUB) {
Some(epk) => epk,
None => return None,
},
Err(_) => return None,
};
let cmu = output.cmu().ok()?;
let epk = output.epk().ok()?;
let ct = output.ciphertext;
// Increment tree and witnesses