X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=blobdiff_plain;f=backends%2Fbitcoind%2Fblockchain_processor.py;h=3b65b27953498e08a3ec1a7f887632e4fb6b9ca2;hp=7fe02fcb926615179b16a0f2a96cf8a08e6ec112;hb=4ce69b7ea24ead59ebbcc7ed335ea9762ae3724b;hpb=15e1acec17204605246aabdf689ac692650747fe diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py index 7fe02fc..3b65b27 100644 --- a/backends/bitcoind/blockchain_processor.py +++ b/backends/bitcoind/blockchain_processor.py @@ -24,7 +24,12 @@ class BlockchainProcessor(Processor): 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() @@ -32,15 +37,17 @@ class BlockchainProcessor(Processor): 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.pruning_limit = config.getint('leveldb', 'pruning_limit') + self.db_version = 1 # increase this when database needs to be updated self.dblock = threading.Lock() try: - self.db = leveldb.LevelDB(self.dbpath) + self.db = leveldb.LevelDB(self.dbpath, paranoid_checks=True) except: traceback.print_exc(file=sys.stdout) self.shared.stop() @@ -51,6 +58,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 @@ -58,13 +74,21 @@ class BlockchainProcessor(Processor): try: hist = self.deserialize(self.db.Get('height')) - self.last_hash, self.height, _ = hist[0] - print_log("hist", hist) + self.last_hash, self.height, db_version = hist[0] + print_log("Database version", self.db_version) + print_log("Blockchain height", self.height) except: - #traceback.print_exc(file=sys.stdout) + traceback.print_exc(file=sys.stdout) print_log('initializing database') self.height = 0 self.last_hash = '000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f' + db_version = self.db_version + + # check version + if self.db_version != db_version: + print_log("Your database '%s' is deprecated. Please create a new database"%self.dbpath) + self.shared.stop() + return # catch_up headers self.init_headers(self.height) @@ -78,7 +102,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() @@ -98,17 +124,29 @@ class BlockchainProcessor(Processor): 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') + s += self.serialize_item(txid, txpos, height) + return s + + def serialize_item(self, txid, txpos, height, spent=chr(0)): + s = (txid + int_to_hex(txpos, 4) + int_to_hex(height, 3)).decode('hex') + spent + return s + + def deserialize_item(self,s): + txid = s[0:32].encode('hex') + txpos = int(rev_hex(s[32:36].encode('hex')), 16) + height = int(rev_hex(s[36:39].encode('hex')), 16) + spent = s[39:40] + return (txid, txpos, height, spent) 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) + txid, txpos, height, spent = self.deserialize_item(s[0:40]) h.append((txid, txpos, height)) - s = s[40:] + if spent == chr(1): + txid, txpos, height, spent = self.deserialize_item(s[40:80]) + h.append((txid, txpos, height)) + s = s[80:] return h def block2header(self, b): @@ -217,14 +255,17 @@ 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')) - - return deserialize.parse_Transaction(vds, is_coinbase=False) + try: + return deserialize.parse_Transaction(vds, is_coinbase=False) + except: + print_log("ERROR: cannot parse", txid) + return None def get_history(self, addr, cache_only=False): with self.cache_lock: @@ -236,23 +277,26 @@ 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 + # sort history, because redeeming transactions are next to the corresponding txout 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 = map(lambda x: {'tx_hash': x[0], 'height': x[2]}, hist) + # uniqueness + hist = set(map(lambda x: (x[0], x[2]), hist)) + + # convert to dict + hist = map(lambda x: {'tx_hash': x[0], 'height': x[1]}, hist) + # add something to distinguish between unused and empty addresses if hist == [] and is_known: hist = ['*'] @@ -303,18 +347,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 +371,92 @@ 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) + + def revert_add_to_history(self, addr, tx_hash, tx_pos, tx_height): serialized_hist = self.batch_list[addr] + s = self.serialize_item(tx_hash, tx_pos, tx_height) + 40*chr(0) + if serialized_hist.find(s) == -1: raise + serialized_hist = serialized_hist.replace(s, '') + self.batch_list[addr] = serialized_hist + + - l = len(serialized_hist)/40 + def prune_history(self, addr, undo): + # remove items that have bit set to one + if undo.get(addr) is None: undo[addr] = [] + + serialized_hist = self.batch_list[addr] + l = len(serialized_hist)/80 for i in range(l): - item = serialized_hist[40*i:40*(i+1)] + if len(serialized_hist)/80 < self.pruning_limit: break + item = serialized_hist[80*i:80*(i+1)] + if item[39:40] == chr(1): + assert item[79:80] == chr(2) + serialized_hist = serialized_hist[0:80*i] + serialized_hist[80*(i+1):] + undo[addr].append(item) # items are ordered + self.batch_list[addr] = serialized_hist + + + def revert_prune_history(self, addr, undo): + # restore removed items + serialized_hist = self.batch_list[addr] + + if undo.get(addr) is not None: + itemlist = undo.pop(addr) + else: + return + + if not itemlist: return + + l = len(serialized_hist)/80 + tx_item = '' + for i in range(l-1, -1, -1): + if tx_item == '': + if not itemlist: + break + else: + tx_item = itemlist.pop(-1) # get the last element + tx_height = int(rev_hex(tx_item[36:39].encode('hex')), 16) + + 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)] + tx_item + serialized_hist[80*(i+1):] + tx_item = '' + + else: + serialized_hist = ''.join(itemlist) + tx_item + serialized_hist + + self.batch_list[addr] = serialized_hist + + + def set_spent_bit(self, addr, txi, is_spent, txid=None, index=None, height=None): + serialized_hist = self.batch_list[addr] + l = len(serialized_hist)/80 + for i in range(l): + item = serialized_hist[80*i:80*(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):] + if is_spent: + new_item = item[0:39] + chr(1) + self.serialize_item(txid, index, height, chr(2)) + else: + new_item = item[0:39] + chr(0) + chr(0)*40 + 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, tx_hash, tx_pos) + raise BaseException("prevout not found", addr, hist, txi.encode('hex')) self.batch_list[addr] = serialized_hist - return height, addr + + + def unset_spent_bit(self, addr, txi): + self.set_spent_bit(addr, txi, False) + self.batch_txio[txi] = addr + def deserialize_block(self, block): txlist = block.get('tx') @@ -357,10 +465,14 @@ 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 @@ -388,6 +500,13 @@ class BlockchainProcessor(Processor): t00 = time.time() + # undo info + if revert: + undo_info = self.get_undo_info(block_height) + else: + undo_info = {} + + if not revert: # read addresses of tx inputs for tx in txdict.values(): @@ -399,9 +518,14 @@ class BlockchainProcessor(Processor): for txi in block_inputs: try: addr = self.db.Get(txi) - except: + 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) @@ -410,62 +534,91 @@ class BlockchainProcessor(Processor): for x in tx.get('outputs'): txo = (txid + int_to_hex(x.get('index'), 4)).decode('hex') block_outputs.append(txo) + addr_to_read.append( x.get('address') ) + + undo = undo_info.get(txid) + for i, x in enumerate(tx.get('inputs')): + addr = undo['prev_addr'][i] + addr_to_read.append(addr) + + + + # 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: 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 - if revert: - undo_info = self.get_undo_info(block_height) - # print "undo", block_height, undo_info - 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_info[txid] = undo + undo = { 'prev_addr':[] } # contains the list of pruned items for each address in the tx; also, 'prev_addr' is a list of prev addresses + + prev_addr = [] + for i, x in enumerate(tx.get('inputs')): + txi = (x.get('prevout_hash') + int_to_hex(x.get('prevout_n'), 4)).decode('hex') + addr = self.batch_txio[txi] + + # add redeem item to the history. + # add it right next to the input txi? this will break history sorting, but it's ok if I neglect tx inputs during search + self.set_spent_bit(addr, txi, True, txid, i, block_height) + + # when I prune, prune a pair + self.prune_history(addr, undo) + prev_addr.append(addr) + + undo['prev_addr'] = prev_addr + # here I add only the outputs to history; maybe I want to add inputs too (that's in the other loop) 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) + addr = x.get('address') + self.add_to_history(addr, txid, x.get('index'), block_height) + self.prune_history(addr, undo) # prune here because we increased the length of the history + + undo_info[txid] = undo else: + + undo = undo_info.pop(txid) + 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')) + addr = x.get('address') + self.revert_prune_history(addr, undo) + self.revert_add_to_history(addr, txid, x.get('index'), block_height) + + prev_addr = undo.pop('prev_addr') + for i, x in enumerate(tx.get('inputs')): + addr = prev_addr[i] + self.revert_prune_history(addr, undo) + txi = (x.get('prevout_hash') + int_to_hex(x.get('prevout_n'), 4)).decode('hex') + self.unset_spent_bit(addr, txi) - i = 0 - for x in tx.get('inputs'): - prevout_height, prevout_addr = undo_info.get(txid)[i] - i += 1 + assert undo == {} - # 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) + if revert: + assert undo_info == {} - # 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 @@ -475,7 +628,7 @@ class BlockchainProcessor(Processor): batch = leveldb.WriteBatch() for addr, serialized_hist in self.batch_list.items(): batch.Put(addr, serialized_hist) - l = len(serialized_hist) + l = len(serialized_hist)/80 if l > max_len: max_len = l max_addr = addr @@ -492,13 +645,14 @@ class BlockchainProcessor(Processor): else: # restore spent inputs for txio, addr in self.batch_txio.items(): + # print "restoring spent input", repr(txio) batch.Put(txio, addr) # delete spent outputs for txo in block_outputs: batch.Delete(txo) # add the max - batch.Put('height', self.serialize([(block_hash, block_height, 0)])) + batch.Put('height', self.serialize([(block_hash, block_height, self.db_version)])) # actual write self.db.Write(batch, sync=sync) @@ -510,20 +664,21 @@ 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): + 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 process(self, request, cache_only=False): - #print "abe process", request + def process(self, session, request, cache_only=False): + message_id = request['id'] method = request['method'] params = request.get('params', []) @@ -531,35 +686,33 @@ class BlockchainProcessor(Processor): error = None if method == 'blockchain.numblocks.subscribe': + with self.watch_lock: + if session not in self.watch_blocks: + self.watch_blocks.append(session) result = self.height elif method == 'blockchain.headers.subscribe': + with self.watch_lock: + if session not in self.watch_headers: + self.watch_headers.append(session) result = self.header elif method == 'blockchain.address.subscribe': try: address = params[0] result = self.get_status(address, cache_only) - self.watch_address(address) - except BaseException, e: - error = str(e) + ': ' + address - print_log("error:", error) + with self.watch_lock: + l = self.watched_addresses.get(address) + if l is None: + self.watched_addresses[address] = [session] + elif session not in l: + l.append(session) - elif method == 'blockchain.address.unsubscribe': - 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" except BaseException, e: error = str(e) + ': ' + address print_log("error:", error) + elif method == 'blockchain.address.get_history': try: address = params[0] @@ -614,8 +767,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,13 +779,41 @@ 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]) + + 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() - def watch_address(self, addr): - if addr not in self.watched_addresses: - self.watched_addresses.append(addr) + 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() @@ -650,7 +830,7 @@ class BlockchainProcessor(Processor): # 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 = self.getfullblock(next_block_hash) # 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 @@ -669,7 +849,7 @@ class BlockchainProcessor(Processor): else: # revert current block - block = self.bitcoind('getblock', [self.last_hash, 1]) + block = self.getfullblock(self.last_hash) print_log("blockchain reorg", self.height, block.get('previousblockhash'), self.last_hash) self.import_block(block, self.last_hash, self.height, sync, revert=True) self.pop_header() @@ -683,8 +863,10 @@ class BlockchainProcessor(Processor): 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 +876,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 +900,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,24 +912,26 @@ 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) + 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(): @@ -762,38 +944,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], - }) + for session in self.watch_blocks: + self.push_response(session, { + 'id': None, + 'method': 'blockchain.numblocks.subscribe', + 'params': [self.height], + }) if self.sent_header != self.header: print_log("blockchain: %d (%.3fs)" % (self.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()