BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

protocol v0.4: use position for branching

This commit is contained in:
thomasv 2012-10-26 11:29:11 +02:00
parent ee84e5c007
commit 1e15dbab81
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/verifier.py
View File

@ -144,7 +144,7 @@ class WalletVerifier(threading.Thread):
def verify_merkle(self, tx_hash, result): def verify_merkle(self, tx_hash, result):
tx_height = result.get('block_height') tx_height = result.get('block_height')
self.merkle_roots[tx_hash] = self.hash_merkle_root(result['merkle'], tx_hash) self.merkle_roots[tx_hash] = self.hash_merkle_root(result['merkle'], tx_hash, result.get('pos'))
header = self.read_header(tx_height) header = self.read_header(tx_height)
if header: if header:
assert header.get('merkle_root') == self.merkle_roots[tx_hash] assert header.get('merkle_root') == self.merkle_roots[tx_hash]
@ -239,16 +239,14 @@ class WalletVerifier(threading.Thread):
h['nonce'] = hex_to_int(s[76:80]) h['nonce'] = hex_to_int(s[76:80])
return h return h
def hash_header(self, header): def hash_header(self, header):
return rev_hex(Hash(self.header_to_string(header).decode('hex')).encode('hex')) return rev_hex(Hash(self.header_to_string(header).decode('hex')).encode('hex'))
def hash_merkle_root(self, merkle_s, target_hash, pos):
def hash_merkle_root(self, merkle_s, target_hash):
h = hash_decode(target_hash) h = hash_decode(target_hash)
for item in merkle_s: for i in range(len(merkle_s)):
is_left = item[0] == 'L' item = merkle_s[i]
h = Hash( h + hash_decode(item[1:]) ) if is_left else Hash( hash_decode(item[1:]) + h ) h = Hash( hash_decode(item) + h ) if ((pos >> i) & 1) else Hash( h + hash_decode(item) )
return hash_encode(h) return hash_encode(h)
def path(self): def path(self):