From 48e8bbff69f35d970cfaaade8a20fb0899fb91e4 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Wed, 31 Jan 2018 16:48:09 +0100 Subject: [PATCH] Revert "fix conflicting local txns, e.g. when using RBF" This reverts commit 8a71e46e9b9940932e1d25b75047ea36f535541c. --- lib/wallet.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/wallet.py b/lib/wallet.py index 0405a52cc..db310e612 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -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()