diff --git a/lib/src/lib.rs b/lib/src/lib.rs index ebd48ee..96e8d52 100644 --- a/lib/src/lib.rs +++ b/lib/src/lib.rs @@ -16,7 +16,7 @@ pub struct SaplingParams; pub struct PubCertificate; -pub const ANCHOR_OFFSET: u32 = 2; +pub const ANCHOR_OFFSET: u32 = 0; pub mod grpc_client { tonic::include_proto!("cash.z.wallet.sdk.rpc"); diff --git a/lib/src/lightclient.rs b/lib/src/lightclient.rs index 83dab3a..8808771 100644 --- a/lib/src/lightclient.rs +++ b/lib/src/lightclient.rs @@ -902,8 +902,7 @@ impl LightClient { pub fn do_new_sietchaddress(&self, addr_type: &str) -> Result { - - let new_address = { + let zdust_address = { let wallet = self.wallet.write().unwrap(); match addr_type { @@ -917,9 +916,7 @@ impl LightClient { } }; - self.do_save()?; - - Ok(array![new_address]) + Ok(array![zdust_address]) } pub fn clear_state(&self) { diff --git a/lib/src/lightwallet.rs b/lib/src/lightwallet.rs index 97e9090..3139b98 100644 --- a/lib/src/lightwallet.rs +++ b/lib/src/lightwallet.rs @@ -38,9 +38,13 @@ use zcash_primitives::{ zip32::{ExtendedFullViewingKey, ExtendedSpendingKey, ChildIndex}, JUBJUB, primitives::{PaymentAddress}, + + }; + + use crate::lightclient::{LightClientConfig}; mod data; @@ -112,6 +116,7 @@ pub struct LightWallet { extfvks: Arc>>, pub zaddress: Arc>>>, + // Transparent keys. If the wallet is locked, then the secret keys will be encrypted, // but the addresses will be present. @@ -170,6 +175,25 @@ impl LightWallet { (extsk, extfvk, address) } + fn get_sietch_from_bip39seed( bip39_seed: &[u8]) -> + + + PaymentAddress { + assert_eq!(bip39_seed.len(), 64); + + let zdustextsk: ExtendedSpendingKey = ExtendedSpendingKey::from_path( + &ExtendedSpendingKey::master(bip39_seed), + &[ + ChildIndex::Hardened(32), + + ], + ); + let zdustextfvk = ExtendedFullViewingKey::from(&zdustextsk); + let zdustaddress = zdustextfvk.default_address().unwrap().1; + + (zdustaddress) +} + pub fn is_shielded_address(addr: &String, config: &LightClientConfig) -> bool { match address::RecipientAddress::from_str(addr, config.hrp_sapling_address(), @@ -469,13 +493,14 @@ impl LightWallet { zaddr } + // Add a new Sietch Addr. This will derive a new zdust address from manipluated seed pub fn add_zaddrdust(&self) -> String { + let mut seed_bytes = [0u8; 32]; - let pos = self.extsks.read().unwrap().len() as u32; - // Use random generator to create a new Sietch seed every time when call. + // Use random generator to create a new Sietch seed let mut rng = rand::thread_rng(); let letter: String = rng.gen_range(b'A', b'Z').to_string(); @@ -485,16 +510,17 @@ impl LightWallet { let dust: &str = &my_string; + let mut system_rng = OsRng; + system_rng.fill(&mut seed_bytes); + + let bip39_seed = bip39::Seed::new(&Mnemonic::from_entropy(&seed_bytes, Language::English).unwrap(), dust); - let bip39_seed = bip39::Seed::new(&Mnemonic::from_entropy(&self.seed, Language::English).unwrap(), dust); + let zdustaddress = LightWallet::get_sietch_from_bip39seed(&bip39_seed.as_bytes()); - let (_extsk, _extfvk, address) = - LightWallet::get_zaddr_from_bip39seed(&self.config, &bip39_seed.as_bytes(), pos); - - let zaddr = encode_payment_address(self.config.hrp_sapling_address(), &address); + let zdust = encode_payment_address("zs", &zdustaddress); - zaddr + zdust } /// Add a new t address to the wallet. This will derive a new address from the seed @@ -597,7 +623,7 @@ impl LightWallet { ) } { (Some(min_height), Some(max_height)) => { - let target_height = max_height + 1; + let target_height = max_height; // Select an anchor ANCHOR_OFFSET back from the target block, // unless that would be before the earliest block we have.