Browse Source

sync for imported privkeys from 0

danger
DenioD 4 years ago
parent
commit
980c341d0e
  1. 9
      lib/src/commands.rs
  2. 4
      lib/src/lightclient.rs
  3. 2
      lib/src/lightwallet.rs

9
lib/src/commands.rs

@ -696,10 +696,13 @@ impl Command for TImportCommand {
}
fn exec(&self, args: &[&str], lightclient: &LightClient) -> String {
let key = args[0];
if args.len() < 1 || args.len() > 2 {
return format!("Insufficient arguments\n\n{}", self.help());
}
let r = match lightclient.do_import_tk(key.to_string()){
let key = args[0];
let r = match lightclient.do_import_tk(key.to_string(), 0) {
Ok(r) => r.pretty(2),
Err(e) => return format!("Error: {}", e),
};

4
lib/src/lightclient.rs

@ -1011,7 +1011,7 @@ impl LightClient {
}
/// Import a new private key
pub fn do_import_tk(&self, sk: String) -> Result<JsonValue, String> {
pub fn do_import_tk(&self, sk: String, birthday: u64) -> Result<JsonValue, String> {
if !self.wallet.read().unwrap().is_unlocked_for_spending() {
error!("Wallet is locked");
return Err("Wallet is locked".to_string());
@ -1020,7 +1020,7 @@ impl LightClient {
let new_address = {
let wallet = self.wallet.write().unwrap();
let addr = wallet.import_taddr(sk);
let addr = wallet.import_taddr(sk, birthday);
if addr.starts_with("Error") {
let e = format!("Error creating new address{}", addr);
error!("{}", e);

2
lib/src/lightwallet.rs

@ -628,7 +628,7 @@ impl LightWallet {
address
}
pub fn import_taddr(&self, sk: String) -> String {
pub fn import_taddr(&self, sk: String, birthday: u64) -> String {
if !self.unlocked {
return "Error: Can't add key while wallet is locked".to_string();
}

Loading…
Cancel
Save