new database format, that handles p2sh addresses

[electrum-server.git] / backends / bitcoind / blockchain_processor.py

diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py
index cb64178..3f53dfb 100644 (file)
--- a/backends/bitcoind/blockchain_processor.py
+++ b/backends/bitcoind/blockchain_processor.py
@@ -57,6 +57,15 @@ class BlockchainProcessor(Processor):
         self.sent_header = None
 
         try:
+            hash_160 = bc_address_to_hash_160("1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa")
+            self.db.Get(hash_160)
+            print_log("Your database '%s' is deprecated. Please create a new database"%self.dbpath)
+            self.shared.stop()
+            return
+        except:
+            pass
+
+        try:
             hist = self.deserialize(self.db.Get('height'))
             self.last_hash, self.height, _ = hist[0]
             print_log("hist", hist)
@@ -236,15 +245,14 @@ class BlockchainProcessor(Processor):
 
         with self.dblock:
             try:
-                hash_160 = bc_address_to_hash_160(addr)
-                hist = self.deserialize(self.db.Get(hash_160))
+                hist = self.deserialize(self.db.Get(addr))
                 is_known = True
             except:
                 hist = []
                 is_known = False
 
         # should not be necessary
-        hist.sort(key=lambda tup: tup[1])
+        hist.sort(key=lambda tup: tup[2])
         # check uniqueness too...
 
         # add memory pool
@@ -414,8 +422,7 @@ class BlockchainProcessor(Processor):
         # read histories of addresses
         for txid, tx in txdict.items():
             for x in tx.get('outputs'):
-                hash_160 = bc_address_to_hash_160(x.get('address'))
-                addr_to_read.append(hash_160)
+                addr_to_read.append(x.get('address'))
 
         addr_to_read.sort()
         for addr in addr_to_read:
@@ -446,13 +453,11 @@ class BlockchainProcessor(Processor):
                 undo_info[txid] = undo
 
                 for x in tx.get('outputs'):
-                    hash_160 = bc_address_to_hash_160(x.get('address'))
-                    self.add_to_history(hash_160, txid, x.get('index'), block_height)
+                    self.add_to_history(x.get('address'), txid, x.get('index'), block_height)
 
             else:
                 for x in tx.get('outputs'):
-                    hash_160 = bc_address_to_hash_160(x.get('address'))
-                    self.remove_from_history(hash_160, txid, x.get('index'))
+                    self.remove_from_history(x.get('address'), txid, x.get('index'))
 
                 i = 0
                 for x in tx.get('inputs'):
@@ -465,7 +470,7 @@ class BlockchainProcessor(Processor):
 
                     # re-add them to the history
                     self.add_to_history(prevout_addr, x.get('prevout_hash'), x.get('prevout_n'), prevout_height)
-                    # print_log("new hist for", hash_160_to_bc_address(prevout_addr), self.deserialize(self.batch_list[prevout_addr]) )
+                    # print_log("new hist for", prevout_addr, self.deserialize(self.batch_list[prevout_addr]) )
 
         # write
         max_len = 0
@@ -510,10 +515,9 @@ class BlockchainProcessor(Processor):
                       "read:%0.2f " % (t1 - t00),
                       "proc:%.2f " % (t2-t1),
                       "write:%.2f " % (t3-t2),
-                      "max:", max_len, hash_160_to_bc_address(max_addr))
+                      "max:", max_len, max_addr)
 
-        for h160 in self.batch_list.keys():
-            addr = hash_160_to_bc_address(h160)
+        for addr in self.batch_list.keys():
             self.invalidate_cache(addr)
 
     def add_request(self, request):
@@ -551,7 +555,7 @@ class BlockchainProcessor(Processor):
                 address = params[1]
                 if password == self.config.get('server', 'password'):
                     self.watched_addresses.remove(address)
-                    print_log('unsubscribed', address)
+                    # print_log('unsubscribed', address)
                     result = "ok"
                 else:
                     print_log('incorrect password')
@@ -608,8 +612,8 @@ class BlockchainProcessor(Processor):
                     tx_height = params[1]
                     result = self.get_merkle(tx_hash, tx_height)
                 except BaseException, e:
-                    error = str(e) + ': ' + tx_hash
-                    print_log("error:", error)
+                    error = str(e) + ': ' + repr(params)
+                    print_log("get_merkle error:", error)
 
         elif method == 'blockchain.transaction.get':
             try:
@@ -617,8 +621,8 @@ class BlockchainProcessor(Processor):
                 height = params[1]
                 result = self.bitcoind('getrawtransaction', [tx_hash, 0, height])
             except BaseException, e:
-                error = str(e) + ': ' + tx_hash
-                print_log("error:", error)
+                error = str(e) + ': ' + repr(params)
+                print_log("tx get error:", error)
 
         else:
             error = "unknown method:%s" % method
@@ -627,10 +631,9 @@ class BlockchainProcessor(Processor):
             return -1
 
         if error:
-            response = {'id': message_id, 'error': error}
+            self.push_response({'id': message_id, 'error': error})
         elif result != '':
-            response = {'id': message_id, 'result': result}
-        self.push_response(response)
+            self.push_response({'id': message_id, 'result': result})
 
     def watch_address(self, addr):
         if addr not in self.watched_addresses:
@@ -698,8 +701,7 @@ class BlockchainProcessor(Processor):
             for x in tx.get('inputs'):
                 txi = (x.get('prevout_hash') + int_to_hex(x.get('prevout_n'), 4)).decode('hex')
                 try:
-                    h160 = self.db.Get(txi)
-                    addr = hash_160_to_bc_address(h160)
+                    addr = self.db.Get(txi)
                 except:
                     continue
                 l = self.mempool_addresses.get(tx_hash, [])
@@ -724,7 +726,7 @@ class BlockchainProcessor(Processor):
             if tx_hash not in self.mempool_hashes:
                 self.mempool_addresses.pop(tx_hash)
 
-        # rebuild histories
+        # rebuild mempool histories
         new_mempool_hist = {}
         for tx_hash, addresses in self.mempool_addresses.items():
             for addr in addresses:
@@ -733,6 +735,7 @@ class BlockchainProcessor(Processor):
                     h.append(tx_hash)
                 new_mempool_hist[addr] = h
 
+        # invalidate cache for mempool addresses whose mempool history has changed
         for addr in new_mempool_hist.keys():
             if addr in self.mempool_hist.keys():
                 if self.mempool_hist[addr] != new_mempool_hist[addr]:
@@ -740,12 +743,19 @@ class BlockchainProcessor(Processor):
             else:
                 self.invalidate_cache(addr)
 
+        # invalidate cache for addresses that are removed from mempool ?
+        # this should not be necessary if they go into a block, but they might not
+        for addr in self.mempool_hist.keys():
+            if addr not in new_mempool_hist.keys():
+                self.invalidate_cache(addr)
+        
+
         with self.mempool_lock:
             self.mempool_hist = new_mempool_hist
 
     def invalidate_cache(self, address):
         with self.cache_lock:
-            if 'address' in self.history_cache:
+            if address in self.history_cache:
                 print_log("cache: invalidating", address)
                 self.history_cache.pop(address)