Browse Source

Don't fix bug when no money is involved.

checkpoints
Aditya Kulkarni 5 years ago
parent
commit
5cf2c955e3
  1. 2
      lib/src/commands.rs
  2. 7
      lib/src/lightwallet/bugs.rs

2
lib/src/commands.rs

@ -235,7 +235,7 @@ impl Command for EncryptCommand {
use crate::lightwallet::bugs::BugBip39Derivation;
if BugBip39Derivation::has_bug(lightclient) {
let mut h = vec![];
h.push("It looks like your wallet has the bop39bug. Please run 'fixbip39bug' to fix it");
h.push("It looks like your wallet has the bip39bug. Please run 'fixbip39bug' to fix it");
h.push("before encrypting your wallet.");
h.push("ERROR: Cannot encrypt while wallet has the bip39bug.");
return h.join("\n");

7
lib/src/lightwallet/bugs.rs

@ -73,13 +73,12 @@ impl BugBip39Derivation {
println!("Sending funds to ourself.");
let zaddr = client.do_address()["z_addresses"][0].as_str().unwrap().to_string();
let balance_json = client.do_balance();
let fee: u64 = DEFAULT_FEE.try_into().unwrap();
let amount: u64 = balance_json["zbalance"].as_u64().unwrap()
+ balance_json["tbalance"].as_u64().unwrap()
- fee;
+ balance_json["tbalance"].as_u64().unwrap();
let txid = if amount > 0 {
match client.do_send(vec![(&zaddr, amount, None)]) {
let fee: u64 = DEFAULT_FEE.try_into().unwrap();
match client.do_send(vec![(&zaddr, amount-fee, None)]) {
Ok(txid) => txid,
Err(e) => {
let r = object!{

Loading…
Cancel
Save