AaronFiore/electrum
1
0
Fork 0
Code Activity

fix SPV.hash_merkle_root, add tests/test_verifier.py

Browse Source
This commit is contained in:
zebra-lucky
2020-02-25 19:59:56 +02:00
parent aaf174ef3e
commit d4f7c207a7
2 changed files with 81 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/verifier.py
View File

@@ -149,9 +149,10 @@ class SPV(NetworkJobOnDefaultServer):
for item in merkle_branch_bytes:
if len(item) != 32:
raise MerkleVerificationFailure('all merkle branch items have to 32 bytes long')
h = sha256d(item + h) if (index & 1) else sha256d(h + item)
inner_node = item + h if index & 1 else h + item
cls._raise_if_valid_tx(bh2u(inner_node))
h = sha256d(inner_node)
index >>= 1
cls._raise_if_valid_tx(bh2u(h))
if index != 0:
raise MerkleVerificationFailure(f'leaf_pos_in_tree too large for branch')
return hash_encode(h)