tfix #750 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 37127e563bf8f47588b546e0c16871d6d1811e59
DIR parent 0511d7e76f6be38425ff13c2c74b8792e4bfffa4
HTML Author: ThomasV <thomasv@gitorious>
Date: Sat, 5 Jul 2014 03:57:05 +0200
fix #750
Diffstat:
M lib/verifier.py | 3 +++
1 file changed, 3 insertions(+), 0 deletions(-)
---
DIR diff --git a/lib/verifier.py b/lib/verifier.py
t@@ -102,6 +102,9 @@ class TxVerifier(threading.Thread):
# request missing tx
for tx_hash, tx_height in self.transactions.items():
if tx_hash not in self.verified_tx:
+ # do not request merkle branch before headers are available
+ if tx_height > self.network.blockchain.height():
+ continue
if self.merkle_roots.get(tx_hash) is None and tx_hash not in requested_merkle:
if self.network.send([ ('blockchain.transaction.get_merkle',[tx_hash, tx_height]) ], lambda i,r: self.queue.put(r)):
print_error('requesting merkle', tx_hash)