Qortal/piratewallet-light-cli
3
0
Fork 0
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-01-30 18:42:15 +00:00
Code Issues Projects Releases Wiki Activity

Add syncstatus command

Browse Source
This commit is contained in:
Aditya Kulkarni 2019-10-24 18:26:25 -07:00
parent 17bbb71a69
commit 865a72442d
3 changed files with 66 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cli/src/main.rs
View File

@ -221,7 +221,12 @@ fn startup(server: http::Uri, dangerous: bool, seed: Option<String>, birthday: u
if first_sync {
let update = lightclient.do_sync(true);
if print_updates {
println!("{}", update);
match update {
Ok(j) => {
println!("{}", j.pretty(2));
},
Err(e) => println!("{}", e)
}
}
}
@ -329,7 +334,11 @@ fn command_loop(lightclient: Arc<LightClient>) -> (Sender<(String, Vec<String>)>
Err(_) => {
// Timeout. Do a sync to keep the wallet up-to-date. False to whether to print updates on the console
info!("Timeout, doing a sync");
lc.do_sync(false);
match lc.do_sync(false) {
Ok(_) => {},
Err(e) => {error!("{}", e)}
}
}
}
}

77
lib/src/commands.rs
View File

@ -28,7 +28,10 @@ impl Command for SyncCommand {
}
fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String {
lightclient.do_sync(true)
match lightclient.do_sync(true) {
Ok(j) => j.pretty(2),
Err(e) => e
}
}
}
@ -79,7 +82,10 @@ impl Command for RescanCommand {
}
fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String {
lightclient.do_rescan()
match lightclient.do_rescan() {
Ok(j) => j.pretty(2),
Err(e) => e
}
}
}
@ -144,9 +150,7 @@ impl Command for InfoCommand {
"Get the lightwalletd server's info".to_string()
}
fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String {
lightclient.do_sync(true);
fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String {
lightclient.do_info()
}
}
@ -169,9 +173,10 @@ impl Command for BalanceCommand {
}
fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String {
lightclient.do_sync(true);
format!("{}", lightclient.do_balance().pretty(2))
match lightclient.do_sync(true) {
Ok(_) => format!("{}", lightclient.do_balance().pretty(2)),
Err(e) => e
}
}
}
@ -434,7 +439,7 @@ impl Command for SendCommand {
}
// Check for a single argument that can be parsed as JSON
if args.len() == 1 {
let send_args = if args.len() == 1 {
// Sometimes on the command line, people use "'" for the quotes, which json::parse doesn't
// understand. So replace it with double-quotes
let arg_list = args[0].replace("'", "\"");
@ -455,20 +460,14 @@ impl Command for SendCommand {
if !j.has_key("address") || !j.has_key("amount") {
Err(format!("Need 'address' and 'amount'\n"))
} else {
Ok((j["address"].as_str().unwrap(), j["amount"].as_u64().unwrap(), j["memo"].as_str().map(|s| s.to_string())))
Ok((j["address"].as_str().unwrap().to_string().clone(), j["amount"].as_u64().unwrap(), j["memo"].as_str().map(|s| s.to_string().clone())))
}
}).collect::<Result<Vec<(&str, u64, Option<String>)>, String>>();
}).collect::<Result<Vec<(String, u64, Option<String>)>, String>>();
let send_args = match maybe_send_args {
Ok(a) => a,
match maybe_send_args {
Ok(a) => a.clone(),
Err(s) => { return format!("Error: {}\n{}", s, self.help()); }
};
lightclient.do_sync(true);
match lightclient.do_send(send_args) {
Ok(txid) => { object!{ "txid" => txid } },
Err(e) => { object!{ "error" => e } }
}.pretty(2)
}
} else if args.len() == 2 || args.len() == 3 {
// Make sure we can parse the amount
let value = match args[1].parse::<u64>() {
@ -480,13 +479,21 @@ impl Command for SendCommand {
let memo = if args.len() == 3 { Some(args[2].to_string()) } else {None};
lightclient.do_sync(true);
match lightclient.do_send(vec!((args[0], value, memo))) {
Ok(txid) => { object!{ "txid" => txid } },
Err(e) => { object!{ "error" => e } }
}.pretty(2)
vec![(args[0].to_string(), value, memo)]
} else {
self.help()
return self.help()
};
match lightclient.do_sync(true) {
Ok(_) => {
// Convert to the right format. String -> &str.
let tos = send_args.iter().map(|(a, v, m)| (a.as_str(), *v, m.clone()) ).collect::<Vec<_>>();
match lightclient.do_send(tos) {
Ok(txid) => { object!{ "txid" => txid } },
Err(e) => { object!{ "error" => e } }
}.pretty(2)
},
Err(e) => e
}
}
}
@ -568,9 +575,12 @@ impl Command for TransactionsCommand {
}
fn exec(&self, _args: &[&str], lightclient: &LightClient) -> String {
lightclient.do_sync(true);
format!("{}", lightclient.do_list_transactions().pretty(2))
match lightclient.do_sync(true) {
Ok(_) => {
format!("{}", lightclient.do_list_transactions().pretty(2))
},
Err(e) => e
}
}
}
@ -662,9 +672,12 @@ impl Command for NotesCommand {
false
};
lightclient.do_sync(true);
format!("{}", lightclient.do_list_notes(all_notes).pretty(2))
match lightclient.do_sync(true) {
Ok(_) => {
format!("{}", lightclient.do_list_notes(all_notes).pretty(2))
},
Err(e) => e
}
}
}

