From 324540009ae413863b74505a871176a8fce2e537 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Mon, 28 Jun 2021 13:08:44 +0200 Subject: [PATCH] fix detection of input type on finalizing psbt wallet --- build.gradle | 1 + drongo | 2 +- .../java/com/sparrowwallet/sparrow/transaction/InputForm.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e5adbf9c..78f10073 100644 --- a/build.gradle +++ b/build.gradle @@ -282,6 +282,7 @@ extraJavaModuleInfo { module('jul-to-slf4j-1.7.30.jar', 'org.slf4j.jul.to.slf4j', '1.7.30') { exports('org.slf4j.bridge') requires('java.logging') + requires('org.slf4j') } module('jeromq-0.5.0.jar', 'jeromq', '0.5.0') { exports('org.zeromq') diff --git a/drongo b/drongo index 9d3c02d1..107a165f 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 9d3c02d18440b82cb261a89f372da72dd0f87a1f +Subproject commit 107a165fc1db84f80febbe358aaab16b2764a5d5 diff --git a/src/main/java/com/sparrowwallet/sparrow/transaction/InputForm.java b/src/main/java/com/sparrowwallet/sparrow/transaction/InputForm.java index 0837b30e..f206963e 100644 --- a/src/main/java/com/sparrowwallet/sparrow/transaction/InputForm.java +++ b/src/main/java/com/sparrowwallet/sparrow/transaction/InputForm.java @@ -48,7 +48,7 @@ public class InputForm extends IndexedTransactionForm { public boolean isWalletTxo() { TransactionInput txInput = getTransactionInput(); - return getSigningWallet() != null && getSigningWallet().getWalletTxos().keySet().stream().anyMatch(ref -> ref.getHash().equals(txInput.getOutpoint().getHash()) && ref.getIndex() == txInput.getOutpoint().getIndex()); + return getSigningWallet() != null && getSigningWallet().isWalletTxo(txInput); } @Override