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

This reverts commit 8a71e46e9b.
This commit is contained in:
SomberNight 2018-01-31 16:48:09 +01:00
parent 3ae1dd3e64
commit 48e8bbff69

View file

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