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

cormorant: set wallet to load on bitcoind startup, check if loaded first

Browse source
This commit is contained in:
Craig Raw 2023-01-30 12:28:07 +02:00
parent f938506a3f
commit 9edeff9aab
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindClient.java
View file

@ -128,18 +128,11 @@ public class BitcoindClient {
legacyWalletExists = listWalletDirResult.wallets().stream().anyMatch(walletDirResult -> walletDirResult.name().equals(Bwt.DEFAULT_CORE_WALLET)); legacyWalletExists = listWalletDirResult.wallets().stream().anyMatch(walletDirResult -> walletDirResult.name().equals(Bwt.DEFAULT_CORE_WALLET));
if(!exists) { if(!exists) {
getBitcoindService().createWallet(CORE_WALLET_NAME, true, true, "", true, true, false, false); getBitcoindService().createWallet(CORE_WALLET_NAME, true, true, "", true, true, true, false);
} else { } else {
try { List<String> wallets = getBitcoindService().listWallets();
getBitcoindService().loadWallet(CORE_WALLET_NAME, false); if(!wallets.contains(CORE_WALLET_NAME)) {
} catch(JsonRpcException e) { getBitcoindService().loadWallet(CORE_WALLET_NAME, true);
try {
getBitcoindService().unloadWallet(CORE_WALLET_NAME, false);
} catch(JsonRpcException ex) {
//ignore
}
getBitcoindService().loadWallet(CORE_WALLET_NAME, false);
} }
} }
@ -346,14 +339,6 @@ public class BitcoindClient {
} }
public void stop() { public void stop() {
if(initialized) {
try {
getBitcoindService().unloadWallet(CORE_WALLET_NAME, false);
} catch(Exception e) {
log.info("Error unloading Core wallet " + CORE_WALLET_NAME, e);
}
}
timer.cancel(); timer.cancel();
stopped = true; stopped = true;
} }

3
src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindClientService.java
View file

@ -57,6 +57,9 @@ public interface BitcoindClientService {
@JsonRpcMethod("listwalletdir") @JsonRpcMethod("listwalletdir")
ListWalletDirResult listWalletDir(); ListWalletDirResult listWalletDir();
@JsonRpcMethod("listwallets")
List<String> listWallets();
@JsonRpcMethod("createwallet") @JsonRpcMethod("createwallet")
CreateLoadWalletResult createWallet(@JsonRpcParam("wallet_name") String name, @JsonRpcParam("disable_private_keys") boolean disablePrivateKeys, @JsonRpcParam("blank") boolean blank, CreateLoadWalletResult createWallet(@JsonRpcParam("wallet_name") String name, @JsonRpcParam("disable_private_keys") boolean disablePrivateKeys, @JsonRpcParam("blank") boolean blank,
@JsonRpcParam("passphrase") String passphrase, @JsonRpcParam("avoid_reuse") boolean avoidReuse, @JsonRpcParam("descriptors") boolean descriptors, @JsonRpcParam("passphrase") String passphrase, @JsonRpcParam("avoid_reuse") boolean avoidReuse, @JsonRpcParam("descriptors") boolean descriptors,