conflicting transactions

2018-02-06 05:39:26 +01:00
parent 245cd24f34
commit ca19a36478
4 changed files with 115 additions and 30 deletions
--- a/lib/commands.py
+++ b/lib/commands.py
@@ -627,7 +627,8 @@ class Commands:
    def addtransaction(self, tx):
        """ Add a transaction to the wallet history """
        tx = Transaction(tx)
-        self.wallet.add_transaction(tx.txid(), tx)
+        if not self.wallet.add_transaction(tx.txid(), tx):
+            return False
        self.wallet.save_transactions()
        return tx.txid()