AaronFiore/electrum
1
0
Fork 0
Code Activity

fix conflicting local txns, e.g. when using RBF

Browse Source
This commit is contained in:
SomberNight
2018-01-29 15:39:46 +01:00
parent 2a1e5238c8
commit 8a71e46e9b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/wallet.py
View File

@@ -607,7 +607,7 @@ class Abstract_Wallet(PrintError):
x += v x += v
elif tx_height > 0: elif tx_height > 0:
c += v c += v
else: elif tx_height != -2: # local tx
u += v u += v
if txo in sent: if txo in sent:
if sent[txo] > 0: if sent[txo] > 0:
@@ -824,7 +824,7 @@ class Abstract_Wallet(PrintError):
h2.append((tx_hash, height, conf, timestamp, delta, balance)) h2.append((tx_hash, height, conf, timestamp, delta, balance))
if balance is None or delta is None: if balance is None or delta is None:
balance = None balance = None
else: elif height != -2: # local tx
balance -= delta balance -= delta
h2.reverse() h2.reverse()