merge some upstream improvements, set new checkpoint blockhigh

This commit is contained in:
DenioD
2020-02-06 21:37:53 +01:00
parent 36a49e3941
commit 8f64f9e0df
14 changed files with 1746 additions and 1701 deletions

View File

@@ -479,12 +479,13 @@ struct SendCommand {}
impl Command for SendCommand {
fn help(&self) -> String {
let mut h = vec![];
h.push("Send HUSH to a given address");
h.push("Send HUSH to a given address(es)");
h.push("Usage:");
h.push("send <address> <amount in puposhis> \"optional_memo\"");
h.push("OR");
h.push("send '[{'address': <address>, 'amount': <amount in puposhis>, 'memo': <optional memo>}, ...]'");
h.push("");
h.push("NOTE: The fee required to send this transaction (currently HUSH 0.0001) is additionally detected from your balance.");
h.push("Example:");
h.push("send ztestsapling1x65nq4dgp0qfywgxcwk9n0fvm4fysmapgr2q00p85ju252h6l7mmxu2jg9cqqhtvzd69jwhgv8d 200000 \"Hello from the command line\"");
h.push("");
@@ -721,36 +722,6 @@ impl Command for NewAddressCommand {
}
}
struct NewSietchAddressCommand {}
impl Command for NewSietchAddressCommand {
fn help(&self) -> String {
let mut h = vec![];
h.push("New Sietch Address");
h.push("Usage:");
h.push("sietch [zs]");
h.push("");
h.push("Example:");
h.push("To create a new zdust:");
h.push("sietch zs");
h.join("\n")
}
fn short_help(&self) -> String {
"Create a sietch Address".to_string()
}
fn exec(&self, args: &[&str], lightclient: &LightClient) -> String {
if args.len() != 1 {
return format!("No address type specified\n{}", self.help());
}
match lightclient.do_new_sietchaddress(args[0]) {
Ok(j) => j,
Err(e) => object!{ "error" => e }
}.pretty(2)
}
}
struct NotesCommand {}
impl Command for NotesCommand {
fn help(&self) -> String {
@@ -861,7 +832,6 @@ pub fn get_commands() -> Box<HashMap<String, Box<dyn Command>>> {
map.insert("list".to_string(), Box::new(TransactionsCommand{}));
map.insert("notes".to_string(), Box::new(NotesCommand{}));
map.insert("new".to_string(), Box::new(NewAddressCommand{}));
map.insert("sietch".to_string(), Box::new(NewSietchAddressCommand{}));
map.insert("seed".to_string(), Box::new(SeedCommand{}));
map.insert("encrypt".to_string(), Box::new(EncryptCommand{}));
map.insert("decrypt".to_string(), Box::new(DecryptCommand{}));