From 743dd3ded45654465bea482a26e41f8be6aad414 Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Tue, 3 Sep 2024 14:43:07 +0000 Subject: [PATCH 1/3] BitcoindRegtestSetup: Remove unnecessary 'throws InterruptedException' --- .../bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java b/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java index a77221171e..5d49e5f872 100644 --- a/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java +++ b/wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java @@ -65,7 +65,7 @@ public List mineOneBlock() throws InterruptedException { return mineBlocks(1); } - public List mineBlocks(int numberOfBlocks) throws InterruptedException { + public List mineBlocks(int numberOfBlocks) { return remoteBitcoind.mineBlocks(numberOfBlocks); } From 48e6a8b2153d00e7ee5b758e2ff3f14f9984766b Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Tue, 3 Sep 2024 14:48:25 +0000 Subject: [PATCH 2/3] bitcoind: Add wtxid to listtransactions This field was added in Bitcoin Core 24.0.1. --- .../rpc/responses/BitcoindListTransactionsResponse.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java b/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java index ded7429aae..7c26f2aeb5 100644 --- a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java +++ b/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java @@ -46,6 +46,8 @@ public static class Entry implements TransactionInfo { private int blocktime; @Json(name = "txid") private String txId; + @Json(name = "wtxid") + private String wtxId; private String[] walletconflicts; private int time; private int timereceived; From f0eb9977c1df478fe1fd399a5f917006c8781ddf Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Tue, 3 Sep 2024 14:48:28 +0000 Subject: [PATCH 3/3] bitcoind: Add parent_descs to listtransactions This field was added in Bitcoin Core 24.0.1. --- .../rpc/responses/BitcoindListTransactionsResponse.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java b/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java index 7c26f2aeb5..bca0d211a4 100644 --- a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java +++ b/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java @@ -32,6 +32,8 @@ public class BitcoindListTransactionsResponse extends JsonRpcResponse parentDescs; private String category; private double amount; private String label;