getmemorypool != database; use db to set address_has_mempool

[electrum-server.git] / server.py

diff --git a/server.py b/server.py
index 1769edf..2e8f000 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -20,6 +20,8 @@ Todo:
    * server should check and return bitcoind status..
    * improve txpoint sorting
    * command to check cache
+
+ mempool transactions do not need to be added to the database; it slows it down
 """
 
 
@@ -73,14 +75,14 @@ class MyStore(Datastore_class):
             _hash = store.binout(row[6])
             address = hash_to_address(chr(0), _hash)
             if self.tx_cache.has_key(address):
-                print "cache: invalidating", address, self.ismempool
+                print "cache: invalidating", address
                 self.tx_cache.pop(address)
         outrows = self.get_tx_outputs(txid, False)
         for row in outrows:
             _hash = store.binout(row[6])
             address = hash_to_address(chr(0), _hash)
             if self.tx_cache.has_key(address):
-                print "cache: invalidating", address, self.ismempool
+                print "cache: invalidating", address
                 self.tx_cache.pop(address)
 
     def safe_sql(self,sql, params=(), lock=True):
@@ -250,14 +252,20 @@ class MyStore(Datastore_class):
             if tx_hash in known_tx:
                 continue
 
+            # this means that pending transactions were added to the db, even if they are not returned by getmemorypool
             address_has_mempool = True
+
+            # this means pending transactions are returned by getmemorypool
+            if tx_hash not in self.mempool_keys:
+                continue
+
             #print "mempool", tx_hash
             txpoint = {
                     "nTime":    0,
                     #"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 +312,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):
@@ -354,7 +355,7 @@ def client_thread(ipaddr,conn):
         try:
             cmd, data = ast.literal_eval(msg[:-1])
         except:
-            print "syntax error", repr(msg)
+            print "syntax error", repr(msg), ipaddr
             conn.close()
             return
 
@@ -369,14 +370,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 +392,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 +414,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,13 +448,13 @@ def client_thread(ipaddr,conn):
             else:
                 out = 'wrong password'
 
-        elif cmd =='tx':        
+        elif cmd =='tx':
             out = send_tx(data)
             print "sent tx:", out
 
         elif cmd =='clear_cache':
             if config.get('server','password') == data:
-                self.tx_cache = {}
+                store.tx_cache = {}
                 out = 'ok'
             else:
                 out = 'wrong password'
@@ -491,6 +504,7 @@ ds = BCDataStream.BCDataStream()
 
 
 def memorypool_update(store):
+    store.mempool_keys = []
     conn = bitcoinrpc.connect_to_local()
     try:
         v = conn.getmemorypool()
@@ -503,17 +517,17 @@ def memorypool_update(store):
         ds.write(hextx.decode('hex'))
         tx = deserialize.parse_Transaction(ds)
         tx['hash'] = util.double_sha256(tx['tx'])
+        tx_hash = tx['hash'][::-1].encode('hex')
+        store.mempool_keys.append(tx_hash)
         if store.tx_find_id_and_value(tx):
             pass
         else:
-            #print "new tx", tx['hash'][::-1].encode('hex')
             store.import_tx(tx, False)
 
     store.commit()
 
 
 
-
 def clean_session_thread():
     while not stopping:
         time.sleep(30)
@@ -521,7 +535,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)
             
 
@@ -616,7 +630,7 @@ if __name__ == '__main__':
        args.connect_args = { 'database' : config.get('database','database') }
     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, ())
@@ -627,9 +641,7 @@ if __name__ == '__main__':
         try:
             dblock.acquire()
             store.catch_up()
-            store.ismempool = True
             memorypool_update(store)
-            store.ismempool = False
             block_number = store.get_block_number(1)
             dblock.release()
         except: