AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #3998

Browse Source
This commit is contained in:
ThomasV
2018-03-02 18:00:05 +01:00
parent 2a51914c31
commit 4b7cf297f5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/wallet.py
View File

@@ -866,16 +866,19 @@ class Abstract_Wallet(PrintError):
return True return True
def remove_transaction(self, tx_hash): def remove_transaction(self, tx_hash):
def undo_spend(outpoint_to_txid_map):
for addr, l in self.txi[tx_hash].items():
for ser, v in l:
outpoint_to_txid_map.pop(ser, None)
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, None) self.transactions.pop(tx_hash, None)
undo_spend(self.pruned_txo) # undo spent_outpoints that are in txi
undo_spend(self.spent_outpoints) for addr, l in self.txi[tx_hash].items():
for ser, v in l:
self.spent_outpoints.pop(ser, None)
# undo spent_outpoints that are in pruned_txo
for ser, hh in list(self.pruned_txo.items()):
if hh == tx_hash:
self.spent_outpoints.pop(ser)
self.pruned_txo.pop(ser)
# add tx to pruned_txo, and undo the txi addition # add tx to pruned_txo, and undo the txi addition
for next_tx, dd in self.txi.items(): for next_tx, dd in self.txi.items():