From 497cf333b0275d6e073e412d733e5bc258b4b1ad Mon Sep 17 00:00:00 2001
From: Craig Raw <craigraw@gmail.com>
Date: Mon, 12 Apr 2021 15:47:45 +0200
Subject: [PATCH] ensure wallet cannot have negative balance with same block tx
 ordering

---
 drongo                                                 |  2 +-
 .../sparrowwallet/sparrow/wallet/TransactionEntry.java | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/drongo b/drongo
index b7038b19..a56f8971 160000
--- a/drongo
+++ b/drongo
@@ -1 +1 @@
-Subproject commit b7038b19f9d44cfc50af151927b06f9aada9d5e7
+Subproject commit a56f8971c022192dbce0dfc5da3c417b605e4b4f
diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionEntry.java b/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionEntry.java
index e24449e7..1598e837 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionEntry.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/TransactionEntry.java
@@ -155,6 +155,16 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
 
     @Override
     public int compareTo(TransactionEntry other) {
+        int blockOrder = blockTransaction.compareBlockOrder(other.blockTransaction);
+        if(blockOrder != 0) {
+            return blockOrder;
+        }
+
+        int valueOrder = Long.compare(other.getValue(), getValue());
+        if(valueOrder != 0) {
+            return valueOrder;
+        }
+
         return blockTransaction.compareTo(other.blockTransaction);
     }