diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindDaemon.java b/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindDaemon.java index a6dd504b5e..dd321426b2 100644 --- a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindDaemon.java +++ b/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/BitcoindDaemon.java @@ -38,20 +38,16 @@ public BitcoindDaemon(JsonRpcClient rpcClient) { } public void createOrLoadWallet(String walletName, Optional passphrase) { - createOrLoadWallet(walletName, passphrase, true, false, false); - } - - public void createOrLoadLegacyWallet(String walletName, Optional passphrase) { - createOrLoadWallet(walletName, passphrase, false, false, false); + createOrLoadWallet(walletName, passphrase, false, false); } public void createOrLoadWatchOnlyWallet(String walletName) { - createOrLoadWallet(walletName, Optional.empty(), true, true, true); + createOrLoadWallet(walletName, Optional.empty(), true, true); } - private void createOrLoadWallet(String walletName, Optional passphrase, boolean descriptors, boolean disablePrivateKeys, boolean blank) { + private void createOrLoadWallet(String walletName, Optional passphrase, boolean disablePrivateKeys, boolean blank) { try { - createWallet(walletName, passphrase.orElse(""), descriptors, disablePrivateKeys, blank); + createWallet(walletName, passphrase.orElse(""), disablePrivateKeys, blank); } catch (RpcCallFailureException e) { if (doesWalletExist(e)) { List loadedWallets = listWallets(); @@ -151,10 +147,9 @@ private boolean doesWalletExist(RpcCallFailureException e) { return e.getMessage().contains("Database already exists."); } - private void createWallet(String walletName, String passphrase, boolean descriptors, boolean disablePrivateKeys, boolean blank) { + private void createWallet(String walletName, String passphrase, boolean disablePrivateKeys, boolean blank) { var request = BitcoindCreateWalletRpcCall.Request.builder() .walletName(walletName) - .descriptors(descriptors) .disablePrivateKeys(disablePrivateKeys) .blank(blank) .passphrase(passphrase) diff --git a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateWalletRpcCall.java b/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateWalletRpcCall.java index 3f6050ae23..9537ef5fe3 100644 --- a/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateWalletRpcCall.java +++ b/wallets/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateWalletRpcCall.java @@ -39,7 +39,6 @@ public static class Request { private String passphrase; @Json(name = "avoid_reuse") private Boolean avoidReuse; - private boolean descriptors; } public BitcoindCreateWalletRpcCall(Request request) { diff --git a/wallets/elementsd/src/main/java/bisq/wallets/elementsd/rpc/ElementsdDaemon.java b/wallets/elementsd/src/main/java/bisq/wallets/elementsd/rpc/ElementsdDaemon.java index b4ac2bc03c..489954c3cb 100644 --- a/wallets/elementsd/src/main/java/bisq/wallets/elementsd/rpc/ElementsdDaemon.java +++ b/wallets/elementsd/src/main/java/bisq/wallets/elementsd/rpc/ElementsdDaemon.java @@ -38,7 +38,7 @@ public ElementsdDaemon(JsonRpcClient rpcClient) { } public void createOrLoadWallet(String walletName, Optional passphrase) { - bitcoindDaemon.createOrLoadLegacyWallet(walletName, passphrase); + throw new UnsupportedOperationException("Bitcoin Core 25.0 removed legacy wallet support."); } public ElementsdDecodeRawTransactionResponse decodeRawTransaction(String txInHex) {