X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=backends%2Fbitcoind%2Fblockchain_processor.py;h=865d72a6d4b9f7f7c788da0a75c3843450dd3fdb;hb=85b7df1d601ee42360473f5930593c1faad36e29;hp=ef417931a1c0e26bdda4ebcea2b5d4e2a449fc53;hpb=ea4579674d6e742bfd7f533f2aa62fc2e677f780;p=electrum-server.git diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py index ef41793..865d72a 100644 --- a/backends/bitcoind/blockchain_processor.py +++ b/backends/bitcoind/blockchain_processor.py @@ -1,14 +1,20 @@ +import ast +import hashlib from json import dumps, loads -import leveldb, urllib -import deserialize -import ast, time, threading, hashlib +import leveldb +import os from Queue import Queue -import traceback, sys, os, random - - -from util import Hash, hash_encode, hash_decode, rev_hex, int_to_hex -from util import bc_address_to_hash_160, hash_160_to_bc_address, header_to_string, header_from_string +import random +import sys +import time +import threading +import traceback +import urllib + +from backends.bitcoind import deserialize from processor import Processor, print_log +from utils import * + class BlockchainProcessor(Processor): @@ -40,21 +46,20 @@ class BlockchainProcessor(Processor): self.shared.stop() self.bitcoind_url = 'http://%s:%s@%s:%s/' % ( - config.get('bitcoind','user'), - config.get('bitcoind','password'), - config.get('bitcoind','host'), - config.get('bitcoind','port')) + config.get('bitcoind', 'user'), + config.get('bitcoind', 'password'), + config.get('bitcoind', 'host'), + config.get('bitcoind', 'port')) self.height = 0 self.is_test = False 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 ) + self.last_hash, self.height, _ = hist[0] + print_log("hist", hist) except: #traceback.print_exc(file=sys.stdout) print_log('initializing database') @@ -73,20 +78,22 @@ class BlockchainProcessor(Processor): shared.stop() sys.exit(0) - print_log( "blockchain is up to date." ) + print_log("blockchain is up to date.") threading.Timer(10, self.main_iteration).start() - - def bitcoind(self, method, params=[]): - postdata = dumps({"method": method, 'params': params, 'id':'jsonrpc'}) - respdata = urllib.urlopen(self.bitcoind_url, postdata).read() + postdata = dumps({"method": method, 'params': params, 'id': 'jsonrpc'}) + try: + respdata = urllib.urlopen(self.bitcoind_url, postdata).read() + except: + traceback.print_exc(file=sys.stdout) + self.shared.stop() + r = loads(respdata) - if r['error'] != None: + if r['error'] is not None: raise BaseException(r['error']) return r.get('result') - def serialize(self, h): s = '' @@ -94,32 +101,35 @@ class BlockchainProcessor(Processor): 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 ) ) + 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 {"block_height":b.get('height'), "version":b.get('version'), "prev_block_hash":b.get('previousblockhash'), - "merkle_root":b.get('merkleroot'), "timestamp":b.get('time'), "bits":int(b.get('bits'),16), "nonce":b.get('nonce')} - + return { + "block_height": b.get('height'), + "version": b.get('version'), + "prev_block_hash": b.get('previousblockhash'), + "merkle_root": b.get('merkleroot'), + "timestamp": b.get('time'), + "bits": int(b.get('bits'), 16), + "nonce": b.get('nonce'), + } def get_header(self, height): block_hash = self.bitcoind('getblockhash', [height]) b = self.bitcoind('getblock', [block_hash]) return self.block2header(b) - 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.dbpath, 'blockchain_headers') if os.path.exists(self.headers_filename): height = os.path.getsize(self.headers_filename)/80 - 1 # the current height @@ -128,52 +138,47 @@ class BlockchainProcessor(Processor): else: prev_hash = None else: - open(self.headers_filename,'wb').close() + open(self.headers_filename, 'wb').close() prev_hash = None height = -1 if height < db_height: - print_log( "catching up missing headers:", height, db_height) + print_log("catching up missing headers:", height, db_height) try: while height < db_height: height = height + 1 header = self.get_header(height) - if height>1: + if height > 1: assert prev_hash == header.get('prev_block_hash') self.write_header(header, sync=False) prev_hash = self.hash_header(header) - if height%1000==0: print_log("headers file:",height) + if (height % 1000) == 0: + print_log("headers file:", height) except KeyboardInterrupt: self.flush_headers() sys.exit() self.flush_headers() - def hash_header(self, header): return rev_hex(Hash(header_to_string(header).decode('hex')).encode('hex')) - def read_header(self, block_height): if os.path.exists(self.headers_filename): - f = open(self.headers_filename,'rb') - f.seek(block_height*80) - h = f.read(80) - f.close() + with open(self.headers_filename, 'rb') as f: + f.seek(block_height * 80) + h = f.read(80) if len(h) == 80: h = header_from_string(h) return h - def read_chunk(self, index): - f = open(self.headers_filename,'rb') - f.seek(index*2016*80) - chunk = f.read(2016*80) - f.close() + with open(self.headers_filename, 'rb') as f: + f.seek(index*2016*80) + chunk = f.read(2016*80) return chunk.encode('hex') - def write_header(self, header, sync=True): if not self.headers_data: self.headers_offset = header.get('block_height') @@ -193,14 +198,13 @@ class BlockchainProcessor(Processor): self.headers_data = self.headers_data[:-40] def flush_headers(self): - if not self.headers_data: return - f = open(self.headers_filename,'rb+') - f.seek(self.headers_offset*80) - f.write(self.headers_data) - f.close() + if not self.headers_data: + return + with open(self.headers_filename, 'rb+') as f: + f.seek(self.headers_offset*80) + f.write(self.headers_data) self.headers_data = '' - def get_chunk(self, i): # store them on disk; store the current chunk in memory with self.cache_lock: @@ -211,57 +215,65 @@ class BlockchainProcessor(Processor): return chunk + def get_mempool_transaction(self, txid): + try: + raw_tx = self.bitcoind('getrawtransaction', [txid, 0, -1]) + except: + return None - def get_transaction(self, txid, block_height=-1, is_coinbase = False): - raw_tx = self.bitcoind('getrawtransaction', [txid, 0, block_height]) vds = deserialize.BCDataStream() vds.write(raw_tx.decode('hex')) - out = deserialize.parse_Transaction(vds, is_coinbase) - return out + return deserialize.parse_Transaction(vds, is_coinbase=False) def get_history(self, addr, cache_only=False): - with self.cache_lock: hist = self.history_cache.get( addr ) - if hist is not None: return hist - if cache_only: return -1 + with self.cache_lock: + hist = self.history_cache.get(addr) + if hist is not None: + return hist + if cache_only: + return -1 with self.dblock: try: hash_160 = bc_address_to_hash_160(addr) hist = self.deserialize(self.db.Get(hash_160)) is_known = True - except: + except: hist = [] is_known = False # should not be necessary - hist.sort( key=lambda tup: tup[1]) + hist.sort(key=lambda tup: tup[1]) # check uniqueness too... # add memory pool with self.mempool_lock: - for txid in self.mempool_hist.get(addr,[]): + 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) + 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 = ['*'] + if hist == [] and is_known: + hist = ['*'] - with self.cache_lock: self.history_cache[addr] = hist + with self.cache_lock: + 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: return -1 + if cache_only and tx_points == -1: + return -1 - if not tx_points: return None - if tx_points == ['*']: return '*' + if not tx_points: + return None + if tx_points == ['*']: + return '*' status = '' for tx in tx_points: status += tx.get('tx_hash') + ':%d:' % tx.get('height') - return hashlib.sha256( status ).digest().encode('hex') - + return hashlib.sha256(status).digest().encode('hex') def get_merkle(self, tx_hash, height): @@ -269,41 +281,38 @@ class BlockchainProcessor(Processor): b = self.bitcoind('getblock', [block_hash]) tx_list = b.get('tx') tx_pos = tx_list.index(tx_hash) - + merkle = map(hash_decode, tx_list) target_hash = hash_decode(tx_hash) s = [] while len(merkle) != 1: - if len(merkle)%2: merkle.append( merkle[-1] ) + if len(merkle) % 2: + merkle.append(merkle[-1]) n = [] while merkle: - new_hash = Hash( merkle[0] + merkle[1] ) + new_hash = Hash(merkle[0] + merkle[1]) if merkle[0] == target_hash: - s.append( hash_encode( merkle[1])) + s.append(hash_encode(merkle[1])) target_hash = new_hash elif merkle[1] == target_hash: - s.append( hash_encode( merkle[0])) + s.append(hash_encode(merkle[0])) target_hash = new_hash - n.append( new_hash ) + n.append(new_hash) merkle = merkle[2:] merkle = n - return {"block_height":height, "merkle":s, "pos":tx_pos} - - - + 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') - serialized_hist = self.batch_list[addr] + serialized_hist = self.batch_list[addr] l = len(serialized_hist)/40 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 ) + 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):] break @@ -316,9 +325,7 @@ 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: @@ -326,14 +333,14 @@ class BlockchainProcessor(Processor): 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 ) + height = int(rev_hex(item[36:40].encode('hex')), 16) serialized_hist = serialized_hist[0:40*i] + serialized_hist[40*(i+1):] break else: @@ -343,7 +350,6 @@ class BlockchainProcessor(Processor): self.batch_list[addr] = serialized_hist return height, addr - def deserialize_block(self, block): txlist = block.get('tx') tx_hashes = [] # ordered txids @@ -360,13 +366,12 @@ class BlockchainProcessor(Processor): return tx_hashes, txdict def get_undo_info(self, height): - s = self.db.Get("undo%d"%(height%100)) + 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)) - + batch.Put("undo%d" % (height % 100), repr(undo_info)) def import_block(self, block, block_hash, block_height, sync, revert=False): @@ -383,7 +388,6 @@ class BlockchainProcessor(Processor): t00 = time.time() - if not revert: # read addresses of tx inputs for tx in txdict.values(): @@ -406,7 +410,7 @@ class BlockchainProcessor(Processor): 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'): @@ -417,37 +421,38 @@ class BlockchainProcessor(Processor): for addr in addr_to_read: try: self.batch_list[addr] = self.db.Get(addr) - except: + except: self.batch_list[addr] = '' - - if revert: + if revert: undo_info = self.get_undo_info(block_height) # print "undo", block_height, undo_info - else: undo_info = {} + else: + undo_info = {} # process t1 = time.time() - if revert: tx_hashes = tx_hashes[::-1] - for txid in tx_hashes: # must be ordered + 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) ) + 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 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(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')) + self.remove_from_history(hash_160, txid, x.get('index')) i = 0 for x in tx.get('inputs'): @@ -459,8 +464,8 @@ class BlockchainProcessor(Processor): 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]) ) + 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 @@ -482,7 +487,7 @@ class BlockchainProcessor(Processor): # delete spent inputs for txi in block_inputs: batch.Delete(txi) - # add undo info + # add undo info self.write_undo_info(batch, block_height, undo_info) else: # restore spent inputs @@ -492,41 +497,36 @@ class BlockchainProcessor(Processor): 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, 0)])) # actual write - self.db.Write(batch, sync = sync) + 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), + 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(): + for h160 in self.batch_list.keys(): addr = hash_160_to_bc_address(h160) self.invalidate_cache(addr) - - def add_request(self, request): # see if we can get if from cache. if not, add to queue - if self.process( request, cache_only = True) == -1: + if self.process(request, cache_only=True) == -1: self.queue.put(request) - - - def process(self, request, cache_only = False): + def process(self, request, cache_only=False): #print "abe process", request message_id = request['id'] method = request['method'] - params = request.get('params',[]) + params = request.get('params', []) result = None error = None @@ -543,13 +543,13 @@ class BlockchainProcessor(Processor): self.watch_address(address) except BaseException, e: error = str(e) + ': ' + address - print_log( "error:", error ) + print_log("error:", error) elif method == 'blockchain.address.unsubscribe': try: password = params[0] address = params[1] - if password == self.config.get('server','password'): + if password == self.config.get('server', 'password'): self.watched_addresses.remove(address) print_log('unsubscribed', address) result = "ok" @@ -558,42 +558,46 @@ class BlockchainProcessor(Processor): result = "authentication error" except BaseException, e: error = str(e) + ': ' + address - print_log( "error:", error ) + print_log("error:", error) elif method == 'blockchain.address.get_history': try: address = params[0] - result = self.get_history( address, cache_only ) + result = self.get_history(address, cache_only) except BaseException, e: error = str(e) + ': ' + address - print_log( "error:", error ) + print_log("error:", error) elif method == 'blockchain.block.get_header': - if cache_only: + if cache_only: result = -1 else: try: height = params[0] - result = self.get_header( height ) + result = self.get_header(height) except BaseException, e: - error = str(e) + ': %d'% height - print_log( "error:", error ) - + error = str(e) + ': %d' % height + print_log("error:", error) + elif method == 'blockchain.block.get_chunk': if cache_only: result = -1 else: try: index = params[0] - result = self.get_chunk( index ) + result = self.get_chunk(index) except BaseException, e: - error = str(e) + ': %d'% index - print_log( "error:", error) + error = str(e) + ': %d' % index + print_log("error:", error) elif method == 'blockchain.transaction.broadcast': - txo = self.bitcoind('sendrawtransaction', params) - print_log( "sent tx:", txo ) - result = txo + try: + txo = self.bitcoind('sendrawtransaction', params) + print_log("sent tx:", txo) + result = txo + except BaseException, e: + result = str(e) # do not send an error + print_log("error:", result, params) elif method == 'blockchain.transaction.get_merkle': if cache_only: @@ -602,60 +606,54 @@ class BlockchainProcessor(Processor): try: tx_hash = params[0] tx_height = params[1] - result = self.get_merkle(tx_hash, tx_height) + result = self.get_merkle(tx_hash, tx_height) except BaseException, e: error = str(e) + ': ' + tx_hash - print_log( "error:", error ) - + print_log("error:", error) + 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, height]) except BaseException, e: error = str(e) + ': ' + tx_hash - print_log( "error:", error ) + print_log("error:", error) else: - error = "unknown method:%s"%method + error = "unknown method:%s" % method - if cache_only and result == -1: return -1 + if cache_only and result == -1: + return -1 if error: - response = { 'id':message_id, 'error':error } - self.push_response(response) + 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: self.watched_addresses.append(addr) - - - def catch_up(self, sync = True): - + def catch_up(self, sync=True): t1 = time.time() while not self.shared.stopped(): - # 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.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_hash = self.bitcoind('getblockhash', [self.height + 1]) next_block = self.bitcoind('getblock', [next_block_hash, 1]) - # 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 + # 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 if (next_block.get('previousblockhash') == self.last_hash) and not revert: @@ -664,40 +662,37 @@ class BlockchainProcessor(Processor): self.write_header(self.block2header(next_block), sync) self.last_hash = next_block_hash - if (self.height)%100 == 0 and not sync: + if self.height % 100 == 0 and not sync: t2 = time.time() - print_log( "catch_up: block %d (%.3fs)"%( self.height, t2 - t1 ) ) + print_log("catch_up: block %d (%.3fs)" % (self.height, t2 - t1)) t1 = t2 - + else: # revert current block block = self.bitcoind('getblock', [self.last_hash, 1]) - print_log( "blockchain reorg", self.height, block.get('previousblockhash'), 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() self.flush_headers() - self.height = self.height -1 + self.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.block2header(self.bitcoind('getblock', [self.last_hash])) - - - def memorypool_update(self): - mempool_hashes = self.bitcoind('getrawmempool') for tx_hash in mempool_hashes: - if tx_hash in self.mempool_hashes: continue + if tx_hash in self.mempool_hashes: + continue - tx = self.get_transaction(tx_hash) - if not tx: continue + tx = self.get_mempool_transaction(tx_hash) + if not tx: + continue for x in tx.get('inputs'): txi = (x.get('prevout_hash') + int_to_hex(x.get('prevout_n'), 4)).decode('hex') @@ -707,15 +702,15 @@ class BlockchainProcessor(Processor): except: continue l = self.mempool_addresses.get(tx_hash, []) - if addr not in l: - l.append( addr ) + if addr not in l: + l.append(addr) self.mempool_addresses[tx_hash] = l 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 ) + if addr not in l: + l.append(addr) self.mempool_addresses[tx_hash] = l self.mempool_hashes.append(tx_hash) @@ -733,13 +728,13 @@ class BlockchainProcessor(Processor): for tx_hash, addresses in self.mempool_addresses.items(): for addr in addresses: h = new_mempool_hist.get(addr, []) - if tx_hash not in h: - h.append( tx_hash ) + if tx_hash not in h: + 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]: + if self.mempool_hist[addr] != new_mempool_hist[addr]: self.invalidate_cache(addr) else: self.invalidate_cache(addr) @@ -747,23 +742,18 @@ class BlockchainProcessor(Processor): with self.mempool_lock: self.mempool_hist = new_mempool_hist - - def invalidate_cache(self, address): with self.cache_lock: - if self.history_cache.has_key(address): - print_log( "cache: invalidating", address ) + 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) - - def main_iteration(self): - - if self.shared.stopped(): - print_log( "blockchain processor terminating" ) + if self.shared.stopped(): + print_log("blockchain processor terminating") return with self.dblock: @@ -775,15 +765,22 @@ class BlockchainProcessor(Processor): 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] }) + self.push_response({ + 'id': None, + 'method': 'blockchain.numblocks.subscribe', + 'params': [self.height], + }) if self.sent_header != self.header: - print_log( "blockchain: %d (%.3fs)"%( self.height, t2 - t1 ) ) + 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] }) + self.push_response({ + 'id': None, + 'method': 'blockchain.headers.subscribe', + 'params': [self.header], + }) while True: try: @@ -791,14 +788,14 @@ class BlockchainProcessor(Processor): 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] }) - - if not self.shared.stopped(): + status = self.get_status(addr) + self.push_response({ + 'id': None, + 'method': 'blockchain.address.subscribe', + 'params': [addr, status], + }) + + if not self.shared.stopped(): threading.Timer(10, self.main_iteration).start() else: - print_log( "blockchain processor terminating" ) - - - - + print_log("blockchain processor terminating")