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

Switch plaintext version on height in commit_to_address() in zcash_client_sqlite

This commit is contained in:
therealyingtong 2020-08-05 14:26:57 +08:00
parent a25348dfba
commit d5f80618ef
No known key found for this signature in database
GPG Key ID: 179F32A1503D607E
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
zcash_client_sqlite/src/transact.rs
View File

@ -9,6 +9,7 @@ use std::path::Path;
use zcash_client_backend::encoding::encode_extended_full_viewing_key; use zcash_client_backend::encoding::encode_extended_full_viewing_key;
use zcash_primitives::{ use zcash_primitives::{
consensus, consensus,
consensus::Parameters,
jubjub::fs::{Fs, FsRepr}, jubjub::fs::{Fs, FsRepr},
keys::OutgoingViewingKey, keys::OutgoingViewingKey,
merkle_tree::{IncrementalWitness, MerklePath}, merkle_tree::{IncrementalWitness, MerklePath},
@ -234,14 +235,20 @@ pub fn create_to_address<P: AsRef<Path>>(
let note_value: i64 = row.get(1)?; let note_value: i64 = row.get(1)?;
let rcm = { let d: Vec<_> = row.get(2)?;
let d: Vec<_> = row.get(2)?;
let rseed = if height >= Network::CANOPY_ACTIVATION_HEIGHT {
let mut r = [0u8; 32];
r.copy_from_slice(&d[..]);
Rseed::AfterZip212(r)
} else {
let tmp = FsRepr( let tmp = FsRepr(
d[..] d[..]
.try_into() .try_into()
.map_err(|_| Error(ErrorKind::InvalidNote))?, .map_err(|_| Error(ErrorKind::InvalidNote))?,
); );
Fs::from_repr(tmp).ok_or(Error(ErrorKind::InvalidNote))? let r = Fs::from_repr(tmp).ok_or(Error(ErrorKind::InvalidNote))?;
Rseed::BeforeZip212(r)
}; };
let from = extfvk let from = extfvk
@ -249,9 +256,7 @@ pub fn create_to_address<P: AsRef<Path>>(
.vk .vk
.to_payment_address(diversifier, &JUBJUB) .to_payment_address(diversifier, &JUBJUB)
.unwrap(); .unwrap();
let note = from let note = from.create_note(note_value as u64, rseed, &JUBJUB).unwrap();
.create_note(note_value as u64, Rseed::BeforeZip212(rcm), &JUBJUB)
.unwrap();
let merkle_path = { let merkle_path = {
let d: Vec<_> = row.get(3)?; let d: Vec<_> = row.get(3)?;