rename to zdust
This commit is contained in:
@@ -902,8 +902,7 @@ impl LightClient {
|
|||||||
|
|
||||||
pub fn do_new_sietchaddress(&self, addr_type: &str) -> Result<JsonValue, String> {
|
pub fn do_new_sietchaddress(&self, addr_type: &str) -> Result<JsonValue, String> {
|
||||||
|
|
||||||
|
let zdust_address = {
|
||||||
let new_address = {
|
|
||||||
let wallet = self.wallet.write().unwrap();
|
let wallet = self.wallet.write().unwrap();
|
||||||
|
|
||||||
match addr_type {
|
match addr_type {
|
||||||
@@ -917,9 +916,7 @@ impl LightClient {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
self.do_save()?;
|
Ok(array![zdust_address])
|
||||||
|
|
||||||
Ok(array![new_address])
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn clear_state(&self) {
|
pub fn clear_state(&self) {
|
||||||
|
|||||||
@@ -38,9 +38,13 @@ use zcash_primitives::{
|
|||||||
zip32::{ExtendedFullViewingKey, ExtendedSpendingKey, ChildIndex},
|
zip32::{ExtendedFullViewingKey, ExtendedSpendingKey, ChildIndex},
|
||||||
JUBJUB,
|
JUBJUB,
|
||||||
primitives::{PaymentAddress},
|
primitives::{PaymentAddress},
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
use crate::lightclient::{LightClientConfig};
|
use crate::lightclient::{LightClientConfig};
|
||||||
|
|
||||||
mod data;
|
mod data;
|
||||||
@@ -112,6 +116,7 @@ pub struct LightWallet {
|
|||||||
extfvks: Arc<RwLock<Vec<ExtendedFullViewingKey>>>,
|
extfvks: Arc<RwLock<Vec<ExtendedFullViewingKey>>>,
|
||||||
|
|
||||||
pub zaddress: Arc<RwLock<Vec<PaymentAddress<Bls12>>>>,
|
pub zaddress: Arc<RwLock<Vec<PaymentAddress<Bls12>>>>,
|
||||||
|
|
||||||
|
|
||||||
// Transparent keys. If the wallet is locked, then the secret keys will be encrypted,
|
// Transparent keys. If the wallet is locked, then the secret keys will be encrypted,
|
||||||
// but the addresses will be present.
|
// but the addresses will be present.
|
||||||
@@ -170,22 +175,23 @@ impl LightWallet {
|
|||||||
(extsk, extfvk, address)
|
(extsk, extfvk, address)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_sietch_from_bip39seed(config: &LightClientConfig, bip39_seed: &[u8]) ->
|
fn get_sietch_from_bip39seed( bip39_seed: &[u8]) ->
|
||||||
|
|
||||||
|
|
||||||
PaymentAddress<Bls12> {
|
PaymentAddress<Bls12> {
|
||||||
assert_eq!(bip39_seed.len(), 64);
|
assert_eq!(bip39_seed.len(), 64);
|
||||||
|
|
||||||
let extsk: ExtendedSpendingKey = ExtendedSpendingKey::from_path(
|
let zdustextsk: ExtendedSpendingKey = ExtendedSpendingKey::from_path(
|
||||||
&ExtendedSpendingKey::master(bip39_seed),
|
&ExtendedSpendingKey::master(bip39_seed),
|
||||||
&[
|
&[
|
||||||
ChildIndex::Hardened(32),
|
ChildIndex::Hardened(32),
|
||||||
ChildIndex::Hardened(config.get_coin_type()),
|
|
||||||
|
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
let extfvk = ExtendedFullViewingKey::from(&extsk);
|
let zdustextfvk = ExtendedFullViewingKey::from(&zdustextsk);
|
||||||
let address = extfvk.default_address().unwrap().1;
|
let zdustaddress = zdustextfvk.default_address().unwrap().1;
|
||||||
|
|
||||||
(address)
|
(zdustaddress)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn is_shielded_address(addr: &String, config: &LightClientConfig) -> bool {
|
pub fn is_shielded_address(addr: &String, config: &LightClientConfig) -> bool {
|
||||||
@@ -488,14 +494,13 @@ impl LightWallet {
|
|||||||
zaddr
|
zaddr
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Add a new Sietch Addr. This will derive a new zdust address from manipluated seed
|
// Add a new Sietch Addr. This will derive a new zdust address from manipluated seed
|
||||||
pub fn add_zaddrdust(&self) -> String {
|
pub fn add_zaddrdust(&self) -> String {
|
||||||
|
|
||||||
let mut seed_bytes = [0u8; 32];
|
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 mut rng = rand::thread_rng();
|
||||||
let letter: String = rng.gen_range(b'A', b'Z').to_string();
|
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 bip39_seed = bip39::Seed::new(&Mnemonic::from_entropy(&seed_bytes, Language::English).unwrap(), dust);
|
||||||
|
|
||||||
let address =
|
let zdustaddress = LightWallet::get_sietch_from_bip39seed(&bip39_seed.as_bytes());
|
||||||
LightWallet::get_sietch_from_bip39seed(&self.config, &bip39_seed.as_bytes());
|
|
||||||
|
|
||||||
let zdust = encode_payment_address(self.config.hrp_sapling_address(), &address);
|
let zdust = encode_payment_address("zs", &zdustaddress);
|
||||||
|
|
||||||
|
|
||||||
zdust
|
zdust
|
||||||
|
|||||||
Reference in New Issue
Block a user