DragonX/silentdragonlite-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23 from DenioD/dev

Browse Source 
dev to master
This commit is contained in:
Denio
2019-10-24 23:26:06 +02:00
committed by GitHub
parent 4d9c094330 d14e6d9c30
commit 0c72799d98
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/src/commands.rs
View File

@@ -382,7 +382,7 @@ impl Command for SendCommand {
h.push("Usage:"); h.push("Usage:");
h.push("send <address> <amount in puposhis> \"optional_memo\""); h.push("send <address> <amount in puposhis> \"optional_memo\"");
h.push("OR"); h.push("OR");
h.push("send '[{'address': <address>, 'amount': <amount in zatoshis>, 'memo': <optional memo>}, ...]'"); h.push("send '[{'address': <address>, 'amount': <amount in puposhis>, 'memo': <optional memo>}, ...]'");
h.push(""); h.push("");
h.push("Example:"); h.push("Example:");
h.push("send ztestsapling1x65nq4dgp0qfywgxcwk9n0fvm4fysmapgr2q00p85ju252h6l7mmxu2jg9cqqhtvzd69jwhgv8d 200000 \"Hello from the command line\""); h.push("send ztestsapling1x65nq4dgp0qfywgxcwk9n0fvm4fysmapgr2q00p85ju252h6l7mmxu2jg9cqqhtvzd69jwhgv8d 200000 \"Hello from the command line\"");

8
lib/src/lightclient.rs
View File

@@ -436,16 +436,16 @@ impl LightClient {
let z_addresses = wallet.zaddress.read().unwrap().iter().map( |ad| { let z_addresses = wallet.zaddress.read().unwrap().iter().map( |ad| {
let address = encode_payment_address(self.config.hrp_sapling_address(), &ad); let address = encode_payment_address(self.config.hrp_sapling_address(), &ad);
object!{ object!{
"address" => address.clone(), "address" => address.clone() ,
"zbalance" => wallet.zbalance(Some(address.clone())), "zbalance" => wallet.zbalance(Some(address.clone())) ,
"verified_zbalance" => wallet.verified_zbalance(Some(address)), "verified_zbalance" => wallet.verified_zbalance(Some(address)) ,
} }
}).collect::<Vec<JsonValue>>(); }).collect::<Vec<JsonValue>>();
// Collect t addresses // Collect t addresses
let t_addresses = wallet.taddresses.read().unwrap().iter().map( |address| { let t_addresses = wallet.taddresses.read().unwrap().iter().map( |address| {
// Get the balance for this address // Get the balance for this address
let balance = wallet.tbalance(Some(address.clone())); let balance = wallet.tbalance(Some(address.clone())) ;
object!{ object!{
"address" => address.clone(), "address" => address.clone(),

4
lib/src/lightwallet.rs
View File

@@ -153,7 +153,7 @@ impl LightWallet {
let extsk: ExtendedSpendingKey = ExtendedSpendingKey::from_path( let extsk: ExtendedSpendingKey = ExtendedSpendingKey::from_path(
&ExtendedSpendingKey::master(bip39_seed), &ExtendedSpendingKey::master(bip39_seed),
&[ &[
ChildIndex::Hardened(31), ChildIndex::Hardened(32),
ChildIndex::Hardened(config.get_coin_type()), ChildIndex::Hardened(config.get_coin_type()),
ChildIndex::Hardened(pos) ChildIndex::Hardened(pos)
], ],
@@ -1343,7 +1343,7 @@ impl LightWallet {
let total_value = tos.iter().map(|to| to.1).sum::<u64>(); let total_value = tos.iter().map(|to| to.1).sum::<u64>();
println!( println!(
"0: Creating transaction sending {} ztoshis to {} addresses", "0: Creating transaction sending {} puposhis to {} addresses",
total_value, tos.len() total_value, tos.len()
); );