AaronFiore/electrum
1
0
Fork 0
Code Activity

follow-up 586074cb0f

Browse Source
This commit is contained in:
SomberNight
2018-02-17 15:51:33 +01:00
parent 586074cb0f
commit 0d758a650d
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/wallet.py
View File

@@ -278,8 +278,8 @@ class Abstract_Wallet(PrintError):
@profiler @profiler
def build_spent_outpoints(self): def build_spent_outpoints(self):
self.spent_outpoints = {} self.spent_outpoints = {}
for txid in self.txi: for txid, items in self.txi.items():
for addr, l in self.txi[txid].items(): for addr, l in items.items():
for ser, v in l: for ser, v in l:
self.spent_outpoints[ser] = txid self.spent_outpoints[ser] = txid
@@ -711,8 +711,8 @@ class Abstract_Wallet(PrintError):
addr = txi.get('address') addr = txi.get('address')
if addr != "(pubkey)": if addr != "(pubkey)":
return addr return addr
prevout_hash = x.get('prevout_hash') prevout_hash = txi.get('prevout_hash')
prevout_n = x.get('prevout_n') prevout_n = txi.get('prevout_n')
dd = self.txo.get(prevout_hash, {}) dd = self.txo.get(prevout_hash, {})
for addr, l in dd.items(): for addr, l in dd.items():
for n, v, is_cb in l: for n, v, is_cb in l:
@@ -837,12 +837,11 @@ class Abstract_Wallet(PrintError):
def undo_spend(outpoint_to_txid_map): def undo_spend(outpoint_to_txid_map):
for addr, l in self.txi[tx_hash].items(): for addr, l in self.txi[tx_hash].items():
for ser, v in l: for ser, v in l:
if ser in outpoint_to_txid: outpoint_to_txid_map.pop(ser, None)
outpoint_to_txid_map.pop(ser)
with self.transaction_lock: with self.transaction_lock:
self.print_error("removing tx from history", tx_hash) self.print_error("removing tx from history", tx_hash)
self.transactions.pop(tx_hash) self.transactions.pop(tx_hash, None)
undo_spend(self.pruned_txo) undo_spend(self.pruned_txo)
undo_spend(self.spent_outpoints) undo_spend(self.spent_outpoints)