From 39fd884ded0d5a8419dfa1ddb6ff6d3275018215 Mon Sep 17 00:00:00 2001
From: DenioD <dennis.netterdon@me.com>
Date: Thu, 24 Oct 2019 23:23:04 +0200
Subject: [PATCH] fix broken balance

---
 lib/src/commands.rs    |  2 +-
 lib/src/lightclient.rs | 10 +++++-----
 lib/src/lightwallet.rs |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src/commands.rs b/lib/src/commands.rs
index f25ab6c..80ba787 100644
--- a/lib/src/commands.rs
+++ b/lib/src/commands.rs
@@ -382,7 +382,7 @@ impl Command for SendCommand {
         h.push("Usage:");
         h.push("send <address> <amount in puposhis> \"optional_memo\"");
         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("Example:");
         h.push("send ztestsapling1x65nq4dgp0qfywgxcwk9n0fvm4fysmapgr2q00p85ju252h6l7mmxu2jg9cqqhtvzd69jwhgv8d 200000 \"Hello from the command line\"");
diff --git a/lib/src/lightclient.rs b/lib/src/lightclient.rs
index 9f9fb02..1f130e4 100644
--- a/lib/src/lightclient.rs
+++ b/lib/src/lightclient.rs
@@ -436,16 +436,16 @@ impl LightClient {
         let z_addresses = wallet.zaddress.read().unwrap().iter().map( |ad| {
             let address = encode_payment_address(self.config.hrp_sapling_address(), &ad);
             object!{
-                "address" => address.clone(),
-                "zbalance" => wallet.zbalance(Some(address.clone())),
-                "verified_zbalance" => wallet.verified_zbalance(Some(address)),
+                "address" => address.clone() ,
+                "zbalance" => wallet.zbalance(Some(address.clone())) ,
+                "verified_zbalance" => wallet.verified_zbalance(Some(address)) ,
             }
         }).collect::<Vec<JsonValue>>();
 
         // Collect t addresses
         let t_addresses = wallet.taddresses.read().unwrap().iter().map( |address| {
             // Get the balance for this address
-            let balance = wallet.tbalance(Some(address.clone()));
+            let balance = wallet.tbalance(Some(address.clone())) ;
             
             object!{
                 "address" => address.clone(),
@@ -456,7 +456,7 @@ impl LightClient {
         object!{
             "zbalance"           => wallet.zbalance(None),
             "verified_zbalance"  => wallet.verified_zbalance(None),
-            "tbalance"           => wallet.tbalance(None),
+            "tbalance"           => wallet.tbalance(None), 
             "z_addresses"        => z_addresses,
             "t_addresses"        => t_addresses,
         }
diff --git a/lib/src/lightwallet.rs b/lib/src/lightwallet.rs
index a1bcc3a..a978060 100644
--- a/lib/src/lightwallet.rs
+++ b/lib/src/lightwallet.rs
@@ -153,7 +153,7 @@ impl LightWallet {
         let extsk: ExtendedSpendingKey = ExtendedSpendingKey::from_path(
             &ExtendedSpendingKey::master(bip39_seed),
             &[
-                ChildIndex::Hardened(31),
+                ChildIndex::Hardened(32),
                 ChildIndex::Hardened(config.get_coin_type()),
                 ChildIndex::Hardened(pos)
             ],
@@ -1335,7 +1335,7 @@ impl LightWallet {
 
         let total_value = tos.iter().map(|to| to.1).sum::<u64>();
         println!(
-            "0: Creating transaction sending {} ztoshis to {} addresses",
+            "0: Creating transaction sending {} puposhis to {} addresses",
             total_value, tos.len()
         );