X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=backends%2Fbitcoind%2Fblockchain_processor.py;h=db0231300d3feebeaddb450b0677b64c3e2641b4;hb=9cf7b91c6f442dd1b859da6c6c86beb3a2289e6c;hp=e907e85086c37395559c82ea4228cf28322d87c4;hpb=577e0cadc554748ec562d89d033096078575f649;p=electrum-server.git diff --git a/backends/bitcoind/blockchain_processor.py b/backends/bitcoind/blockchain_processor.py index e907e85..db02313 100644 --- a/backends/bitcoind/blockchain_processor.py +++ b/backends/bitcoind/blockchain_processor.py @@ -6,47 +6,8 @@ from Queue import Queue import traceback, sys, os, random - -Hash = lambda x: hashlib.sha256(hashlib.sha256(x).digest()).digest() -hash_encode = lambda x: x[::-1].encode('hex') -hash_decode = lambda x: x.decode('hex')[::-1] - - - -def rev_hex(s): - return s.decode('hex')[::-1].encode('hex') - - -def int_to_hex(i, length=1): - s = hex(i)[2:].rstrip('L') - s = "0"*(2*length - len(s)) + s - return rev_hex(s) - -def header_to_string(res): - pbh = res.get('prev_block_hash') - if pbh is None: pbh = '0'*64 - s = int_to_hex(res.get('version'),4) \ - + rev_hex(pbh) \ - + rev_hex(res.get('merkle_root')) \ - + int_to_hex(int(res.get('timestamp')),4) \ - + int_to_hex(int(res.get('bits')),4) \ - + int_to_hex(int(res.get('nonce')),4) - return s - -def header_from_string( s): - hex_to_int = lambda s: eval('0x' + s[::-1].encode('hex')) - h = {} - h['version'] = hex_to_int(s[0:4]) - h['prev_block_hash'] = hash_encode(s[4:36]) - h['merkle_root'] = hash_encode(s[36:68]) - h['timestamp'] = hex_to_int(s[68:72]) - h['bits'] = hex_to_int(s[72:76]) - h['nonce'] = hex_to_int(s[76:80]) - return h - - - - +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 from processor import Processor, print_log class BlockchainProcessor(Processor): @@ -258,7 +219,8 @@ class BlockchainProcessor(Processor): with self.dblock: try: - hist = self.deserialize(self.db.Get(addr)) + hash_160 = bc_address_to_hash_160(addr) + hist = self.deserialize(self.db.Get(hash_160)) is_known = True except: hist = [] @@ -394,7 +356,8 @@ class BlockchainProcessor(Processor): return eval(s) def write_undo_info(self, batch, height, undo_info): - batch.Put("undo%d"%(height%100), repr(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): @@ -436,12 +399,11 @@ class BlockchainProcessor(Processor): 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'): - addr_to_read.append(x.get('address')) + 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: @@ -453,12 +415,13 @@ class BlockchainProcessor(Processor): if revert: undo_info = self.get_undo_info(block_height) - print "undo", block_height, undo_info + # 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: @@ -470,11 +433,13 @@ class BlockchainProcessor(Processor): undo_info[txid] = undo for x in tx.get('outputs'): - self.add_to_history( x.get('address'), txid, x.get('index'), block_height) + 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'): - self.remove_from_history( x.get('address'), txid, x.get('index')) + 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'): @@ -482,10 +447,12 @@ class BlockchainProcessor(Processor): i += 1 # read the history into batch list - self.batch_list[prevout_addr] = self.db.Get(prevout_addr) + 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 "new hist for", prevout_addr, self.deserialize(self.batch_list[prevout_addr]) + print_log( "new hist for", hash_160_to_bc_address(prevout_addr), self.deserialize(self.batch_list[prevout_addr]) ) # write max_len = 0 @@ -531,7 +498,7 @@ class BlockchainProcessor(Processor): "read:%0.2f "%(t1 - t00), "proc:%.2f "%(t2-t1), "write:%.2f "%(t3-t2), - "max:", max_len, max_addr) + "max:", max_len, hash_160_to_bc_address(max_addr)) for addr in self.batch_list.keys(): self.invalidate_cache(addr) @@ -660,8 +627,8 @@ class BlockchainProcessor(Processor): # are we done yet? info = self.bitcoind('getinfo') - bitcoind_height = info.get('blocks') - bitcoind_block_hash = self.bitcoind('getblockhash', [bitcoind_height]) + self.bitcoind_height = info.get('blocks') + bitcoind_block_hash = self.bitcoind('getblockhash', [self.bitcoind_height]) if self.last_hash == bitcoind_block_hash: self.up_to_date = True break @@ -671,7 +638,9 @@ class BlockchainProcessor(Processor): next_block_hash = self.bitcoind('getblockhash', [self.height+1]) next_block = self.bitcoind('getblock', [next_block_hash, 1]) - 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: self.import_block(next_block, next_block_hash, self.height+1, sync)