LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit 8a71e46e9b.
This commit is contained in:
SomberNight 2018-01-31 16:48:09 +01:00
parent 3ae1dd3e64
commit 48e8bbff69
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/wallet.py
View file

@ -613,7 +613,7 @@ class Abstract_Wallet(PrintError):
x += v x += v
elif tx_height > 0: elif tx_height > 0:
c += v c += v
elif tx_height != TX_HEIGHT_LOCAL: else:
u += v u += v
if txo in sent: if txo in sent:
if sent[txo] > 0: if sent[txo] > 0:
@ -830,7 +830,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
elif height != TX_HEIGHT_LOCAL: else:
balance -= delta balance -= delta
h2.reverse() h2.reverse()