Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support bitcoind 24.0.1 #2756

Merged
merged 3 commits into from
Sep 4, 2024
Merged

Support bitcoind 24.0.1 #2756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
743dd3d
BitcoindRegtestSetup: Remove unnecessary 'throws InterruptedException'
alvasw Sep 3, 2024
48e6a8b
bitcoind: Add wtxid to listtransactions
alvasw Sep 3, 2024
f0eb997
bitcoind: Add parent_descs to listtransactions
alvasw Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...d/src/main/java/bisq/wallets/bitcoind/rpc/responses/BitcoindListTransactionsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public class BitcoindListTransactionsResponse extends JsonRpcResponse<List<Bitco
public static class Entry implements TransactionInfo {
private boolean involvesWatchonly;
private String address;
@Json(name = "parent_descs")
private List<String> parentDescs;
private String category;
private double amount;
private String label;
Expand All @@ -46,6 +48,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;
Expand Down
2 changes: 1 addition & 1 deletion wallets/regtest/src/main/java/bisq/wallets/regtest/bitcoind/BitcoindRegtestSetup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public List<String> mineOneBlock() throws InterruptedException {
return mineBlocks(1);
}

public List<String> mineBlocks(int numberOfBlocks) throws InterruptedException {
public List<String> mineBlocks(int numberOfBlocks) {
return remoteBitcoind.mineBlocks(numberOfBlocks);
}

Expand Down
Loading