tdo not pass unconfirmed transactions to the verifier - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 34a6cc5deebfbd06ae375ff31116f609f15190c0
DIR parent cc028c2ca3eec1091e53cf0699fb0b019489bc5c
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 5 Nov 2012 20:40:57 +0100
do not pass unconfirmed transactions to the verifier
Diffstat:
M lib/wallet.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
---
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -542,7 +542,6 @@ class Wallet:
self.transactions[tx_hash] = d
self.update_tx_outputs(tx_hash)
- if self.verifier: self.verifier.add(tx_hash)
self.save()
t@@ -551,7 +550,9 @@ class Wallet:
with self.lock:
self.history[addr] = hist
self.save()
-
+ for tx_hash, tx_height in hist:
+ if tx_height>0:
+ self.verifier.add(tx_hash)
def get_tx_history(self):
t@@ -872,18 +873,18 @@ class Wallet:
def set_verifier(self, verifier):
self.verifier = verifier
- for tx_hash in self.transactions.keys():
- self.verifier.add(tx_hash)
# set the timestamp for transactions that need it
- for l in self.history.values():
- for tx_hash, tx_height in l:
+ for hist in self.history.values():
+ for tx_hash, tx_height in hist:
tx = self.transactions.get(tx_hash)
if tx and not tx.get('timestamp'):
timestamp = self.verifier.get_timestamp(tx_height)
if timestamp:
self.set_tx_timestamp(tx_hash, timestamp)
+ if tx_height>0:
+ self.verifier.add(tx_hash)