X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=backends%2Fbitcoind%2Fblockchain_processor.py;h=421f385cb7859bd82098bbf53046ff331d4e1d0b;hp=93177e1b18fe5e619954b461b014d84327670b29;hb=6adb33a7221351f84357c89bc7ae0d17b1d73ffa;hpb=4201d2f120c4ed895f266a2d80cd8abcfc068e3b diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py index 93177e1..421f385 100644 --- a/backends/bitcoind/blockchain_processor.py +++ b/backends/bitcoind/blockchain_processor.py @@ -1,7 +1,6 @@ import ast import hashlib from json import dumps, loads -import leveldb import os from Queue import Queue import random @@ -15,35 +14,44 @@ from backends.bitcoind import deserialize from processor import Processor, print_log from utils import * +from storage import Storage + class BlockchainProcessor(Processor): def __init__(self, config, shared): Processor.__init__(self) + self.mtimes = {} # monitoring self.shared = shared self.config = config self.up_to_date = False - self.watched_addresses = [] + + self.watch_lock = threading.Lock() + self.watch_blocks = [] + self.watch_headers = [] + self.watched_addresses = {} + self.history_cache = {} self.chunk_cache = {} self.cache_lock = threading.Lock() self.headers_data = '' + self.headers_path = config.get('leveldb', 'path_fulltree') self.mempool_addresses = {} self.mempool_hist = {} - self.mempool_hashes = [] + self.mempool_hashes = set([]) self.mempool_lock = threading.Lock() self.address_queue = Queue() - self.dbpath = config.get('leveldb', 'path') - self.dblock = threading.Lock() try: - self.db = leveldb.LevelDB(self.dbpath) + self.test_reorgs = config.getboolean('leveldb', 'test_reorgs') # simulate random blockchain reorgs except: - traceback.print_exc(file=sys.stdout) - self.shared.stop() + self.test_reorgs = False + self.storage = Storage(config, shared, self.test_reorgs) + + self.dblock = threading.Lock() self.bitcoind_url = 'http://%s:%s@%s:%s/' % ( config.get('bitcoind', 'user'), @@ -51,23 +59,20 @@ class BlockchainProcessor(Processor): config.get('bitcoind', 'host'), config.get('bitcoind', 'port')) - self.height = 0 - self.is_test = False + while True: + try: + self.bitcoind('getinfo') + break + except: + print_log('cannot contact bitcoind...') + time.sleep(5) + continue + self.sent_height = 0 self.sent_header = None - try: - hist = self.deserialize(self.db.Get('height')) - self.last_hash, self.height, _ = hist[0] - print_log("hist", hist) - except: - #traceback.print_exc(file=sys.stdout) - print_log('initializing database') - self.height = 0 - self.last_hash = '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f' - # catch_up headers - self.init_headers(self.height) + self.init_headers(self.storage.height) threading.Timer(0, lambda: self.catch_up(sync=False)).start() while not shared.stopped() and not self.up_to_date: @@ -78,10 +83,29 @@ 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() + + + def mtime(self, name): + now = time.time() + if name != '': + delta = now - self.now + t = self.mtimes.get(name, 0) + self.mtimes[name] = t + delta + self.now = now + + def print_mtime(self): + s = '' + for k, v in self.mtimes.items(): + s += k+':'+"%.2f"%v+' ' + print_log(s) + + def bitcoind(self, method, params=[]): postdata = dumps({"method": method, 'params': params, 'id': 'jsonrpc'}) try: @@ -95,21 +119,6 @@ class BlockchainProcessor(Processor): raise BaseException(r['error']) return r.get('result') - def serialize(self, h): - s = '' - for txid, txpos, height in h: - s += txid + int_to_hex(txpos, 4) + int_to_hex(height, 4) - return s.decode('hex') - - def deserialize(self, s): - h = [] - while s: - txid = s[0:32].encode('hex') - txpos = int(rev_hex(s[32:36].encode('hex')), 16) - height = int(rev_hex(s[36:40].encode('hex')), 16) - h.append((txid, txpos, height)) - s = s[40:] - return h def block2header(self, b): return { @@ -129,7 +138,7 @@ class BlockchainProcessor(Processor): def init_headers(self, db_height): self.chunk_cache = {} - self.headers_filename = os.path.join(self.dbpath, 'blockchain_headers') + self.headers_filename = os.path.join(self.headers_path, 'blockchain_headers') if os.path.exists(self.headers_filename): height = os.path.getsize(self.headers_filename)/80 - 1 # the current height @@ -217,14 +226,18 @@ class BlockchainProcessor(Processor): def get_mempool_transaction(self, txid): try: - raw_tx = self.bitcoind('getrawtransaction', [txid, 0, -1]) + raw_tx = self.bitcoind('getrawtransaction', [txid, 0]) except: return None vds = deserialize.BCDataStream() vds.write(raw_tx.decode('hex')) + try: + return deserialize.parse_Transaction(vds, is_coinbase=False) + except: + print_log("ERROR: cannot parse", txid) + return None - return deserialize.parse_Transaction(vds, is_coinbase=False) def get_history(self, addr, cache_only=False): with self.cache_lock: @@ -236,23 +249,22 @@ 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.storage.get_history(addr) is_known = True except: + self.shared.stop() + raise + if hist: + is_known = True + else: hist = [] is_known = False - # should not be necessary - hist.sort(key=lambda tup: tup[2]) - # check uniqueness too... - # add memory pool with self.mempool_lock: for txid in self.mempool_hist.get(addr, []): - hist.append((txid, 0, 0)) + hist.append({'tx_hash':txid, 'height':0}) - hist = map(lambda x: {'tx_hash': x[0], 'height': x[2]}, hist) # add something to distinguish between unused and empty addresses if hist == [] and is_known: hist = ['*'] @@ -261,6 +273,7 @@ class BlockchainProcessor(Processor): self.history_cache[addr] = hist return hist + def get_status(self, addr, cache_only=False): tx_points = self.get_history(addr, cache_only) if cache_only and tx_points == -1: @@ -303,18 +316,20 @@ class BlockchainProcessor(Processor): return {"block_height": height, "merkle": s, "pos": tx_pos} + def add_to_history(self, addr, tx_hash, tx_pos, tx_height): # keep it sorted - s = (tx_hash + int_to_hex(tx_pos, 4) + int_to_hex(tx_height, 4)).decode('hex') + s = self.serialize_item(tx_hash, tx_pos, tx_height) + 40*chr(0) + assert len(s) == 80 serialized_hist = self.batch_list[addr] - l = len(serialized_hist)/40 + l = len(serialized_hist)/80 for i in range(l-1, -1, -1): - item = serialized_hist[40*i:40*(i+1)] - item_height = int(rev_hex(item[36:40].encode('hex')), 16) - if item_height < tx_height: - serialized_hist = serialized_hist[0:40*(i+1)] + s + serialized_hist[40*(i+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: + serialized_hist = serialized_hist[0:80*(i+1)] + s + serialized_hist[80*(i+1):] break else: serialized_hist = s + serialized_hist @@ -325,30 +340,10 @@ class BlockchainProcessor(Processor): txo = (tx_hash + int_to_hex(tx_pos, 4)).decode('hex') self.batch_txio[txo] = addr - def remove_from_history(self, addr, tx_hash, tx_pos): - txi = (tx_hash + int_to_hex(tx_pos, 4)).decode('hex') - if addr is None: - try: - addr = self.batch_txio[txi] - except: - raise BaseException(tx_hash, tx_pos) - serialized_hist = self.batch_list[addr] - l = len(serialized_hist)/40 - for i in range(l): - item = serialized_hist[40*i:40*(i+1)] - if item[0:36] == txi: - height = int(rev_hex(item[36:40].encode('hex')), 16) - serialized_hist = serialized_hist[0:40*i] + serialized_hist[40*(i+1):] - break - else: - hist = self.deserialize(serialized_hist) - raise BaseException("prevout not found", addr, hist, tx_hash, tx_pos) - self.batch_list[addr] = serialized_hist - return height, addr def deserialize_block(self, block): txlist = block.get('tx') @@ -357,173 +352,108 @@ class BlockchainProcessor(Processor): is_coinbase = True for raw_tx in txlist: tx_hash = hash_encode(Hash(raw_tx.decode('hex'))) - tx_hashes.append(tx_hash) vds = deserialize.BCDataStream() vds.write(raw_tx.decode('hex')) - tx = deserialize.parse_Transaction(vds, is_coinbase) + try: + tx = deserialize.parse_Transaction(vds, is_coinbase) + except: + print_log("ERROR: cannot parse", tx_hash) + continue + tx_hashes.append(tx_hash) txdict[tx_hash] = tx is_coinbase = False return tx_hashes, txdict - def get_undo_info(self, height): - s = self.db.Get("undo%d" % (height % 100)) - return eval(s) - def write_undo_info(self, batch, height, undo_info): - if self.is_test or height > self.bitcoind_height - 100: - batch.Put("undo%d" % (height % 100), repr(undo_info)) def import_block(self, block, block_hash, block_height, sync, revert=False): - self.batch_list = {} # address -> history - self.batch_txio = {} # transaction i/o -> address - - block_inputs = [] - block_outputs = [] - addr_to_read = [] + touched_addr = set([]) # deserialize transactions - t0 = time.time() tx_hashes, txdict = self.deserialize_block(block) - t00 = time.time() - - if not revert: - # read addresses of tx inputs - for tx in txdict.values(): - for x in tx.get('inputs'): - txi = (x.get('prevout_hash') + int_to_hex(x.get('prevout_n'), 4)).decode('hex') - block_inputs.append(txi) - - block_inputs.sort() - for txi in block_inputs: - try: - addr = self.db.Get(txi) - except: - # the input could come from the same block - continue - self.batch_txio[txi] = addr - addr_to_read.append(addr) - - else: - for txid, tx in txdict.items(): - for x in tx.get('outputs'): - txo = (txid + int_to_hex(x.get('index'), 4)).decode('hex') - block_outputs.append(txo) - - # 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.sort() - for addr in addr_to_read: - try: - self.batch_list[addr] = self.db.Get(addr) - except: - self.batch_list[addr] = '' - + # undo info if revert: - undo_info = self.get_undo_info(block_height) - # print "undo", block_height, undo_info + undo_info = self.storage.get_undo_info(block_height) + tx_hashes.reverse() else: undo_info = {} - # process - t1 = time.time() - - if revert: - tx_hashes = tx_hashes[::-1] for txid in tx_hashes: # must be ordered tx = txdict[txid] if not revert: - - undo = [] - for x in tx.get('inputs'): - prevout_height, prevout_addr = self.remove_from_history(None, x.get('prevout_hash'), x.get('prevout_n')) - undo.append((prevout_height, prevout_addr)) + undo = self.storage.import_transaction(txid, tx, block_height, touched_addr) 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) - 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')) - - i = 0 - for x in tx.get('inputs'): - prevout_height, prevout_addr = undo_info.get(txid)[i] - i += 1 - - # read the history into batch list - if self.batch_list.get(prevout_addr) is None: - self.batch_list[prevout_addr] = self.db.Get(prevout_addr) - - # 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]) ) - - # write - max_len = 0 - max_addr = '' - t2 = time.time() - - batch = leveldb.WriteBatch() - for addr, serialized_hist in self.batch_list.items(): - batch.Put(addr, serialized_hist) - l = len(serialized_hist) - if l > max_len: - max_len = l - max_addr = addr + undo = undo_info.pop(txid) + self.storage.revert_transaction(txid, tx, block_height, touched_addr, undo) + + if revert: + assert undo_info == {} + # add undo info if not revert: - # add new created outputs - for txio, addr in self.batch_txio.items(): - batch.Put(txio, addr) - # delete spent inputs - for txi in block_inputs: - batch.Delete(txi) - # add undo info - self.write_undo_info(batch, block_height, undo_info) - else: - # restore spent inputs - for txio, addr in self.batch_txio.items(): - batch.Put(txio, addr) - # delete spent outputs - for txo in block_outputs: - batch.Delete(txo) + self.storage.write_undo_info(block_height, self.bitcoind_height, undo_info) # add the max - batch.Put('height', self.serialize([(block_hash, block_height, 0)])) - - # actual write - self.db.Write(batch, sync=sync) - - t3 = time.time() - if t3 - t0 > 10 and not sync: - print_log("block", block_height, - "parse:%0.2f " % (t00 - t0), - "read:%0.2f " % (t1 - t00), - "proc:%.2f " % (t2-t1), - "write:%.2f " % (t3-t2), - "max:", max_len, hash_160_to_bc_address(max_addr)) - - for h160 in self.batch_list.keys(): - addr = hash_160_to_bc_address(h160) + self.storage.db_undo.put('height', repr( (block_hash, block_height, self.storage.db_version) )) + + for addr in touched_addr: self.invalidate_cache(addr) - def add_request(self, request): + self.storage.update_hashes() + + + def add_request(self, session, request): # see if we can get if from cache. if not, add to queue - if self.process(request, cache_only=True) == -1: - self.queue.put(request) + if self.process(session, request, cache_only=True) == -1: + self.queue.put((session, request)) + + + def do_subscribe(self, method, params, session): + with self.watch_lock: + if method == 'blockchain.numblocks.subscribe': + if session not in self.watch_blocks: + self.watch_blocks.append(session) - def process(self, request, cache_only=False): - #print "abe process", request + elif method == 'blockchain.headers.subscribe': + if session not in self.watch_headers: + self.watch_headers.append(session) + elif method == 'blockchain.address.subscribe': + address = params[0] + l = self.watched_addresses.get(address) + if l is None: + self.watched_addresses[address] = [session] + elif session not in l: + l.append(session) + + + def do_unsubscribe(self, method, params, session): + with self.watch_lock: + if method == 'blockchain.numblocks.subscribe': + if session in self.watch_blocks: + self.watch_blocks.remove(session) + elif method == 'blockchain.headers.subscribe': + if session in self.watch_headers: + self.watch_headers.remove(session) + elif method == "blockchain.address.subscribe": + addr = params[0] + l = self.watched_addresses.get(addr) + if not l: + return + if session in l: + l.remove(session) + if session in l: + print "error rc!!" + self.shared.stop() + if l == []: + self.watched_addresses.pop(addr) + + + def process(self, session, request, cache_only=False): + message_id = request['id'] method = request['method'] params = request.get('params', []) @@ -531,49 +461,67 @@ class BlockchainProcessor(Processor): error = None if method == 'blockchain.numblocks.subscribe': - result = self.height + result = self.storage.height elif method == 'blockchain.headers.subscribe': result = self.header elif method == 'blockchain.address.subscribe': try: - address = params[0] + address = str(params[0]) result = self.get_status(address, cache_only) - self.watch_address(address) except BaseException, e: error = str(e) + ': ' + address print_log("error:", error) - elif method == 'blockchain.address.unsubscribe': + elif method == 'blockchain.address.get_history': try: - password = params[0] - address = params[1] - if password == self.config.get('server', 'password'): - self.watched_addresses.remove(address) - print_log('unsubscribed', address) - result = "ok" - else: - print_log('incorrect password') - result = "authentication error" + address = str(params[0]) + result = self.get_history(address, cache_only) except BaseException, e: error = str(e) + ': ' + address print_log("error:", error) - elif method == 'blockchain.address.get_history': + elif method == 'blockchain.address.get_balance': try: - address = params[0] - result = self.get_history(address, cache_only) + address = str(params[0]) + result = self.storage.get_balance(address) except BaseException, e: error = str(e) + ': ' + address print_log("error:", error) + elif method == 'blockchain.address.get_proof': + try: + address = str(params[0]) + result = self.storage.get_proof(address) + except BaseException, e: + error = str(e) + ': ' + address + print_log("error:", error) + + elif method == 'blockchain.address.listunspent': + try: + address = str(params[0]) + result = self.storage.listunspent(address) + except BaseException, e: + error = str(e) + ': ' + address + print_log("error:", error) + + elif method == 'blockchain.utxo.get_address': + try: + txid = str(params[0]) + pos = int(params[1]) + txi = (txid + int_to_hex(pos, 4)).decode('hex') + result = self.storage.get_address(txi) + except BaseException, e: + error = str(e) + print_log("error:", error, txid, pos) + elif method == 'blockchain.block.get_header': if cache_only: result = -1 else: try: - height = params[0] + height = int(params[0]) result = self.get_header(height) except BaseException, e: error = str(e) + ': %d' % height @@ -584,7 +532,7 @@ class BlockchainProcessor(Processor): result = -1 else: try: - index = params[0] + index = int(params[0]) result = self.get_chunk(index) except BaseException, e: error = str(e) + ': %d' % index @@ -614,8 +562,7 @@ class BlockchainProcessor(Processor): elif method == 'blockchain.transaction.get': try: tx_hash = params[0] - height = params[1] - result = self.bitcoind('getrawtransaction', [tx_hash, 0, height]) + result = self.bitcoind('getrawtransaction', [tx_hash, 0]) except BaseException, e: error = str(e) + ': ' + repr(params) print_log("tx get error:", error) @@ -627,64 +574,114 @@ class BlockchainProcessor(Processor): return -1 if error: - self.push_response({'id': message_id, 'error': error}) + self.push_response(session, {'id': message_id, 'error': error}) elif result != '': - self.push_response({'id': message_id, 'result': result}) + self.push_response(session, {'id': message_id, 'result': result}) + + + def getfullblock(self, block_hash): + block = self.bitcoind('getblock', [block_hash]) - def watch_address(self, addr): - if addr not in self.watched_addresses: - self.watched_addresses.append(addr) + rawtxreq = [] + i = 0 + for txid in block['tx']: + rawtxreq.append({ + "method": "getrawtransaction", + "params": [txid], + "id": i, + }) + i += 1 + + postdata = dumps(rawtxreq) + try: + respdata = urllib.urlopen(self.bitcoind_url, postdata).read() + except: + traceback.print_exc(file=sys.stdout) + self.shared.stop() + + r = loads(respdata) + rawtxdata = [] + for ir in r: + if ir['error'] is not None: + self.shared.stop() + print_log("Error: make sure you run bitcoind with txindex=1; use -reindex if needed.") + raise BaseException(ir['error']) + rawtxdata.append(ir['result']) + block['tx'] = rawtxdata + return block def catch_up(self, sync=True): - t1 = time.time() + prev_root_hash = None while not self.shared.stopped(): + + self.mtime('') + # are we done yet? info = self.bitcoind('getinfo') self.bitcoind_height = info.get('blocks') bitcoind_block_hash = self.bitcoind('getblockhash', [self.bitcoind_height]) - if self.last_hash == bitcoind_block_hash: + if self.storage.last_hash == bitcoind_block_hash: self.up_to_date = True break # not done.. self.up_to_date = False - next_block_hash = self.bitcoind('getblockhash', [self.height + 1]) - next_block = self.bitcoind('getblock', [next_block_hash, 1]) + next_block_hash = self.bitcoind('getblockhash', [self.storage.height + 1]) + next_block = self.getfullblock(next_block_hash) + self.mtime('daemon') # fixme: this is unsafe, if we revert when the undo info is not yet written - revert = (random.randint(1, 100) == 1) if self.is_test else False + revert = (random.randint(1, 100) == 1) if self.test_reorgs else False - if (next_block.get('previousblockhash') == self.last_hash) and not revert: + if (next_block.get('previousblockhash') == self.storage.last_hash) and not revert: - self.import_block(next_block, next_block_hash, self.height+1, sync) - self.height = self.height + 1 - self.write_header(self.block2header(next_block), sync) - self.last_hash = next_block_hash + prev_root_hash = self.storage.get_root_hash() - if self.height % 100 == 0 and not sync: - t2 = time.time() - print_log("catch_up: block %d (%.3fs)" % (self.height, t2 - t1)) - t1 = t2 + self.import_block(next_block, next_block_hash, self.storage.height+1, sync) + self.storage.height = self.storage.height + 1 + self.write_header(self.block2header(next_block), sync) + self.storage.last_hash = next_block_hash + self.mtime('import') + + if self.storage.height % 1000 == 0 and not sync: + t_daemon = self.mtimes.get('daemon') + t_import = self.mtimes.get('import') + print_log("catch_up: block %d (%.3fs %.3fs)" % (self.storage.height, t_daemon, t_import), self.storage.get_root_hash().encode('hex')) + self.mtimes['daemon'] = 0 + self.mtimes['import'] = 0 else: + # revert current block - block = self.bitcoind('getblock', [self.last_hash, 1]) - print_log("blockchain reorg", self.height, block.get('previousblockhash'), self.last_hash) - self.import_block(block, self.last_hash, self.height, sync, revert=True) + block = self.getfullblock(self.storage.last_hash) + print_log("blockchain reorg", self.storage.height, block.get('previousblockhash'), self.storage.last_hash) + self.import_block(block, self.storage.last_hash, self.storage.height, sync, revert=True) self.pop_header() self.flush_headers() - self.height -= 1 + self.storage.height -= 1 # read previous header from disk - self.header = self.read_header(self.height) - self.last_hash = self.hash_header(self.header) + self.header = self.read_header(self.storage.height) + self.storage.last_hash = self.hash_header(self.header) + + if prev_root_hash: + assert prev_root_hash == self.storage.get_root_hash() + prev_root_hash = None + + + self.header = self.block2header(self.bitcoind('getblock', [self.storage.last_hash])) + self.header['utxo_root'] = self.storage.get_root_hash().encode('hex') + + if self.shared.stopped(): + print_log( "closing database" ) + self.storage.close() - self.header = self.block2header(self.bitcoind('getblock', [self.last_hash])) def memorypool_update(self): - mempool_hashes = self.bitcoind('getrawmempool') + mempool_hashes = set(self.bitcoind('getrawmempool')) + touched_addresses = set([]) for tx_hash in mempool_hashes: if tx_hash in self.mempool_hashes: @@ -694,26 +691,22 @@ 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: - h160 = self.db.Get(txi) - addr = hash_160_to_bc_address(h160) - 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.add(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.add(addr) - self.mempool_hashes.append(tx_hash) + self.mempool_addresses[tx_hash] = mpa + self.mempool_hashes.add(tx_hash) # remove older entries from mempool_hashes self.mempool_hashes = mempool_hashes @@ -722,8 +715,10 @@ 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.add(addr) - # rebuild histories + # rebuild mempool histories new_mempool_hist = {} for tx_hash, addresses in self.mempool_addresses.items(): for addr in addresses: @@ -732,28 +727,31 @@ class BlockchainProcessor(Processor): h.append(tx_hash) new_mempool_hist[addr] = h - 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) - 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: print_log("cache: invalidating", address) self.history_cache.pop(address) - if address in self.watched_addresses: - self.address_queue.put(address) + with self.watch_lock: + sessions = self.watched_addresses.get(address) + + if sessions: + # TODO: update cache here. if new value equals cached value, do not send notification + self.address_queue.put((address,sessions)) def main_iteration(self): if self.shared.stopped(): print_log("blockchain processor terminating") + self.storage.close() return with self.dblock: @@ -762,38 +760,39 @@ 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 - self.push_response({ - 'id': None, - 'method': 'blockchain.numblocks.subscribe', - 'params': [self.height], - }) + + if self.sent_height != self.storage.height: + self.sent_height = self.storage.height + for session in self.watch_blocks: + self.push_response(session, { + 'id': None, + 'method': 'blockchain.numblocks.subscribe', + 'params': [self.storage.height], + }) if self.sent_header != self.header: - print_log("blockchain: %d (%.3fs)" % (self.height, t2 - t1)) + print_log("blockchain: %d (%.3fs)" % (self.storage.height, t2 - t1)) self.sent_header = self.header - self.push_response({ - 'id': None, - 'method': 'blockchain.headers.subscribe', - 'params': [self.header], - }) + for session in self.watch_headers: + self.push_response(session, { + 'id': None, + 'method': 'blockchain.headers.subscribe', + 'params': [self.header], + }) while True: try: - addr = self.address_queue.get(False) + addr, sessions = self.address_queue.get(False) except: break - if addr in self.watched_addresses: - status = self.get_status(addr) - self.push_response({ - 'id': None, - 'method': 'blockchain.address.subscribe', - 'params': [addr, status], - }) + + status = self.get_status(addr) + for session in sessions: + self.push_response(session, { + 'id': None, + 'method': 'blockchain.address.subscribe', + 'params': [addr, status], + }) if not self.shared.stopped(): threading.Timer(10, self.main_iteration).start()