X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=processor.py;h=8596625e7b92a8d53acaad3186818d48f616e918;hb=6037a6adcdb140a5a8b291d8d761bee2da320809;hp=5b8ebf263f8217d051ed7f9157c3467f47a41c7b;hpb=efc0e63020c5d4e6004064cd2f6dac021d4270fb;p=electrum-server.git

diff --git a/processor.py b/processor.py
index 5b8ebf2..8596625 100644
--- a/processor.py
+++ b/processor.py
@@ -138,7 +138,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
@@ -155,6 +166,10 @@ class RequestDispatcher(threading.Thread):
 
         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:
@@ -187,6 +202,7 @@ class Session:
         self.address = ''
         self.name = ''
         self.version = 'unknown'
+        self.protocol_version = 0.
         self.time = time.time()
         threading.Timer(2, self.info).start()
 
@@ -220,7 +236,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:
@@ -252,6 +270,9 @@ class ResponseDispatcher(threading.Thread):
         method = response.get('method')
         params = response.get('params')
 
+        if method == "blockchain.address.subscribe2":
+            method = "blockchain.address.subscribe"
+
         # A notification
         if internal_id is None: # and method is not None and params is not None:
             self.notification(method, params, response)