diff --git a/drongo b/drongo index 692f23e0..ca98d4d9 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 692f23e02656b43b58c33b44467f920ddc3a3f65 +Subproject commit ca98d4d9b60c5a53e758fa90dcbe1c0dff78fcb6 diff --git a/src/main/java/com/sparrowwallet/sparrow/io/Storage.java b/src/main/java/com/sparrowwallet/sparrow/io/Storage.java index 660a0c9b..07ff0956 100644 --- a/src/main/java/com/sparrowwallet/sparrow/io/Storage.java +++ b/src/main/java/com/sparrowwallet/sparrow/io/Storage.java @@ -145,7 +145,7 @@ public class Storage { if(wallet.containsMasterPrivateKeys()) { //Derive xpub and master fingerprint from seed, potentially with passphrase - Wallet copy = wallet.copy(); + Wallet copy = wallet.copy(false); for(int i = 0; i < copy.getKeystores().size(); i++) { Keystore copyKeystore = copy.getKeystores().get(i); if(copyKeystore.hasSeed() && copyKeystore.getSeed().getPassphrase() == null) { diff --git a/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java b/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java index 326f6091..a56a54b2 100644 --- a/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java +++ b/src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java @@ -1139,7 +1139,7 @@ public class ElectrumServer { Matcher walletLoadingMatcher = RPC_WALLET_LOADING_PATTERN.matcher(bwtStartException.getMessage()); if(bwtStartException.getMessage().contains("Wallet file not specified")) { throw new ServerException("Bitcoin Core requires Multi-Wallet to be enabled in the Server Preferences"); - } else if(bwtStartException.getMessage().contains("Taproot wallets are not supported")) { + } else if(bwtStartException.getMessage().contains("Upgrade Bitcoin Core to v24 or later for Taproot wallet support")) { throw new ServerException(bwtStartException.getMessage()); } else if(walletLoadingMatcher.matches() && walletLoadingMatcher.group(1) != null) { throw new ServerException(walletLoadingMatcher.group(1));