From 0ae0994978b1372084e11d650d42cd0e12eaed29 Mon Sep 17 00:00:00 2001 From: DenioD <41270280+DenioD@users.noreply.github.com> Date: Mon, 6 Jan 2020 21:38:49 +0100 Subject: [PATCH] dont store any info for sietch zaddr --- lib/src/lightclient.rs | 2 +- lib/src/lightwallet.rs | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/src/lightclient.rs b/lib/src/lightclient.rs index b57b469..34a76fd 100644 --- a/lib/src/lightclient.rs +++ b/lib/src/lightclient.rs @@ -877,7 +877,7 @@ impl LightClient { let wallet = self.wallet.write().unwrap(); match addr_type { - "zs" => wallet.add_zaddr(), + "zs" => wallet.add_zaddrdust(), _ => { let e = format!("Unrecognized address type: {}", addr_type); diff --git a/lib/src/lightwallet.rs b/lib/src/lightwallet.rs index 97a7e99..ddd8e6b 100644 --- a/lib/src/lightwallet.rs +++ b/lib/src/lightwallet.rs @@ -458,6 +458,22 @@ impl LightWallet { self.extfvks.write().unwrap().push(extfvk); self.zaddress.write().unwrap().push(address); + zaddr + } + pub fn add_zaddrdust(&self) -> String { + if !self.unlocked { + return "".to_string(); + } + + let pos = self.extsks.read().unwrap().len() as u32; + let bip39_seed = bip39::Seed::new(&Mnemonic::from_entropy(&self.seed, Language::English).unwrap(), ""); + + 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); + + zaddr }