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

Merge #624: fix gui internal daemon: stop gracefully

Browse Source 
a1c716611769e1cdaa08b2b6a458052de2d9a003 fix gui: stop daemon gracefully (edouard)

Pull request description:

ACKs for top commit:
  darosior:
    utACK a1c716611769e1cdaa08b2b6a458052de2d9a003

Tree-SHA512: 908ac1284aea89e9a84176f180aa6241f2ca8fe6846ebca6ea134c7e145d775689cac41aa33c6f4b6b009bda664ba290572701294fe07f5280a5e2851d0242f1
This commit is contained in:
Antoine Poinsot 2023-08-22 16:46:38 +02:00
commit 76dcc8bb3e
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
7 changed files with 29 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/Cargo.lock generated
View File

@ -1919,7 +1919,7 @@ dependencies = [
[[package]]
name = "liana"
version = "1.0.0"
source = "git+https://github.com/wizardsardine/liana?branch=master#6c969aeacdde28a84f0a04060b280343a1e22afe"
source = "git+https://github.com/wizardsardine/liana?branch=master#05c9b580dba1933ffcc7efcc188dc75fdff211ba"
dependencies = [
"backtrace",
"bip39",

2
gui/Cargo.toml
View File

@ -15,7 +15,7 @@ path = "src/main.rs"
[dependencies]
async-hwi = "0.0.10"
liana = { git = "https://github.com/wizardsardine/liana", branch = "master", default-features = false }
liana = { git = "https://github.com/wizardsardine/liana", branch = "master", default-features = false, features = ["nonblocking_shutdown"] }
liana_ui = { path = "ui" }
backtrace = "0.3"
base64 = "0.13"

18
gui/src/app/mod.rs
View File

@ -31,7 +31,7 @@ use state::{
use crate::{
app::{cache::Cache, error::Error, menu::Menu, wallet::Wallet},
daemon::Daemon,
daemon::{embedded::EmbeddedDaemon, Daemon},
};
pub struct App {
@ -113,11 +113,8 @@ impl App {
pub fn stop(&mut self) {
info!("Close requested");
if !self.daemon.is_external() {
info!("Stopping internal daemon...");
if let Some(d) = Arc::get_mut(&mut self.daemon) {
d.stop().expect("Daemon is internal");
info!("Internal daemon stopped");
}
self.daemon.stop();
info!("Internal daemon stopped");
}
}
@ -171,12 +168,9 @@ impl App {
daemon_config_path: &PathBuf,
cfg: DaemonConfig,
) -> Result<(), Error> {
loop {
if let Some(daemon) = Arc::get_mut(&mut self.daemon) {
daemon.load_config(cfg)?;
break;
}
}
self.daemon.stop();
let daemon = EmbeddedDaemon::start(cfg)?;
self.daemon = Arc::new(daemon);
let mut daemon_config_file = OpenOptions::new()
.write(true)

5
gui/src/daemon/client/mod.rs
View File

@ -58,9 +58,8 @@ impl<C: Client + Debug> Daemon for Lianad<C> {
None
}
fn stop(&mut self) -> Result<(), DaemonError> {
let _res: serde_json::value::Value = self.call("stop", Option::<Request>::None)?;
Ok(())
fn stop(&self) {
unreachable!("GUI should not ask external client to stop")
}
fn get_info(&self) -> Result<GetInfoResult, DaemonError> {

116
gui/src/daemon/embedded.rs
View File

@ -1,5 +1,4 @@
use std::collections::HashMap;
use std::sync::RwLock;
use super::{model::*, Daemon, DaemonError};
use liana::{
@ -10,22 +9,13 @@ use liana::{
pub struct EmbeddedDaemon {
config: Config,
handle: Option<RwLock<DaemonHandle>>,
handle: DaemonHandle,
}
impl EmbeddedDaemon {
pub fn new(config: Config) -> Self {
Self {
config,
handle: None,
}
}
pub fn start(&mut self) -> Result<(), DaemonError> {
let handle =
DaemonHandle::start_default(self.config.clone()).map_err(DaemonError::Start)?;
self.handle = Some(RwLock::new(handle));
Ok(())
pub fn start(config: Config) -> Result<EmbeddedDaemon, DaemonError> {
let handle = DaemonHandle::start_default(config.clone()).map_err(DaemonError::Start)?;
Ok(Self { handle, config })
}
}
@ -40,71 +30,32 @@ impl Daemon for EmbeddedDaemon {
false
}
fn load_config(&mut self, cfg: Config) -> Result<(), DaemonError> {
if self.handle.is_none() {
return Ok(());
}
let next = DaemonHandle::start_default(cfg).map_err(DaemonError::Start)?;
self.handle.take().unwrap().into_inner().unwrap().shutdown();
self.handle = Some(RwLock::new(next));
Ok(())
}
fn config(&self) -> Option<&Config> {
Some(&self.config)
}
fn stop(&mut self) -> Result<(), DaemonError> {
if let Some(h) = self.handle.take() {
let handle = h.into_inner().unwrap();
handle.shutdown();
fn stop(&self) {
self.handle.trigger_shutdown();
while !self.handle.shutdown_complete() {
tracing::debug!("Waiting daemon to shutdown");
std::thread::sleep(std::time::Duration::from_millis(500));
}
Ok(())
}
fn get_info(&self) -> Result<GetInfoResult, DaemonError> {
Ok(self
.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.get_info())
Ok(self.handle.control.get_info())
}
fn get_new_address(&self) -> Result<GetAddressResult, DaemonError> {
Ok(self
.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.get_new_address())
Ok(self.handle.control.get_new_address())
}
fn list_coins(&self) -> Result<ListCoinsResult, DaemonError> {
Ok(self
.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.list_coins())
Ok(self.handle.control.list_coins())
}
fn list_spend_txs(&self) -> Result<ListSpendResult, DaemonError> {
Ok(self
.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.list_spend())
Ok(self.handle.control.list_spend())
}
fn list_confirmed_txs(
@ -115,23 +66,12 @@ impl Daemon for EmbeddedDaemon {
) -> Result<ListTransactionsResult, DaemonError> {
Ok(self
.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.list_confirmed_transactions(start, end, limit))
}
fn list_txs(&self, txids: &[Txid]) -> Result<ListTransactionsResult, DaemonError> {
Ok(self
.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.list_transactions(txids))
Ok(self.handle.control.list_transactions(txids))
}
fn create_spend_tx(
@ -141,10 +81,6 @@ impl Daemon for EmbeddedDaemon {
feerate_vb: u64,
) -> Result<CreateSpendResult, DaemonError> {
self.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.create_spend(destinations, coins_outpoints, feerate_vb)
.map_err(|e| DaemonError::Unexpected(e.to_string()))
@ -152,32 +88,18 @@ impl Daemon for EmbeddedDaemon {
fn update_spend_tx(&self, psbt: &Psbt) -> Result<(), DaemonError> {
self.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.update_spend(psbt.clone())
.map_err(|e| DaemonError::Unexpected(e.to_string()))
}
fn delete_spend_tx(&self, txid: &Txid) -> Result<(), DaemonError> {
self.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.delete_spend(txid);
self.handle.control.delete_spend(txid);
Ok(())
}
fn broadcast_spend_tx(&self, txid: &Txid) -> Result<(), DaemonError> {
self.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.broadcast_spend(txid)
.map_err(|e| DaemonError::Unexpected(e.to_string()))
@ -185,10 +107,6 @@ impl Daemon for EmbeddedDaemon {
fn start_rescan(&self, t: u32) -> Result<(), DaemonError> {
self.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.start_rescan(t)
.map_err(|e| DaemonError::Unexpected(e.to_string()))
@ -201,10 +119,6 @@ impl Daemon for EmbeddedDaemon {
sequence: Option<u16>,
) -> Result<Psbt, DaemonError> {
self.handle
.as_ref()
.ok_or(DaemonError::NoAnswer)?
.read()
.unwrap()
.control
.create_recovery(address, feerate_vb, sequence)
.map_err(|e| DaemonError::Unexpected(e.to_string()))

5
gui/src/daemon/mod.rs
View File

@ -43,11 +43,8 @@ impl std::fmt::Display for DaemonError {
pub trait Daemon: Debug {
fn is_external(&self) -> bool;
fn load_config(&mut self, _cfg: Config) -> Result<(), DaemonError> {
Ok(())
}
fn config(&self) -> Option<&Config>;
fn stop(&mut self) -> Result<(), DaemonError>;
fn stop(&self);
fn get_info(&self) -> Result<model::GetInfoResult, DaemonError>;
fn get_new_address(&self) -> Result<model::GetAddressResult, DaemonError>;
fn list_coins(&self) -> Result<model::ListCoinsResult, DaemonError>;

10
gui/src/loader.rs
View File

@ -171,11 +171,8 @@ impl Loader {
if let Step::Syncing { daemon, .. } = &mut self.step {
if !daemon.is_external() {
info!("Stopping internal daemon...");
if let Some(d) = Arc::get_mut(daemon) {
d.stop().expect("Daemon is internal");
info!("Internal daemon stopped");
} else {
}
daemon.stop();
info!("Internal daemon stopped");
}
}
}
@ -335,8 +332,7 @@ pub async fn start_daemon(config_path: PathBuf) -> Result<Arc<dyn Daemon + Sync
let config = Config::from_file(Some(config_path)).map_err(Error::Config)?;
let mut daemon = EmbeddedDaemon::new(config);
daemon.start()?;
let daemon = EmbeddedDaemon::start(config)?;
Ok(Arc::new(daemon))
}