X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=processor.py;h=dfe61285ba17a63206aad8821086aa87284cade4;hb=827d26f24ef2148c4eb22bab764a7b2798233334;hp=96fb3c2d0e727d9c7c1e25e9e9c17bea9f8507dd;hpb=9d26d0c3417e94a653136589dd744c45576c6928;p=electrum-server.git

diff --git a/processor.py b/processor.py
index 96fb3c2..dfe6128 100644
--- a/processor.py
+++ b/processor.py
@@ -40,6 +40,9 @@ class Processor(threading.Thread):
     def process(self, request):
         pass
 
+    def add_request(self, request):
+        self.queue.put(request)
+
     def push_response(self, response):
         #print "response", response
         self.dispatcher.request_dispatcher.push_response(response)
@@ -121,7 +124,11 @@ class RequestDispatcher(threading.Thread):
             raise TypeError("self.shared not set in Processor")
         while not self.shared.stopped():
             session, request = self.pop_request()
-            self.do_dispatch(session, request)
+            try:
+                self.do_dispatch(session, request)
+            except:
+                traceback.print_exc(file=sys.stdout)
+                
 
         self.stop()
 
@@ -134,7 +141,18 @@ class RequestDispatcher(threading.Thread):
         method = request['method']
         params = request.get('params',[])
         suffix = method.split('.')[-1]
+
+        is_new = session.protocol_version >= 0.5
+
+        if is_new and method == 'blockchain.address.get_history': 
+            method = 'blockchain.address.get_history2'
+            request['method'] = method
+
         if suffix == 'subscribe':
+            if is_new and method == 'blockchain.address.subscribe': 
+                method = 'blockchain.address.subscribe2'
+                request['method'] = method
+
             session.subscribe_to_service(method, params)
 
         # store session and id locally
@@ -147,10 +165,14 @@ class RequestDispatcher(threading.Thread):
             print "error: no processor for", prefix
             return
 
-        p.queue.put(request)
+        p.add_request(request)
 
         if method in ['server.version']:
             session.version = params[0]
+            try:
+                session.protocol_version = float(params[1])
+            except:
+                pass
 
     def get_sessions(self):
         with self.lock:
@@ -183,6 +205,7 @@ class Session:
         self.address = ''
         self.name = ''
         self.version = 'unknown'
+        self.protocol_version = 0.
         self.time = time.time()
         threading.Timer(2, self.info).start()
 
@@ -216,7 +239,9 @@ class Session:
     def build_subdesc(method, params):
         if method == "blockchain.numblocks.subscribe":
             return method,
-        elif method == "blockchain.address.subscribe":
+        elif method == "blockchain.headers.subscribe":
+            return method,
+        elif method in ["blockchain.address.subscribe", "blockchain.address.subscribe2"]:
             if not params:
                 return None
             else:
@@ -263,6 +288,8 @@ class ResponseDispatcher(threading.Thread):
             if session.stopped():
                 continue
             if session.contains_subscription(subdesc):
+                if response.get('method') == "blockchain.address.subscribe2":
+                    response['method'] = "blockchain.address.subscribe"
                 session.send_response(response)
 
     def send_response(self, internal_id, response):