mirror of
https://github.com/Qortal/pirate-librustzcash.git
synced 2025-02-01 08:12:14 +00:00
Increment the commitment tree and witnesses while scanning blocks
This commit is contained in:
parent
591b1fc28f
commit
f899ecfce5
@ -4,23 +4,31 @@ use ff::{PrimeField, PrimeFieldRepr};
|
||||
use pairing::bls12_381::{Bls12, Fr, FrRepr};
|
||||
use zcash_primitives::{
|
||||
jubjub::{edwards, 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, CompactTx};
|
||||
use crate::proto::compact_formats::{CompactBlock, CompactOutput};
|
||||
use crate::wallet::{EncCiphertextFrag, WalletShieldedOutput, WalletTx};
|
||||
|
||||
/// Scans a [`CompactOutput`] with a set of [`ExtendedFullViewingKey`]s.
|
||||
///
|
||||
/// Returns a [`WalletShieldedOutput`] if this output belongs to any of the given
|
||||
/// [`ExtendedFullViewingKey`]s.
|
||||
/// Returns a [`WalletShieldedOutput`] and corresponding [`IncrementalWitness`] if this
|
||||
/// output belongs to any of the given [`ExtendedFullViewingKey`]s.
|
||||
///
|
||||
/// The given [`CommitmentTree`] and existing [`IncrementalWitness`]es are incremented
|
||||
/// with this output's commitment.
|
||||
fn scan_output(
|
||||
(index, output): (usize, CompactOutput),
|
||||
ivks: &[Fs],
|
||||
) -> Option<WalletShieldedOutput> {
|
||||
tree: &mut CommitmentTree<Node>,
|
||||
existing_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;
|
||||
@ -40,6 +48,16 @@ fn scan_output(
|
||||
|
||||
let ct = output.ciphertext;
|
||||
|
||||
// Increment tree and witnesses
|
||||
let node = Node::new(cmu.into_repr());
|
||||
for witness in existing_witnesses {
|
||||
witness.append(node).unwrap();
|
||||
}
|
||||
for witness in new_witnesses {
|
||||
witness.append(node).unwrap();
|
||||
}
|
||||
tree.append(node).unwrap();
|
||||
|
||||
for (account, ivk) in ivks.iter().enumerate() {
|
||||
let value = match try_sapling_compact_note_decryption(ivk, &epk, &cmu, &ct) {
|
||||
Some((note, _)) => note.value,
|
||||
@ -50,71 +68,80 @@ fn scan_output(
|
||||
let mut enc_ct = EncCiphertextFrag([0u8; 52]);
|
||||
enc_ct.0.copy_from_slice(&ct);
|
||||
|
||||
return Some(WalletShieldedOutput {
|
||||
index,
|
||||
cmu,
|
||||
epk,
|
||||
enc_ct,
|
||||
account,
|
||||
value,
|
||||
});
|
||||
return Some((
|
||||
WalletShieldedOutput {
|
||||
index,
|
||||
cmu,
|
||||
epk,
|
||||
enc_ct,
|
||||
account,
|
||||
value,
|
||||
},
|
||||
IncrementalWitness::from_tree(tree),
|
||||
));
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// Scans a [`CompactTx`] with a set of [`ExtendedFullViewingKey`]s.
|
||||
///
|
||||
/// Returns a [`WalletTx`] if this transaction belongs to any of the given
|
||||
/// [`ExtendedFullViewingKey`]s.
|
||||
fn scan_tx(tx: CompactTx, extfvks: &[ExtendedFullViewingKey]) -> Option<WalletTx> {
|
||||
let num_spends = tx.spends.len();
|
||||
let num_outputs = tx.outputs.len();
|
||||
|
||||
// Check for incoming notes
|
||||
let shielded_outputs: Vec<WalletShieldedOutput> = {
|
||||
let ivks: Vec<_> = extfvks.iter().map(|extfvk| extfvk.fvk.vk.ivk()).collect();
|
||||
tx.outputs
|
||||
.into_iter()
|
||||
.enumerate()
|
||||
.filter_map(|(index, output)| scan_output((index, output), &ivks))
|
||||
.collect()
|
||||
};
|
||||
|
||||
if shielded_outputs.is_empty() {
|
||||
None
|
||||
} else {
|
||||
let mut txid = TxId([0u8; 32]);
|
||||
txid.0.copy_from_slice(&tx.hash);
|
||||
Some(WalletTx {
|
||||
txid,
|
||||
num_spends,
|
||||
num_outputs,
|
||||
shielded_outputs,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// Scans a [`CompactBlock`] for transactions belonging to a set of
|
||||
/// [`ExtendedFullViewingKey`]s.
|
||||
/// Scans a [`CompactBlock`] with a set of [`ExtendedFullViewingKey`]s.
|
||||
///
|
||||
/// Returns a vector of [`WalletTx`]s belonging to any of the given
|
||||
/// [`ExtendedFullViewingKey`]s.
|
||||
pub fn scan_block(block: CompactBlock, extfvks: &[ExtendedFullViewingKey]) -> Vec<WalletTx> {
|
||||
block
|
||||
.vtx
|
||||
.into_iter()
|
||||
.filter_map(|tx| scan_tx(tx, extfvks))
|
||||
.collect()
|
||||
/// [`ExtendedFullViewingKey`]s, and the corresponding new [`IncrementalWitness`]es.
|
||||
///
|
||||
/// The given [`CommitmentTree`] and existing [`IncrementalWitness`]es are
|
||||
/// incremented appropriately.
|
||||
pub fn scan_block(
|
||||
block: CompactBlock,
|
||||
extfvks: &[ExtendedFullViewingKey],
|
||||
tree: &mut CommitmentTree<Node>,
|
||||
existing_witnesses: &mut [&mut IncrementalWitness<Node>],
|
||||
) -> Vec<(WalletTx, Vec<IncrementalWitness<Node>>)> {
|
||||
let mut wtxs = vec![];
|
||||
let ivks: Vec<_> = extfvks.iter().map(|extfvk| extfvk.fvk.vk.ivk()).collect();
|
||||
|
||||
for tx in block.vtx.into_iter() {
|
||||
let num_spends = tx.spends.len();
|
||||
let num_outputs = tx.outputs.len();
|
||||
|
||||
// Check for incoming notes while incrementing tree and witnesses
|
||||
let mut shielded_outputs = vec![];
|
||||
let mut new_witnesses = vec![];
|
||||
for to_scan in tx.outputs.into_iter().enumerate() {
|
||||
if let Some((output, new_witness)) =
|
||||
scan_output(to_scan, &ivks, tree, existing_witnesses, &mut new_witnesses)
|
||||
{
|
||||
shielded_outputs.push(output);
|
||||
new_witnesses.push(new_witness);
|
||||
}
|
||||
}
|
||||
|
||||
if !shielded_outputs.is_empty() {
|
||||
let mut txid = TxId([0u8; 32]);
|
||||
txid.0.copy_from_slice(&tx.hash);
|
||||
wtxs.push((
|
||||
WalletTx {
|
||||
txid,
|
||||
num_spends,
|
||||
num_outputs,
|
||||
shielded_outputs,
|
||||
},
|
||||
new_witnesses,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
wtxs
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use ff::{Field, PrimeField, PrimeFieldRepr};
|
||||
use pairing::bls12_381::Bls12;
|
||||
use pairing::bls12_381::{Bls12, Fr};
|
||||
use rand_core::RngCore;
|
||||
use rand_os::OsRng;
|
||||
use zcash_primitives::{
|
||||
jubjub::fs::Fs,
|
||||
jubjub::{fs::Fs, FixedGenerators, JubjubParams, ToUniform},
|
||||
merkle_tree::CommitmentTree,
|
||||
note_encryption::{Memo, SaplingNoteEncryption},
|
||||
primitives::Note,
|
||||
transaction::components::Amount,
|
||||
@ -125,6 +152,36 @@ mod tests {
|
||||
use super::scan_block;
|
||||
use crate::proto::compact_formats::{CompactBlock, CompactOutput, CompactTx};
|
||||
|
||||
fn random_compact_tx<R: RngCore>(rng: &mut R) -> CompactTx {
|
||||
let fake_cmu = {
|
||||
let fake_cmu = Fr::random(rng);
|
||||
let mut bytes = vec![];
|
||||
fake_cmu.into_repr().write_le(&mut bytes).unwrap();
|
||||
bytes
|
||||
};
|
||||
let fake_epk = {
|
||||
let mut buffer = vec![0; 64];
|
||||
rng.fill_bytes(&mut buffer);
|
||||
let fake_esk = Fs::to_uniform(&buffer[..]);
|
||||
let fake_epk = JUBJUB
|
||||
.generator(FixedGenerators::SpendingKeyGenerator)
|
||||
.mul(fake_esk, &JUBJUB);
|
||||
let mut bytes = vec![];
|
||||
fake_epk.write(&mut bytes).unwrap();
|
||||
bytes
|
||||
};
|
||||
let mut cout = CompactOutput::new();
|
||||
cout.set_cmu(fake_cmu);
|
||||
cout.set_epk(fake_epk);
|
||||
cout.set_ciphertext(vec![0; 52]);
|
||||
let mut ctx = CompactTx::new();
|
||||
let mut txid = vec![0; 32];
|
||||
rng.fill_bytes(&mut txid);
|
||||
ctx.set_hash(txid);
|
||||
ctx.outputs.push(cout);
|
||||
ctx
|
||||
}
|
||||
|
||||
/// Create a fake CompactBlock at the given height, containing a single output paying
|
||||
/// the given address. Returns the CompactBlock and the nullifier for the new note.
|
||||
fn fake_compact_block(
|
||||
@ -159,6 +216,9 @@ mod tests {
|
||||
let mut cb = CompactBlock::new();
|
||||
cb.set_height(height as u64);
|
||||
|
||||
// Add a random Sapling tx before ours
|
||||
cb.vtx.push(random_compact_tx(&mut rng));
|
||||
|
||||
let mut cout = CompactOutput::new();
|
||||
cout.set_cmu(cmu);
|
||||
cout.set_epk(epk);
|
||||
@ -179,16 +239,22 @@ mod tests {
|
||||
let extfvk = ExtendedFullViewingKey::from(&extsk);
|
||||
|
||||
let cb = fake_compact_block(1, extfvk.clone(), Amount::from_u64(5).unwrap());
|
||||
assert_eq!(cb.vtx.len(), 2);
|
||||
|
||||
let txs = scan_block(cb, &[extfvk]);
|
||||
let mut tree = CommitmentTree::new();
|
||||
let txs = scan_block(cb, &[extfvk], &mut tree, &mut []);
|
||||
assert_eq!(txs.len(), 1);
|
||||
|
||||
let tx = &txs[0];
|
||||
let (tx, new_witnesses) = &txs[0];
|
||||
assert_eq!(tx.num_spends, 0);
|
||||
assert_eq!(tx.num_outputs, 1);
|
||||
assert_eq!(tx.shielded_outputs.len(), 1);
|
||||
assert_eq!(tx.shielded_outputs[0].index, 0);
|
||||
assert_eq!(tx.shielded_outputs[0].account, 0);
|
||||
assert_eq!(tx.shielded_outputs[0].value, 5);
|
||||
|
||||
// Check that the witness root matches
|
||||
assert_eq!(new_witnesses.len(), 1);
|
||||
assert_eq!(new_witnesses[0].root(), tree.root());
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user