tdo not stop thread if a tx is not verified - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 4f56cda0c31ac4deb170881e718735d10435cde7
DIR parent 2c36518e46496893b23b59e04a3837fac3756188
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 15 Aug 2014 08:35:00 +0200
do not stop thread if a tx is not verified
Diffstat:
M lib/verifier.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
DIR diff --git a/lib/verifier.py b/lib/verifier.py
t@@ -138,7 +138,12 @@ class TxVerifier(threading.Thread):
self.merkle_roots[tx_hash] = self.hash_merkle_root(result['merkle'], tx_hash, pos)
header = self.network.get_header(tx_height)
if not header: return
- assert header.get('merkle_root') == self.merkle_roots[tx_hash]
+ if header.get('merkle_root') != self.merkle_roots[tx_hash]:
+ print_error("merkle verification failed for", tx_hash)
+ print_error(header)
+ print_error(result)
+ return
+
# we passed all the tests
timestamp = header.get('timestamp')
with self.lock: