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

Accept JSON for import

Browse Source
This commit is contained in:
Aditya Kulkarni 2020-07-23 10:52:38 -07:00
parent 4a16b282ec
commit c117c5d739
1 changed files with 42 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/src/commands.rs
View File

@ -660,6 +660,8 @@ impl Command for ImportCommand {
h.push("Import an external spending or viewing key into the wallet");
h.push("Usage:");
h.push("import <spending_key | viewing_key> <birthday> [norescan]");
h.push("OR");
h.push("import '{'key': <spending_key or viewing_key>, 'birthday': <birthday>, 'norescan': <true>}'");
h.push("");
h.push("Birthday is the earliest block number that has transactions belonging to the imported key. Rescanning will start from this block. If not sure, you can specify '0', which will start rescanning from the first sapling block.");
h.push("Note that you can import only the full spending (private) key or the full viewing key.");
@ -673,27 +675,54 @@ impl Command for ImportCommand {
}
fn exec(&self, args: &[&str], lightclient: &LightClient) -> String {
if args.len() < 2 || args.len() > 3 {
if args.len() == 0 || args.len() > 3 {
return format!("Insufficient arguments\n\n{}", self.help());
}
let key = args[0];
let birthday = match args[1].parse::<u64>() {
Ok(b) => b,
Err(_) => return format!("Couldn't parse {} as birthday. Please specify an integer. Ok to use '0'", args[1]),
};
let (key, birthday, rescan) = if args.len() == 1 {
// If only one arg, parse it as JSON
let json_args = match json::parse(&args[0]) {
Ok(j) => j,
Err(e) => {
let es = format!("Couldn't understand JSON: {}", e);
return format!("{}\n{}", es, self.help());
}
};
let rescan = if args.len() == 3 {
if args[2] == "norescan" || args[2] == "false" || args[2] == "no" {
false
} else {
return format!("Couldn't undestand the argument '{}'. Please pass 'norescan' to prevent rescanning the wallet", args[2]);
if !json_args.is_object() {
return format!("Couldn't parse argument as a JSON object\n{}", self.help());
}
if !json_args.has_key("key") {
return format!("'key' field is required in the JSON, containing the spending or viewing key to import\n{}", self.help());
}
if !json_args.has_key("birthday") {
return format!("'birthday' field is required in the JSON, containing the birthday of the spending or viewing key\n{}", self.help());
}
(json_args["key"].as_str().unwrap().to_string(), json_args["birthday"].as_u64().unwrap(), !json_args.has_key("norescan"))
} else {
true
let key = args[0];
let birthday = match args[1].parse::<u64>() {
Ok(b) => b,
Err(_) => return format!("Couldn't parse {} as birthday. Please specify an integer. Ok to use '0'", args[1]),
};
let rescan = if args.len() == 3 {
if args[2] == "norescan" || args[2] == "false" || args[2] == "no" {
false
} else {
return format!("Couldn't undestand the argument '{}'. Please pass 'norescan' to prevent rescanning the wallet", args[2]);
}
} else {
true
};
(key.to_string(), birthday, rescan)
};
let r = match lightclient.do_import_key(key.to_string(), birthday) {
let r = match lightclient.do_import_key(key, birthday) {
Ok(r) => r.pretty(2),
Err(e) => return format!("Error: {}", e),
};