default port

client/gui_qt.py

@@ -787,7 +787,8 @@ class ElectrumWindow(QMainWindow):
             show_message("no seed")
             sys.exit(1)
         
-        wallet.seed = seed
+        wallet.seed = str(seed)
+        #print repr(wallet.seed)
         wallet.gap_limit = gap
         return True
 
@@ -840,7 +841,7 @@ class ElectrumWindow(QMainWindow):
             import random
             status = "Please choose a server."
             host = random.choice( interface.servers )
-            port = 50000
+            port = wallet.default_port
 
         d = QDialog(parent)
         d.setModal(1)
@@ -869,7 +870,7 @@ class ElectrumWindow(QMainWindow):
         servers_list.setMaximumHeight(150)
         for item in wallet.interface.servers:
             servers_list.addTopLevelItem(QTreeWidgetItem( [ item ] ))
-        servers_list.connect(servers_list, SIGNAL('itemClicked(QTreeWidgetItem*, int)'), lambda x:host_line.setText( x.text(0) + ':50000' ))
+        servers_list.connect(servers_list, SIGNAL('itemClicked(QTreeWidgetItem*, int)'), lambda x:host_line.setText( x.text(0) + ':%d'%wallet.default_port ))
         vbox.addWidget(servers_list)
 
         vbox.addLayout(ok_cancel_buttons(d))
@@ -884,7 +885,7 @@ class ElectrumWindow(QMainWindow):
                 port = int(port)
             else:
                 host = hh
-                port = 50000
+                port = wallet.default_port
         except:
             show_message("error")
             if parent == None:
@@ -925,7 +926,7 @@ class ElectrumGui():
         else:
             # ask for seed and gap.
             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()
 
             if wallet.is_found():

client/interface.py

@@ -22,13 +22,13 @@ import random, socket, ast
         
 import thread, traceback, sys, time, json
 
-DEFAULT_TIMEOUT=5
+DEFAULT_TIMEOUT = 5
+DEFAULT_SERVERS = ['ecdsa.org','electrum.novit.ro']  # list of default servers
+
 
 class Interface:
     def __init__(self):
-        self.default_servers = ['ecdsa.org','electrum.novit.ro']  # list of default servers
-        self.host = random.choice( self.default_servers )         # random choice when the wallet is created
-        self.servers = self.default_servers                       # actual list from IRC
+        self.servers = DEFAULT_SERVERS                            # actual list from IRC
         self.rtime = 0
         self.blocks = 0 
         self.message = ''
@@ -330,8 +330,12 @@ class TCPInterface(Interface):
 
 
 def new_interface(wallet):
-    host = wallet.host
+    if wallet.host:
+        host = wallet.host
+    else:
+        host = random.choice( DEFAULT_SERVERS )         # random choice when the wallet is created
     port = wallet.port
+
     if port == 50000:
         interface = NativeInterface(host,port)
     elif port == 50001:

client/wallet.py

@@ -263,6 +263,7 @@ class Wallet:
 
         self.imported_keys = {}
         self.remote_url = None
+        self.default_port = 50001
 
 
     def set_server(self, host, port):
@@ -558,8 +559,8 @@ class Wallet:
             data = f.read()
             f.close()
         except:
-            #self.interface = NativeInterface()
-            self.port = 50000
+            self.host = ''
+            self.port = self.default_port
             return
         try:
             d = ast.literal_eval( data )