Browse Source

fix restore messages

283
ThomasV 9 years ago
parent
commit
5b96d5166e
  1. 2
      electrum
  2. 10
      lib/commands.py

2
electrum

@ -233,7 +233,7 @@ def run_command(config, network, password):
# create wallet instance # create wallet instance
wallet = Wallet(storage) if cmd.requires_wallet else None wallet = Wallet(storage) if cmd.requires_wallet else None
# start threads # start threads
if network: if wallet and network:
wallet.start_threads(network) wallet.start_threads(network)
# arguments passed to function # arguments passed to function
args = map(lambda x: config.get(x), cmd.params) args = map(lambda x: config.get(x), cmd.params)

10
lib/commands.py

@ -109,11 +109,11 @@ class Commands:
public key, a master private key, a list of bitcoin addresses public key, a master private key, a list of bitcoin addresses
or bitcoin private keys. If you want to be prompted for your or bitcoin private keys. If you want to be prompted for your
seed, type '?' or ':' (concealed) """ seed, type '?' or ':' (concealed) """
self.wallet.restore(lambda x: print_msg(x)) self.wallet.restore(lambda x: x)
#self.wallet.synchronize() if self.network:
msg = "Recovery successful" if self.wallet.is_found() else "Warning: Found no history for this wallet" msg = "Recovery successful" if self.wallet.is_found() else "Found no history for this wallet"
if not self.network: else:
msg += "\nWarning: This wallet was restored offline. It may contain more addresses than displayed." msg = "This wallet was restored offline. It may contain more addresses than displayed."
return msg return msg
@command('w') @command('w')

Loading…
Cancel
Save