tget_history: return empty history if balance check fails - electrum - Electrum Bitcoin wallet
(HTM) git clone https://git.parazyd.org/electrum
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
---
(DIR) commit 065145e5572f9ddb06967ce21a9e9b50bb22d484
(DIR) parent 7f3fc232a0e86eec6740cc1d7b16b81abfb9bf1e
(HTM) Author: ThomasV <thomasv@gitorious>
Date: Thu, 23 Apr 2015 09:49:24 +0200
get_history: return empty history if balance check fails
Diffstat:
M lib/wallet.py | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
---
(DIR) diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -737,8 +737,7 @@ class Abstract_Wallet(object):
delta = self.get_tx_delta(tx_hash, addr)
hh.append([addr, tx_hash, height, delta])
- # 2. merge
- # the delta of a tx on the domain is the sum of its deltas on addresses
+ # 2. merge: the delta of a tx on the domain is the sum of its deltas on addresses
merged = {}
for addr, tx_hash, height, delta in hh:
if tx_hash not in merged:
t@@ -749,31 +748,28 @@ class Abstract_Wallet(object):
# 3. create sorted list
history = []
- #balance = 0
for tx_hash, v in merged.items():
height, value = v
- #balance += value
conf, timestamp = self.verifier.get_confirmations(tx_hash) if self.verifier else (None, None)
- history.append( (tx_hash, conf, value, timestamp) )
- if self.verifier:
- history.sort(key = lambda x: self.verifier.get_txpos(x[0]))
+ history.append((tx_hash, conf, value, timestamp))
+ history.sort(key = lambda x: self.verifier.get_txpos(x[0]))
+ # 4. add balance
c, u = self.get_balance(domain)
balance = c + u
h2 = []
for item in history[::-1]:
tx_hash, conf, value, timestamp = item
- h2.insert( 0, (tx_hash, conf, value, timestamp, balance))
+ h2.insert(0, (tx_hash, conf, value, timestamp, balance))
if balance is not None and value is not None:
balance -= value
else:
balance = None
- assert balance in [None, 0]
- #if balance not in [None, 0]:
- # print_error("history error")
- # self.clear_history()
- # self.update()
+ # fixme: this may happen if history is incomplete
+ if balance not in [None, 0]:
+ print_error("Error: history not synchronized")
+ return []
return h2