bitcoind: Remove BDB wallet support

Bitcoin Core 25.0 deprecates support for legacy BDB wallets.
alvasw · Sep 3, 2024 · 35da730 · 35da730
1 parent 5d06e4d
commit 35da730
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
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
@@ -38,20 +38,16 @@ public BitcoindDaemon(JsonRpcClient rpcClient) {
     }
 
     public void createOrLoadWallet(String walletName, Optional<String> passphrase) {
-        createOrLoadWallet(walletName, passphrase, true, false, false);
-    }
-
-    public void createOrLoadLegacyWallet(String walletName, Optional<String> 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<String> passphrase, boolean descriptors, boolean disablePrivateKeys, boolean blank) {
+    private void createOrLoadWallet(String walletName, Optional<String> 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<String> 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/...s/bitcoind/src/main/java/bisq/wallets/bitcoind/rpc/calls/BitcoindCreateWalletRpcCall.java b/...s/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
@@ -38,7 +38,7 @@ public ElementsdDaemon(JsonRpcClient rpcClient) {
     }
 
     public void createOrLoadWallet(String walletName, Optional<String> passphrase) {
-        bitcoindDaemon.createOrLoadLegacyWallet(walletName, passphrase);
+        throw new UnsupportedOperationException("Bitcoin Core 25.0 removed legacy wallet support.");
     }
 
     public ElementsdDecodeRawTransactionResponse decodeRawTransaction(String txInHex) {