X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=backends%2Fbitcoind%2Fblockchain_processor.py;h=174d18611ff564629dc3690e9dbb8a22c4bb8505;hb=565e2858aff58e882c62719fced34a1679161011;hp=c6965d824cd70036863d45631ea03359a3fa427a;hpb=7527c8563c61630353d34c98002245c6b3dcd035;p=electrum-server.git diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py index c6965d8..174d186 100644 --- a/backends/bitcoind/blockchain_processor.py +++ b/backends/bitcoind/blockchain_processor.py @@ -53,6 +53,15 @@ class BlockchainProcessor(Processor): config.get('bitcoind', 'host'), config.get('bitcoind', 'port')) + while True: + try: + self.bitcoind('getinfo') + break + except: + print_log('cannot contact bitcoind...') + time.sleep(5) + continue + self.height = 0 self.is_test = False self.sent_height = 0 @@ -88,7 +97,9 @@ class BlockchainProcessor(Processor): shared.stop() sys.exit(0) - print_log("blockchain is up to date.") + print_log("Blockchain is up to date.") + self.memorypool_update() + print_log("Memory pool initialized.") threading.Timer(10, self.main_iteration).start() @@ -340,7 +351,7 @@ class BlockchainProcessor(Processor): for i in range(l-1, -1, -1): item = serialized_hist[80*i:80*(i+1)] item_height = int(rev_hex(item[36:39].encode('hex')), 16) - if item_height < tx_height: + if item_height <= tx_height: serialized_hist = serialized_hist[0:80*(i+1)] + s + serialized_hist[80*(i+1):] break else: @@ -427,6 +438,7 @@ class BlockchainProcessor(Processor): serialized_hist = serialized_hist[0:80*i] + new_item + serialized_hist[80*(i+1):] break else: + self.shared.stop() hist = self.deserialize(serialized_hist) raise BaseException("prevout not found", addr, hist, txi.encode('hex')) @@ -494,10 +506,14 @@ class BlockchainProcessor(Processor): for txi in block_inputs: try: addr = self.db.Get(txi) - except: - # print "addr not in db", txi.encode('hex') + except KeyError: # the input could come from the same block continue + except: + traceback.print_exc(file=sys.stdout) + self.shared.stop() + raise + self.batch_txio[txi] = addr addr_to_read.append(addr) @@ -526,8 +542,12 @@ class BlockchainProcessor(Processor): for addr in addr_to_read: try: self.batch_list[addr] = self.db.Get(addr) - except: + except KeyError: self.batch_list[addr] = '' + except: + traceback.print_exc(file=sys.stdout) + self.shared.stop() + raise # process @@ -807,6 +827,7 @@ class BlockchainProcessor(Processor): def memorypool_update(self): mempool_hashes = self.bitcoind('getrawmempool') + touched_addresses = [] for tx_hash in mempool_hashes: if tx_hash in self.mempool_hashes: continue @@ -815,24 +836,21 @@ class BlockchainProcessor(Processor): if not tx: continue + mpa = self.mempool_addresses.get(tx_hash, []) for x in tx.get('inputs'): - txi = (x.get('prevout_hash') + int_to_hex(x.get('prevout_n'), 4)).decode('hex') - try: - addr = self.db.Get(txi) - except: - continue - l = self.mempool_addresses.get(tx_hash, []) - if addr not in l: - l.append(addr) - self.mempool_addresses[tx_hash] = l + # we assume that the input address can be parsed by deserialize(); this is true for Electrum transactions + addr = x.get('address') + if addr and addr not in mpa: + mpa.append(addr) + touched_addresses.append(addr) for x in tx.get('outputs'): addr = x.get('address') - l = self.mempool_addresses.get(tx_hash, []) - if addr not in l: - l.append(addr) - self.mempool_addresses[tx_hash] = l + if addr and addr not in mpa: + mpa.append(addr) + touched_addresses.append(addr) + self.mempool_addresses[tx_hash] = mpa self.mempool_hashes.append(tx_hash) # remove older entries from mempool_hashes @@ -842,6 +860,8 @@ class BlockchainProcessor(Processor): for tx_hash, addresses in self.mempool_addresses.items(): if tx_hash not in self.mempool_hashes: self.mempool_addresses.pop(tx_hash) + for addr in addresses: + touched_addresses.append(addr) # rebuild mempool histories new_mempool_hist = {} @@ -852,27 +872,14 @@ class BlockchainProcessor(Processor): h.append(tx_hash) new_mempool_hist[addr] = h - # invalidate cache for mempool addresses whose mempool history has changed - new_mempool_hist_keys = new_mempool_hist.keys() - self_mempool_hist_keys = self.mempool_hist.keys() - - for addr in new_mempool_hist_keys: - if addr in self_mempool_hist_keys: - if self.mempool_hist[addr] != new_mempool_hist[addr]: - self.invalidate_cache(addr) - 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 + # invalidate cache for touched addresses + for addr in touched_addresses: + self.invalidate_cache(addr) + + def invalidate_cache(self, address): with self.cache_lock: if address in self.history_cache: @@ -880,6 +887,7 @@ class BlockchainProcessor(Processor): self.history_cache.pop(address) if address in self.watched_addresses: + # TODO: update cache here. if new value equals cached value, do not send notification self.address_queue.put(address) def main_iteration(self): @@ -893,8 +901,6 @@ class BlockchainProcessor(Processor): t2 = time.time() self.memorypool_update() - t3 = time.time() - # print "mempool:", len(self.mempool_addresses), len(self.mempool_hist), "%.3fs"%(t3 - t2) if self.sent_height != self.height: self.sent_height = self.height