Qortal/piratewallet-light-cli
1
0
Fork 0
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-07-30 03:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable synchronization and some more balance validation when redeeming/refunding P2SH

Browse Source
This commit is contained in:
CalDescent
2022-05-27 10:39:42 +02:00
parent 30332dfe52
commit 0dd7bdcace
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/src/commands.rs
View File

@@ -798,16 +798,12 @@ impl Command for RedeemP2shCommand {
let privkey_bytes = &privkey_vec[..]; let privkey_bytes = &privkey_vec[..];
//Check array for manadantory address and amount keys //Check array for mandantory address and amount keys
let maybe_send_args = json_tos.members().map( |j| { let maybe_send_args = json_tos.members().map( |j| {
if !j.has_key("address") || !j.has_key("amount") { if !j.has_key("address") || !j.has_key("amount") {
Err(format!("Need 'address' and 'amount'\n")) Err(format!("Need 'address' and 'amount'\n"))
} else { } else {
let amount = match j["amount"].as_str() { let amount = j["amount"].as_u64();
Some("entire-verified-zbalance") => lightclient.wallet.read().unwrap().verified_zbalance(None).checked_sub(fee),
_ => Some(j["amount"].as_u64().unwrap())
};
match amount { match amount {
Some(amt) => Ok((j["address"].as_str().unwrap().to_string().clone(), amt, j["memo"].as_str().map(|s| s.to_string().clone()))), Some(amt) => Ok((j["address"].as_str().unwrap().to_string().clone(), amt, j["memo"].as_str().map(|s| s.to_string().clone()))),
None => Err(format!("Not enough in wallet to pay transaction fee")) None => Err(format!("Not enough in wallet to pay transaction fee"))
@@ -821,17 +817,17 @@ impl Command for RedeemP2shCommand {
}; };
match lightclient.do_sync(true) { // match lightclient.do_sync(true) {
Ok(_) => { // Ok(_) => {
// Convert to the right format. String -> &str. // Convert to the right format. String -> &str.
let tos = send_args.iter().map(|(a, v, m)| (a.as_str(), *v, m.clone()) ).collect::<Vec<_>>(); let tos = send_args.iter().map(|(a, v, m)| (a.as_str(), *v, m.clone()) ).collect::<Vec<_>>();
match lightclient.do_redeem_p2sh(from, tos, &fee, script_bytes, txid_bytes, lock_time, secret_bytes, privkey_bytes) { match lightclient.do_redeem_p2sh(from, tos, &fee, script_bytes, txid_bytes, lock_time, secret_bytes, privkey_bytes) {
Ok(txid) => { object!{ "txid" => txid } }, Ok(txid) => { object!{ "txid" => txid } },
Err(e) => { object!{ "error" => e } } Err(e) => { object!{ "error" => e } }
}.pretty(2) }.pretty(2)
}, // },
Err(e) => e // Err(e) => e
} // }
} }
} }