revert pruning flag for default servers (too much complexity)

[electrum-nvc.git] / lib / interface.py

diff --git a/lib/interface.py b/lib/interface.py
index f27306e..d7235a0 100644 (file)
--- a/lib/interface.py
+++ b/lib/interface.py
@@ -20,20 +20,23 @@
 import random, socket, ast, re, ssl
 import threading, traceback, sys, time, json, Queue
 
-from version import ELECTRUM_VERSION
+from version import ELECTRUM_VERSION, PROTOCOL_VERSION
 from util import print_error
 
 
 DEFAULT_TIMEOUT = 5
 DEFAULT_SERVERS = [ 
+    #'electrum.bitcoins.sk:50001:t',
+    #'uncle-enzo.info:50001:t',
+    #'electrum.bitfoo.org:50001:t',
+    #'webbtc.net:50001:t',
+    'electrum.bitcoin.cz:50001:t',
     'electrum.novit.ro:50001:t', 
+    'electrum.be:50001:t',
+    'electrum.bysh.me:50001:t',
     'electrum.pdmc.net:50001:t',
-    'ecdsa.org:50001:t',
-    'electrum.bitcoins.sk:50001:t',
-    'uncle-enzo.info:50001:t',
-    'electrum.bytesized-hosting.com:50001:t',
-    'electrum.bitcoin.cz:50001:t',
-    'electrum.bitfoo.org:50001:t'
+    'electrum.no-ip.org:50001:t',
+    'ecdsa.org:50001:t'
     ]
 
 proxy_modes = ['socks4', 'socks5', 'http']
@@ -82,6 +85,12 @@ class Interface(threading.Thread):
         
         if error:
             print_error("received error:", c)
+            if msg_id is not None:
+                with self.lock: 
+                    method, params, channel = self.unanswered_requests.pop(msg_id)
+                response_queue = self.responses[channel]
+                response_queue.put({'method':method, 'params':params, 'error':error, 'id':msg_id})
+
             return
 
         if msg_id is not None:
@@ -93,24 +102,27 @@ class Interface(threading.Thread):
                 self.server_version = result
 
             elif method == 'server.peers.subscribe':
-                servers = []
+                servers = {}
                 for item in result:
                     s = []
                     host = item[1]
                     ports = []
                     version = None
+                    pruning = False
                     if len(item) > 2:
                         for v in item[2]:
                             if re.match("[stgh]\d+", v):
                                 ports.append((v[0], v[1:]))
-                            if re.match("v(.?)+", v):
+                            elif re.match("v(.?)+", v):
                                 version = v[1:]
+                            elif v == 'p':
+                                pruning = True
                     try: 
-                        is_recent = float(version)>=0.5
-                    except: 
+                        is_recent = float(version)>=float(PROTOCOL_VERSION)
+                    except:
                         is_recent = False
                     if ports and is_recent:
-                        servers.append((host, ports))
+                        servers[host] = {'ports':ports, 'pruning':pruning}
                 self.servers = servers
                 self.trigger_callback('peers')
 
@@ -293,7 +305,7 @@ class Interface(threading.Thread):
 
                 if timeout:
                     # ping the server with server.version, as a real ping does not exist yet
-                    self.send([('server.version', [ELECTRUM_VERSION])])
+                    self.send([('server.version', [ELECTRUM_VERSION, PROTOCOL_VERSION])])
                     continue
 
                 out += msg
@@ -341,6 +353,8 @@ class Interface(threading.Thread):
 
 
     def __init__(self, config=None, loop=False):
+        self.server = None
+        self.proxy = None
 
         if config is None:
             from simple_config import SimpleConfig
@@ -359,7 +373,7 @@ class Interface(threading.Thread):
         self.callbacks = {}
         self.lock = threading.Lock()
 
-        self.servers = [] # actual list from IRC
+        self.servers = {} # actual list from IRC
         self.rtime = 0
         self.bytes_received = 0
 
@@ -388,7 +402,7 @@ class Interface(threading.Thread):
 
         self.connect_event.set()
         if self.is_connected:
-            self.send([('server.version', [ELECTRUM_VERSION])])
+            self.send([('server.version', [ELECTRUM_VERSION, PROTOCOL_VERSION])])
             self.trigger_callback('connected')
         else:
             self.trigger_callback('notconnected')
@@ -482,6 +496,33 @@ class Interface(threading.Thread):
             self.is_connected = False  # this exits the polling loop
             self.trigger_callback('disconnecting') # for actively disconnecting
 
+    def stop(self):
+        if self.protocol in 'st' and self.s:
+            self.s.shutdown(socket.SHUT_RDWR)
+            self.s.close()
+
+
+    def get_servers_list(self):
+        plist = {}
+        if not self.servers:
+            servers_list = {}
+            for x in DEFAULT_SERVERS:
+                h,port,protocol = x.split(':')
+                servers_list[h] = {'ports':[(protocol,port)]}
+        else:
+            servers_list = self.servers
+        
+        for _host, v in servers_list.items():
+            pp = v['ports']
+            z = {}
+            for item2 in pp:
+                _protocol, _port = item2
+                z[_protocol] = _port
+            plist[_host] = z
+                
+        return plist, servers_list
+
+
     def is_empty(self, channel):
         q = self.responses.get(channel)
         if q: