electrum-personal-server

commit d1fa014b48bc8fe9dd58795f00ebafb608c5e793
parent 44cf99613314e673457c3e4b14fd41f5358e8d09
Author: chris-belcher <chris-belcher@users.noreply.github.com>
Date:   Fri, 27 Apr 2018 00:12:56 +0100

fixed bug, conflicted transactions are any confirmations < 0, not just -1

Diffstat:
M
electrumpersonalserver/transactionmonitor.py
 | 
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/electrumpersonalserver/transactionmonitor.py b/electrumpersonalserver/transactionmonitor.py
@@ -109,7 +109,7 @@ class TransactionMonitor(object):
                     continue
                 if tx["category"] not in ("receive", "send"):
                     continue
-                if tx["confirmations"] == -1:
+                if tx["confirmations"] < 0:
                     continue #conflicted
                 if tx["txid"] in obtained_txids:
                     continue
@@ -307,7 +307,7 @@ class TransactionMonitor(object):
                         self.address_history[scrhash]["history"].append(
                             new_history_element)
 
-                elif tx["confirmations"] == -1:
+                elif tx["confirmations"] < 0:
                     #tx became conflicted in reorg i.e. a double spend
                     self.log("A transaction was double spent! " + txid)
                     elements_removed.append(reorgable_tx)
@@ -357,7 +357,7 @@ class TransactionMonitor(object):
             if tx["confirmations"] > 0:
                 self.log("A transaction confirmed: " + uc_txid)
                 block = self.rpc.call("getblockheader", [tx["blockhash"]])
-            elif tx["confirmations"] == -1:
+            elif tx["confirmations"] < 0:
                 self.log("A transaction became conflicted: " + uc_txid)
             for scrhash in scrhashes:
                 #delete the old unconfirmed entry in address_history
@@ -421,7 +421,7 @@ class TransactionMonitor(object):
                 continue
             if tx["category"] not in ("receive", "send"):
                 continue
-            if tx["confirmations"] == -1:
+            if tx["confirmations"] < 0:
                 continue #conflicted
             if tx["txid"] in obtained_txids:
                 continue