From: ThomasV <thomasv@gitorious>
Date: Sat, 5 Jul 2014 01:57:05 +0000 (+0200)
Subject: fix #750
X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=commitdiff_plain;h=37127e563bf8f47588b546e0c16871d6d1811e59

fix #750
---

diff --git a/lib/verifier.py b/lib/verifier.py
index f05625b..c97c5e7 100644
--- a/lib/verifier.py
+++ b/lib/verifier.py
@@ -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)