maintain a list of mempool keys; the database might contain rejected transactions

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 1769edf..732a8f9 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -249,6 +249,8 @@ class MyStore(Datastore_class):
             tx_hash = self.hashout_hex(tx_hash)
             if tx_hash in known_tx:
                 continue
+            if tx_hash not in self.mempool_keys:
+                continue
 
             address_has_mempool = True
             #print "mempool", tx_hash
@@ -257,7 +259,7 @@ class MyStore(Datastore_class):
                     #"chain_id": 1,
                     "height":   0,
                     "is_in":    int(is_in),
-                    "blk_hash": 'mempool', #':%s'%tx_hash,
+                    "blk_hash": 'mempool', 
                     "tx_hash":  tx_hash,
                     "tx_id":    int(tx_id),
                     "pos":      int(pos),
@@ -304,13 +306,6 @@ class MyStore(Datastore_class):
         return txpoints
 
 
-    def get_status(self, addr):
-        # last block for an address.
-        tx_points = self.get_txpoints(addr)
-        if not tx_points:
-            return None
-        else:
-            return tx_points[-1]['blk_hash']
 
 
 def send_tx(tx):
@@ -369,14 +364,15 @@ def client_thread(ipaddr,conn):
                     version = "old"
                 else:
                     version, addresses = ast.literal_eval(data)
+                    version = "v"+version
             except:
-                print "error"
+                print "error", data
                 conn.close()
                 return
 
-            print time.asctime(), "new session", version, ipaddr, session_id, addresses[0] if addresses else addresses, len(addresses)
+            print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "new session", ipaddr, addresses[0] if addresses else addresses, len(addresses), version
 
-            sessions[session_id] = { 'addresses':{}, 'version':version }
+            sessions[session_id] = { 'addresses':{}, 'version':version, 'ip':ipaddr }
             for a in addresses:
                 sessions[session_id]['addresses'][a] = ''
             out = repr( (session_id, config.get('server','banner').replace('\\n','\n') ) )
@@ -390,7 +386,7 @@ def client_thread(ipaddr,conn):
                 conn.close()
                 return
 
-            print time.asctime(), "update session", ipaddr, session_id, addresses[0] if addresses else addresses, len(addresses)
+            print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "update session", ipaddr, addresses[0] if addresses else addresses, len(addresses)
 
             sessions[session_id]['addresses'] = {}
             for a in addresses:
@@ -412,7 +408,18 @@ def client_thread(ipaddr,conn):
                 k = 0
                 for addr in addresses:
                     if store.tx_cache.get( addr ) is not None: k += 1
-                    status = store.get_status( addr )
+
+                    # get addtess status, i.e. the last block for that address.
+                    tx_points = store.get_txpoints(addr)
+                    if not tx_points:
+                        status = None
+                    else:
+                        lastpoint = tx_points[-1]
+                        status = lastpoint['blk_hash']
+                        # this is a temporary hack; move it up once old clients have disappeared
+                        if status == 'mempool' and session['version'] != "old":
+                            status = status + ':%s'% lastpoint['tx_hash']
+
                     last_status = addresses.get( addr )
                     if last_status != status:
                         addresses[addr] = status
@@ -435,7 +442,7 @@ def client_thread(ipaddr,conn):
             else:
                 out = 'wrong password'
 
-        elif cmd =='tx':        
+        elif cmd =='tx':
             out = send_tx(data)
             print "sent tx:", out
 
@@ -491,6 +498,7 @@ ds = BCDataStream.BCDataStream()
 
 
 def memorypool_update(store):
+    store.mempool_keys = []
     conn = bitcoinrpc.connect_to_local()
     try:
         v = conn.getmemorypool()
@@ -503,17 +511,16 @@ def memorypool_update(store):
         ds.write(hextx.decode('hex'))
         tx = deserialize.parse_Transaction(ds)
         tx['hash'] = util.double_sha256(tx['tx'])
+        store.mempool_keys.append(tx['hash'][::-1].encode('hex'))
         if store.tx_find_id_and_value(tx):
             pass
-        else:
-            #print "new tx", tx['hash'][::-1].encode('hex')
+        else:            
             store.import_tx(tx, False)
 
     store.commit()
 
 
 
-
 def clean_session_thread():
     while not stopping:
         time.sleep(30)
@@ -521,7 +528,7 @@ def clean_session_thread():
         for k,s in sessions.items():
             t0 = s['last_time']
             if t - t0 > 5*60:
-                print time.asctime(), "lost session",k
+                print time.strftime("[%d/%m/%Y-%H:%M:%S]"), "end session", s['ip']
                 sessions.pop(k)
             
 
@@ -617,6 +624,7 @@ if __name__ == '__main__':
     store = MyStore(args)
     store.tx_cache = {}
     store.ismempool = False
+    store.mempool_keys = {}
 
     thread.start_new_thread(listen_thread, (store,))
     thread.start_new_thread(clean_session_thread, ())