From 7908d228be17292e0035634b4dde8423b4e6c3ff Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sun, 17 May 2020 23:02:15 +0200
Subject: [PATCH] rename to zdust

---
 lib/src/lightclient.rs |  7 ++-----
 lib/src/lightwallet.rs | 30 +++++++++++++++++-------------
 2 files changed, 19 insertions(+), 18 deletions(-)

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<JsonValue, String> {
        
-
-        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 bd49336..b532904 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<RwLock<Vec<ExtendedFullViewingKey>>>,
 
     pub zaddress: Arc<RwLock<Vec<PaymentAddress<Bls12>>>>,
+   
     
     // Transparent keys. If the wallet is locked, then the secret keys will be encrypted,
     // but the addresses will be present. 
@@ -170,22 +175,23 @@ impl LightWallet {
         (extsk, extfvk, address)
     }
 
-    fn get_sietch_from_bip39seed(config: &LightClientConfig, bip39_seed: &[u8]) ->
+    fn get_sietch_from_bip39seed( bip39_seed: &[u8]) ->
+    
+    
     PaymentAddress<Bls12> {
     assert_eq!(bip39_seed.len(), 64);
 
-    let extsk: ExtendedSpendingKey = ExtendedSpendingKey::from_path(
+    let zdustextsk: ExtendedSpendingKey = ExtendedSpendingKey::from_path(
     &ExtendedSpendingKey::master(bip39_seed),
     &[
         ChildIndex::Hardened(32),
-        ChildIndex::Hardened(config.get_coin_type()),
-      
+         
     ],
     );
-    let extfvk  = ExtendedFullViewingKey::from(&extsk);
-    let address = extfvk.default_address().unwrap().1;
+    let zdustextfvk  = ExtendedFullViewingKey::from(&zdustextsk);
+    let zdustaddress = zdustextfvk.default_address().unwrap().1;
 
-    (address)
+    (zdustaddress)
 }
 
     pub fn is_shielded_address(addr: &String, config: &LightClientConfig) -> bool {
@@ -488,14 +494,13 @@ 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();
@@ -510,10 +515,9 @@ impl LightWallet {
           
         let bip39_seed = bip39::Seed::new(&Mnemonic::from_entropy(&seed_bytes, Language::English).unwrap(), dust);
 
-        let address =
-        LightWallet::get_sietch_from_bip39seed(&self.config, &bip39_seed.as_bytes());
+        let zdustaddress = LightWallet::get_sietch_from_bip39seed(&bip39_seed.as_bytes());
 
-        let zdust = encode_payment_address(self.config.hrp_sapling_address(), &address);
+        let zdust = encode_payment_address("zs", &zdustaddress);
     
 
         zdust