Merge #1780: fix: a wallet with remote auth does not use managed bitcoind
d86d6852b93013df15e914f43a8e631dd7cbe084 fix: a wallet with remote auth does not use managed bitcoind (Michael Mallan) Pull request description: This is a follow-up to #1746 to address the case where the wallet uses Liana Connect, in which case `start_internal_bitcoind` is set to `null` in the settings file. ACKs for top commit: edouardparis: utACK d86d6852b93013df15e914f43a8e631dd7cbe084 Tree-SHA512: 23cf226651f8321b1ff482c977e7d23137debf8d62a3d824d197c2fefed576234eaee7ea014e2ae16dcedc70c198cfc2c5e00d57040b13108033728bb2aeb863
This commit is contained in:
commit
b6ef010f04
@ -120,7 +120,9 @@ impl Launcher {
|
||||
if let State::Wallets { wallets, .. } = &self.state {
|
||||
let wallet_datadir = self.datadir_path.network_directory(self.network);
|
||||
let config_path = wallet_datadir.path().join(app::config::DEFAULT_FILE_NAME);
|
||||
let internal_bitcoind = if wallets[i].start_internal_bitcoind.is_some() {
|
||||
let internal_bitcoind = if wallets[i].remote_backend_auth.is_some() {
|
||||
Some(false)
|
||||
} else if wallets[i].start_internal_bitcoind.is_some() {
|
||||
wallets[i].start_internal_bitcoind
|
||||
} else if let Ok(cfg) = app::Config::from_file(&config_path) {
|
||||
Some(cfg.start_internal_bitcoind)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user