Merge #1473: Update liana gui to import liana directly

6cefd2464a55fbfaea5c4e9a3a370fb034c5462e remove liana from vendored source link (edouardparis)
b0fbe0839d15914cf1d56d35184bdc49683adfd3 liana-gui: import liana with directory path (edouardparis)

Pull request description:

  We import directly liana with the directory path instead of the git url.

ACKs for top commit:
  edouardparis:
    Self-ACK 6cefd2464a55fbfaea5c4e9a3a370fb034c5462e

Tree-SHA512: a4ef7e0a8899751b6200f9753856ae6b6a9ddf1a0c1c8d8576238631b5bf33358d59a6988f8f26e153ee09824eb217df13590bdf82560d3889a99a123df9f0b0

Cargo.lock

@@ -2821,34 +2821,12 @@ dependencies = [
  "toml",
 ]
 
-[[package]]
-name = "liana"
-version = "8.0.0"
-source = "git+https://github.com/wizardsardine/liana?branch=master#f3206f9dfadbedb7a46aaa85996c11172c875588"
-dependencies = [
- "backtrace",
- "bdk_coin_select",
- "bdk_electrum",
- "bip39",
- "dirs 5.0.1",
- "fern",
- "getrandom",
- "jsonrpc 0.17.0",
- "log",
- "miniscript",
- "rdrand",
- "rusqlite",
- "serde",
- "serde_json",
- "toml",
-]
-
 [[package]]
 name = "liana-fuzz"
 version = "0.0.0"
 dependencies = [
  "arbitrary",
- "liana 8.0.0",
+ "liana",
  "libfuzzer-sys",
  "secp256k1 0.28.2",
 ]
@@ -2870,7 +2848,7 @@ dependencies = [
  "iced",
  "iced_runtime",
  "jsonrpc 0.12.1",
- "liana 8.0.0 (git+https://github.com/wizardsardine/liana?branch=master)",
+ "liana",
  "liana-ui",
  "log",
  "reqwest",

contrib/reproducible/guix/build.sh

@@ -13,11 +13,6 @@ directory = "/vendor"
 [source.crates-io]
 replace-with = "vendored_sources"
 
-[source."https://github.com/wizardsardine/liana"]
-git = "https://github.com/wizardsardine/liana"
-branch = "master"
-replace-with = "vendored_sources"
-
 [source."https://github.com/edouardparis/iced"]
 git = "https://github.com/edouardparis/iced"
 branch = "patch-0.12.3"

liana-gui/Cargo.toml

@@ -16,7 +16,7 @@ path = "src/main.rs"
 [dependencies]
 async-trait = "0.1"
 async-hwi = { version = "0.0.24" }
-liana = { git = "https://github.com/wizardsardine/liana", branch = "master", default-features = false, features = ["nonblocking_shutdown"] }
+liana = { path = "../liana", default-features = false, features = ["nonblocking_shutdown"] }
 liana-ui = { path = "../liana-ui" }
 backtrace = "0.3"
 hex = "0.4.3"

liana-gui/src/daemon/embedded.rs

@@ -18,7 +18,8 @@ pub struct EmbeddedDaemon {
 
 impl EmbeddedDaemon {
     pub fn start(config: Config) -> Result<EmbeddedDaemon, DaemonError> {
-        let handle = DaemonHandle::start_default(config.clone()).map_err(DaemonError::Start)?;
+        let handle =
+            DaemonHandle::start_default(config.clone(), false).map_err(DaemonError::Start)?;
         Ok(Self {
             handle: Mutex::new(Some(handle)),
             config,
@@ -31,6 +32,7 @@ impl EmbeddedDaemon {
     {
         match self.handle.lock().await.as_mut() {
             Some(DaemonHandle::Controller { control, .. }) => method(control),
+            Some(_) => unreachable!("No lianad rpc server must be started"),
             None => Err(DaemonError::DaemonStopped),
         }
     }

liana-gui/src/installer/mod.rs

@@ -334,7 +334,7 @@ impl Installer {
 
 pub fn daemon_check(cfg: liana::config::Config) -> Result<(), Error> {
     // Start Daemon to check correctness of installation
-    match liana::DaemonHandle::start_default(cfg) {
+    match liana::DaemonHandle::start_default(cfg, false) {
         Ok(daemon) => daemon
             .stop()
             .map_err(|e| Error::Unexpected(format!("Failed to stop Liana daemon: {}", e))),
@@ -685,8 +685,6 @@ pub async fn extract_local_gui_settings(ctx: &Context) -> Settings {
 
 pub fn extract_daemon_config(ctx: &Context) -> Config {
     Config {
-        #[cfg(unix)]
-        daemon: false,
         log_level: log::LevelFilter::Info,
         main_descriptor: ctx
             .descriptor