diff --git a/external/monero-cpp b/external/monero-cpp index f5f2fb0f..94fe2385 160000 --- a/external/monero-cpp +++ b/external/monero-cpp @@ -1 +1 @@ -Subproject commit f5f2fb0f9b858327b6cb44514016688704559ca2 +Subproject commit 94fe2385306aa4f6541c3579307dc9db692d514d diff --git a/src/main/java/monero/daemon/model/MoneroTx.java b/src/main/java/monero/daemon/model/MoneroTx.java index 8258f980..560ee4bb 100644 --- a/src/main/java/monero/daemon/model/MoneroTx.java +++ b/src/main/java/monero/daemon/model/MoneroTx.java @@ -485,7 +485,7 @@ public MoneroTx merge(MoneroTx tx) { this.setIsMinerTx(GenUtils.reconcile(this.isMinerTx(), tx.isMinerTx(), null, null, null)); this.setRelay(GenUtils.reconcile(this.getRelay(), tx.getRelay(), null, true, null)); // tx can become relayed this.setIsRelayed(GenUtils.reconcile(this.isRelayed(), tx.isRelayed(), null, true, null)); // tx can become relayed - this.setIsDoubleSpendSeen(GenUtils.reconcile(this.isDoubleSpendSeen(), tx.isDoubleSpendSeen())); + this.setIsDoubleSpendSeen(GenUtils.reconcile(this.isDoubleSpendSeen(), tx.isDoubleSpendSeen(), null, true, null)); // double spend can become seen this.setKey(GenUtils.reconcile(this.getKey(), tx.getKey())); this.setFullHex(GenUtils.reconcile(this.getFullHex(), tx.getFullHex())); this.setPrunedHex(GenUtils.reconcile(this.getPrunedHex(), tx.getPrunedHex()));