19
lib/src/lightclient.rs
View File

@ -741,7 +741,7 @@ impl LightClient {
Ok(array![new_address])
}
pub fn do_rescan(&self) -> String {
pub fn do_rescan(&self) -> Result<JsonValue, String> {
info!("Rescan starting");
// First, clear the state from the wallet
self.wallet.read().unwrap().clear_blocks();
@ -761,7 +761,7 @@ impl LightClient {
self.sync_status.read().unwrap().clone()
}
pub fn do_sync(&self, print_updates: bool) -> String {
pub fn do_sync(&self, print_updates: bool) -> Result<JsonValue, String> {
// We can only do one sync at a time because we sync blocks in serial order
// If we allow multiple syncs, they'll all get jumbled up.
let _lock = self.sync_lock.lock().unwrap();
@ -786,7 +786,7 @@ impl LightClient {
if latest_block < last_scanned_height {
let w = format!("Server's latest block({}) is behind ours({})", latest_block, last_scanned_height);
warn!("{}", w);
return w;
return Err(w);
}
info!("Latest block is {}", latest_block);
@ -797,7 +797,7 @@ impl LightClient {
// If there's nothing to scan, just return
if last_scanned_height == latest_block {
info!("Nothing to sync, returning");
return "".to_string();
return Ok(object!{ "result" => "success" })
}
{
@ -893,7 +893,7 @@ impl LightClient {
// Make sure we're not re-orging too much!
if total_reorg > (crate::lightwallet::MAX_REORG - 1) as u64 {
error!("Reorg has now exceeded {} blocks!", crate::lightwallet::MAX_REORG);
return format!("Reorg has exceeded {} blocks. Aborting.", crate::lightwallet::MAX_REORG);
return Err(format!("Reorg has exceeded {} blocks. Aborting.", crate::lightwallet::MAX_REORG));
}
if invalid_height > 0 {
@ -947,10 +947,7 @@ impl LightClient {
println!(""); // New line to finish up the updates
}
let mut responses = vec![];
info!("Synced to {}, Downloaded {} kB", latest_block, bytes_downloaded.load(Ordering::SeqCst) / 1024);
responses.push(format!("Synced to {}, Downloaded {} kB", latest_block, bytes_downloaded.load(Ordering::SeqCst) / 1024));
{
let mut status = self.sync_status.write().unwrap();
status.is_syncing = false;
@ -988,7 +985,11 @@ impl LightClient {
});
};
responses.join("\n")
Ok(object!{
"result" => "success",
"latest_block" => latest_block,
"downloaded_bytes" => bytes_downloaded.load(Ordering::SeqCst)
})
}
pub fn do_send(&self, addrs: Vec<(&str, u64, Option<String>)>) -> Result<String, String> {