AaronFiore/electrum
1
0
Fork 0
Code Activity

fix restore from mpk command line

Browse Source
This commit is contained in:
ThomasV
2014-09-08 05:17:56 +02:00
parent ea9e468333
commit bd6f21232d
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum
View File

@@ -283,7 +283,10 @@ if __name__ == '__main__':
if cmd.name == 'restore': if cmd.name == 'restore':
if options.mpk: if options.mpk:
wallet = Wallet.from_mpk(options.mpk, storage) if Wallet.is_old_mpk(options.mpk):
wallet = Wallet.from_old_mpk(options.mpk, storage)
if Wallet.is_xpub(options.mpk):
wallet = Wallet.from_xpub(options.mpk, storage)
else: else:
import getpass import getpass
seed = getpass.getpass(prompt="seed:", stream=None) if options.concealed else raw_input("seed:") seed = getpass.getpass(prompt="seed:", stream=None) if options.concealed else raw_input("seed:")
@@ -295,7 +298,8 @@ if __name__ == '__main__':
wallet.create_main_account(password) wallet.create_main_account(password)
if not options.offline: if not options.offline:
network = Network(config) s = get_daemon(config, True)
network = NetworkProxy(s,config)
network.start() network.start()
wallet.start_threads(network) wallet.start_threads(network)
print_msg("Recovering wallet...") print_msg("Recovering wallet...")

6
lib/wallet.py
View File

@@ -1191,12 +1191,10 @@ class Deterministic_Wallet(Abstract_Wallet):
def wait_for_wallet(): def wait_for_wallet():
self.set_up_to_date(False) self.set_up_to_date(False)
while not self.is_up_to_date(): while not self.is_up_to_date():
msg = "%s\n%s %d\n%s %.1f"%( msg = "%s\n%s %d"%(
_("Please wait..."), _("Please wait..."),
_("Addresses generated:"), _("Addresses generated:"),
len(self.addresses(True)), len(self.addresses(True)))
_("Kilobytes received:"),
self.network.interface.bytes_received/1024.)
apply(callback, (msg,)) apply(callback, (msg,))
time.sleep(0.1) time.sleep(0.1)