electrum

commit 34fb60ba398a3a84acddb9b171c7916b25fcf4d1
parent 0532264ff1986578a5780b07b4a62f6b0a98ecfe
Author: ThomasV <thomasv@gitorious>
Date:   Fri, 23 Mar 2012 18:46:50 +0100

fix varnames, and run updates on creation

Diffstat:
M
client/electrum
 | 
9
+++++----
M
client/gui_qt.py
 | 
7
+++++--
M
client/wallet.py
 | 
2
+-

3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/client/electrum b/client/electrum
@@ -112,12 +112,12 @@ if __name__ == '__main__':
         else:
             password = None
 
-        host = raw_input("server (default:%s):"%interface.host)
-        port = raw_input("port (default:%d):"%interface.port)
+        host = raw_input("server (default:%s):"%wallet.host)
+        port = raw_input("port (default:%d):"%wallet.port)
         fee = raw_input("fee (default:%s):"%( str(Decimal(wallet.fee)/100000000)) )
         gap = raw_input("gap limit (default 5):")
-        if host: interface.host = host
-        if port: interface.port = int(port)
+        if host: wallet.host = host
+        if port: wallet.port = int(port)
         if fee: wallet.fee = float(fee)
         if gap: wallet.gap_limit = int(gap)
 
@@ -133,6 +133,7 @@ if __name__ == '__main__':
                 sys.exit(1)
 
             wallet.seed = str(seed)
+            wallet.start_interface()
             print "recovering wallet..."
             wallet.init_mpk( wallet.seed ) # not encrypted at this point
             wallet.synchronize()
diff --git a/client/gui_qt.py b/client/gui_qt.py
@@ -925,8 +925,9 @@ class ElectrumGui():
 
         if not is_recovery:
             wallet.new_seed(None)
-            # generate first key
-            #wallet.synchronize()
+            wallet.init_mpk( wallet.seed )
+            wallet.up_to_date_event.clear()
+            wallet.update()
             # run a dialog indicating the seed, ask the user to remember it
             ElectrumWindow.show_seed_dialog(wallet)
             #ask for password
@@ -936,6 +937,8 @@ class ElectrumGui():
             if not ElectrumWindow.seed_dialog( wallet ): return False
             wallet.init_mpk( wallet.seed )  # not encrypted at this point
             #wallet.synchronize()
+            wallet.up_to_date_event.clear()
+            wallet.update()
 
             if wallet.is_found():
                 # history and addressbook
diff --git a/client/wallet.py b/client/wallet.py
@@ -1023,4 +1023,4 @@ class Wallet:
         addresses = self.all_addresses()
         version = self.electrum_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)