sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 13:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

improve legacy core wallet error messages

Browse source
This commit is contained in:
Craig Raw 2023-02-09 13:14:03 +02:00
parent 24e75603c6
commit 7ad8a04bda
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/sparrowwallet/sparrow/net/ElectrumServer.java
View file

@ -69,7 +69,7 @@ public class ElectrumServer {
private static Server coreElectrumServer; private static Server coreElectrumServer;
private static final Pattern RPC_WALLET_LOADING_PATTERN = Pattern.compile(".*\"(Wallet loading failed:[^\"]*)\".*"); private static final Pattern RPC_WALLET_LOADING_PATTERN = Pattern.compile(".*\"(Wallet loading failed[:.][^\"]*)\".*");
private static synchronized CloseableTransport getTransport() throws ServerException { private static synchronized CloseableTransport getTransport() throws ServerException {
if(transport == null) { if(transport == null) {
@ -1141,6 +1141,10 @@ public class ElectrumServer {
throw new ServerException("Bitcoin Core requires Multi-Wallet to be enabled in the Server Preferences"); throw new ServerException("Bitcoin Core requires Multi-Wallet to be enabled in the Server Preferences");
} else if(bwtStartException.getMessage().contains("Upgrade Bitcoin Core to v24 or later for Taproot wallet support")) { } else if(bwtStartException.getMessage().contains("Upgrade Bitcoin Core to v24 or later for Taproot wallet support")) {
throw new ServerException(bwtStartException.getMessage()); throw new ServerException(bwtStartException.getMessage());
} else if(bwtStartException.getMessage().contains("Wallet file verification failed. Refusing to load database.")) {
throw new ServerException("Bitcoin Core wallet file verification failed. Try restarting Bitcoin Core.");
} else if(bwtStartException.getMessage().contains("This error could be caused by pruning or data corruption")) {
throw new ServerException("Scanning failed. Bitcoin Core is pruned to a date after the wallet birthday.");
} else if(walletLoadingMatcher.matches() && walletLoadingMatcher.group(1) != null) { } else if(walletLoadingMatcher.matches() && walletLoadingMatcher.group(1) != null) {
throw new ServerException(walletLoadingMatcher.group(1)); throw new ServerException(walletLoadingMatcher.group(1));
} }