diff --git a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java index 465ef80163..15bbe80230 100644 --- a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java +++ b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java @@ -405,7 +405,7 @@ public class BsqWalletService extends WalletService implements DaoStateListener if (isConfirmed) { // We lookup if we have a BSQ tx matching the parent tx // We cannot make that findTx call outside of the loop as the parent tx can change at each iteration - Optional txOptional = daoStateService.getTx(parentTransaction.getHash().toString()); + Optional txOptional = daoStateService.getTx(parentTransaction.getTxId().toString()); if (txOptional.isPresent()) { TxOutput txOutput = txOptional.get().getTxOutputs().get(connectedOutput.getIndex()); if (daoStateService.isBsqTxOutputType(txOutput)) { diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletService.java b/core/src/main/java/bisq/core/btc/wallet/WalletService.java index d5787cb221..58f09a161e 100644 --- a/core/src/main/java/bisq/core/btc/wallet/WalletService.java +++ b/core/src/main/java/bisq/core/btc/wallet/WalletService.java @@ -761,7 +761,7 @@ public abstract class WalletService { Wallet wallet, TransactionConfidence.Source source) throws VerificationException { Transaction tx = new Transaction(wallet.getParams(), serializedTransaction); - Transaction walletTransaction = wallet.getTransaction(tx.getHash()); + Transaction walletTransaction = wallet.getTransaction(tx.getTxId()); if (walletTransaction == null) { // We need to recreate the transaction otherwise we get a null pointer... diff --git a/core/src/main/java/bisq/core/trade/Trade.java b/core/src/main/java/bisq/core/trade/Trade.java index fb08bd2d9c..4f0f900a38 100644 --- a/core/src/main/java/bisq/core/trade/Trade.java +++ b/core/src/main/java/bisq/core/trade/Trade.java @@ -695,7 +695,7 @@ public abstract class Trade implements Tradable, Model { // The deserialized tx has not actual confidence data, so we need to get the fresh one from the wallet. void updateDepositTxFromWallet() { if (getDepositTx() != null) - applyDepositTx(processModel.getTradeWalletService().getWalletTx(getDepositTx().getHash())); + applyDepositTx(processModel.getTradeWalletService().getWalletTx(getDepositTx().getTxId())); } public void applyDepositTx(Transaction tx) {