nik/liana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #1746: fix checks for whether wallet uses managed bitcoind

Browse Source 
f8fcf7100b43e98398254d5c846ec9a8a96a1c74 fix checks for whether wallet uses managed bitcoind (Michael Mallan)

Pull request description:

  This fixes a couple of checks for whether the wallet uses a managed bitcoind.

ACKs for top commit:
  edouardparis:
    ACK f8fcf7100b43e98398254d5c846ec9a8a96a1c74

Tree-SHA512: e15cffc10cbe06b4769c65900befdb903109518059f03d31aac10e6ee91a0a9179d45e27eb22a0216b8b1d9ee073564bfb9839de890d32c148c4b243143f4b71
This commit is contained in:
edouardparis 2025-06-16 10:17:58 +02:00
commit 467556d2b2
No known key found for this signature in database
GPG Key ID: E65F7A089C20DC8F
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
liana-gui/src/launcher.rs
View File

@ -109,7 +109,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 let Ok(cfg) = app::Config::from_file(&config_path) {
let internal_bitcoind = 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)
} else {
None

2
liana-gui/src/loader.rs
View File

@ -187,7 +187,7 @@ impl Loader {
) -> Task<Message> {
match res {
Ok((daemon, info)) => {
if self.gui_config.start_internal_bitcoind {
if self.start_bitcoind() {
warn!("Lianad is external, gui will not start internal bitcoind");
}
return self.maybe_skip_syncing(daemon, info);