fix varnames, and run updates on creation
This commit is contained in:
parent
0532264ff1
commit
34fb60ba39
|
@ -112,12 +112,12 @@ if __name__ == '__main__':
|
||||||
else:
|
else:
|
||||||
password = None
|
password = None
|
||||||
|
|
||||||
host = raw_input("server (default:%s):"%interface.host)
|
host = raw_input("server (default:%s):"%wallet.host)
|
||||||
port = raw_input("port (default:%d):"%interface.port)
|
port = raw_input("port (default:%d):"%wallet.port)
|
||||||
fee = raw_input("fee (default:%s):"%( str(Decimal(wallet.fee)/100000000)) )
|
fee = raw_input("fee (default:%s):"%( str(Decimal(wallet.fee)/100000000)) )
|
||||||
gap = raw_input("gap limit (default 5):")
|
gap = raw_input("gap limit (default 5):")
|
||||||
if host: interface.host = host
|
if host: wallet.host = host
|
||||||
if port: interface.port = int(port)
|
if port: wallet.port = int(port)
|
||||||
if fee: wallet.fee = float(fee)
|
if fee: wallet.fee = float(fee)
|
||||||
if gap: wallet.gap_limit = int(gap)
|
if gap: wallet.gap_limit = int(gap)
|
||||||
|
|
||||||
|
@ -133,6 +133,7 @@ if __name__ == '__main__':
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
wallet.seed = str(seed)
|
wallet.seed = str(seed)
|
||||||
|
wallet.start_interface()
|
||||||
print "recovering wallet..."
|
print "recovering wallet..."
|
||||||
wallet.init_mpk( wallet.seed ) # not encrypted at this point
|
wallet.init_mpk( wallet.seed ) # not encrypted at this point
|
||||||
wallet.synchronize()
|
wallet.synchronize()
|
||||||
|
|
|
@ -925,8 +925,9 @@ class ElectrumGui():
|
||||||
|
|
||||||
if not is_recovery:
|
if not is_recovery:
|
||||||
wallet.new_seed(None)
|
wallet.new_seed(None)
|
||||||
# generate first key
|
wallet.init_mpk( wallet.seed )
|
||||||
#wallet.synchronize()
|
wallet.up_to_date_event.clear()
|
||||||
|
wallet.update()
|
||||||
# run a dialog indicating the seed, ask the user to remember it
|
# run a dialog indicating the seed, ask the user to remember it
|
||||||
ElectrumWindow.show_seed_dialog(wallet)
|
ElectrumWindow.show_seed_dialog(wallet)
|
||||||
#ask for password
|
#ask for password
|
||||||
|
@ -936,6 +937,8 @@ class ElectrumGui():
|
||||||
if not ElectrumWindow.seed_dialog( wallet ): return False
|
if not ElectrumWindow.seed_dialog( wallet ): return False
|
||||||
wallet.init_mpk( wallet.seed ) # not encrypted at this point
|
wallet.init_mpk( wallet.seed ) # not encrypted at this point
|
||||||
#wallet.synchronize()
|
#wallet.synchronize()
|
||||||
|
wallet.up_to_date_event.clear()
|
||||||
|
wallet.update()
|
||||||
|
|
||||||
if wallet.is_found():
|
if wallet.is_found():
|
||||||
# history and addressbook
|
# history and addressbook
|
||||||
|
|
|
@ -1023,4 +1023,4 @@ class Wallet:
|
||||||
addresses = self.all_addresses()
|
addresses = self.all_addresses()
|
||||||
version = self.electrum_version
|
version = self.electrum_version
|
||||||
self.interface.start_session(addresses, version)
|
self.interface.start_session(addresses, version)
|
||||||
print "Starting new session: %s:%d"%(self.host,self.port)
|
#print "Starting new session: %s:%d"%(self.host,self.port)
|
||||||
|
|
Loading…
Reference in New Issue