add two update methods for processor

[electrum-server.git] / stratum.py

diff --git a/stratum.py b/stratum.py
index a8a0e0c..ffc3d1f 100644 (file)
--- a/stratum.py
+++ b/stratum.py
@@ -61,6 +61,29 @@ class Processor(threading.Thread):
         # When ready, you call
         # self.push_response(session,response)
 
+    def update_from_blocknum(self,block_number):
+        for session in self.sessions:
+            if session.numblocks_sub is not None:
+                response = { 'id':session.numblocks_sub, 'result':block_number }
+                self.push_response(session,response)
+
+    def update_from_address(self,addr):
+        for session in self.sessions:
+            m = session.addresses_sub.get(addr)
+            if m:
+                status = self.get_status( addr )
+                message_id, last_status = m
+                if status != last_status:
+                    session.subscribe_to_address(message_id, status)
+                    response = { 'id':message_id, 'result':status }
+                    self.push_response(session,response)
+
+    def get_status(self,addr):
+        # return status of an address
+        # return store.get_status(addr)
+        pass
+
+
 class Session:
 
     def __init__(self, connection, address):
@@ -70,6 +93,7 @@ class Session:
         self.lock = threading.Lock()
         self.numblocks_sub = None
         self.addresses_sub = {}
+        print "new session", address
 
     def stop(self):
         self._connection.close()
@@ -110,8 +134,8 @@ class TcpResponder(threading.Thread):
             # Possible race condition here by having session
             # close connection?
             # I assume Python connections are thread safe interfaces
-            connection = session.connection()
             try:
+                connection = session.connection()
                 connection.send(raw_response + "\n")
             except:
                 session.stop()
@@ -128,7 +152,6 @@ class TcpClientRequestor(threading.Thread):
     def run(self):
         while not self.shared.stopped():
             if not self.update():
-                self.session.stop()
                 break
 
             while self.parse():
@@ -136,7 +159,7 @@ class TcpClientRequestor(threading.Thread):
 
     def update(self):
         data = self.receive()
-        if data is None:
+        if not data:
             # close_session
             self.session.stop()
             return False
@@ -148,7 +171,7 @@ class TcpClientRequestor(threading.Thread):
         try:
             return self.session.connection().recv(1024)
         except socket.error:
-            return None
+            return ''
 
     def parse(self):
         raw_buffer = self.message.find('\n')
@@ -230,7 +253,7 @@ class Stratum:
         processor.shared = shared
         processor.start()
         # Create various transports we need
-        transports = TcpServer(shared, processor, "ecdsa.org", 50002),
+        transports = TcpServer(shared, processor, "176.31.24.241", 50001),
         for server in transports:
             server.start()
         while not shared.stopped():