Split liana into liana and lianad crates

.cirrus.yml

@@ -75,7 +75,7 @@ task:
     fingerprint_script:
       - rustc --version
       - cat tests/tools/taproot_signer/Cargo.lock
-  lianad_build_script: cd liana && cargo build --release && cd ../tests/tools/taproot_signer && cargo build --release
+  lianad_build_script: cd lianad && cargo build --release && cd ../tests/tools/taproot_signer && cargo build --release
 
   deps_script: apt update && apt install -y python3 python3-pip
 

Cargo.toml

@@ -3,10 +3,11 @@ resolver = "2"
 members = [
     "fuzz",
     "liana",
+    "lianad",
     "liana-gui",
     "liana-ui",
 ]
-default-members = ["liana", "liana-gui", "liana-ui"]
+default-members = ["liana", "lianad", "liana-gui", "liana-ui"]
 
 [patch.crates-io]
 iced_style = { git = "https://github.com/edouardparis/iced", branch = "patch-0.12.3"}

contrib/reproducible/docker/docker-build.sh

@@ -17,6 +17,8 @@ docker run --rm -ti \
     -v "$PWD/Cargo.lock":/liana/Cargo.lock \
     -v "$PWD/liana/Cargo.toml":/liana/liana/Cargo.toml \
     -v "$PWD/liana/src":/liana/liana/src \
+    -v "$PWD/lianad/Cargo.toml":/liana/lianad/Cargo.toml \
+    -v "$PWD/lianad/src":/liana/lianad/src \
     -v "$PWD/liana-gui/Cargo.toml":/liana/liana-gui/Cargo.toml \
     -v "$PWD/liana-gui/src":/liana/liana-gui/src \
     -v "$PWD/liana-ui/Cargo.toml":/liana/liana-ui/Cargo.toml \
@@ -41,6 +43,8 @@ docker run -ti \
     -v "$PWD/Cargo.lock":/liana/Cargo.lock \
     -v "$PWD/liana/Cargo.toml":/liana/liana/Cargo.toml \
     -v "$PWD/liana/src":/liana/liana/src \
+    -v "$PWD/lianad/Cargo.toml":/liana/lianad/Cargo.toml \
+    -v "$PWD/lianad/src":/liana/lianad/src \
     -v "$PWD/liana-gui/Cargo.toml":/liana/liana-gui/Cargo.toml \
     -v "$PWD/liana-gui/src":/liana/liana-gui/src \
     -v "$PWD/liana-ui/Cargo.toml":/liana/liana-ui/Cargo.toml \

contrib/reproducible/docker/macos_cmd.sh

@@ -29,7 +29,7 @@ cd ..
 # Finally build the projects using the toolchain just created.
 alias cargo="/liana/rust-1.71.1-x86_64-unknown-linux-gnu/cargo/bin/cargo"
 
-for package_name in "liana" "liana-gui"; do
+for package_name in "lianad" "liana-gui"; do
     PATH="$PATH:$PWD/osxcross/target/bin/" \
         CC=o64-clang \
         CXX=o64-clang++ \

contrib/reproducible/guix/build.sh

@@ -25,7 +25,7 @@ export CARGO_HOME="/liana/.cargo"
 
 # We need to set RUSTC_BOOTSTRAP=1 as a workaround to be able to use unstable
 # features in the GUI dependencies
-for package_name in "liana" "liana-gui"; do
+for package_name in "lianad" "liana-gui"; do
     RUSTC_BOOTSTRAP=1 cargo -vvv \
         --color always \
         --frozen \

contrib/reproducible/guix/guix-build.sh

@@ -80,6 +80,8 @@ time_machine shell --no-cwd \
     --expose="$BUILD_ROOT/Cargo.lock=/liana/Cargo.lock" \
     --expose="$PWD/liana/src=/liana/liana/src" \
     --expose="$PWD/liana/Cargo.toml=/liana/liana/Cargo.toml" \
+    --expose="$PWD/lianad/src=/liana/lianad/src" \
+    --expose="$PWD/lianad/Cargo.toml=/liana/lianad/Cargo.toml" \
     --expose="$PWD/liana-gui/Cargo.toml=/liana/liana-gui/Cargo.toml" \
     --expose="$PWD/liana-gui/src=/liana/liana-gui/src" \
     --expose="$PWD/liana-ui/src=/liana/liana-ui/src" \

liana-gui/Cargo.toml

@@ -16,7 +16,8 @@ path = "src/main.rs"
 [dependencies]
 async-trait = "0.1"
 async-hwi = { version = "0.0.24" }
-liana = { path = "../liana", default-features = false, features = ["nonblocking_shutdown"] }
+liana = { path = "../liana" }
+lianad = { path = "../lianad", default-features = false, features = ["nonblocking_shutdown"] }
 liana-ui = { path = "../liana-ui" }
 backtrace = "0.3"
 hex = "0.4.3"

liana-gui/src/app/error.rs

@@ -1,7 +1,8 @@
 use std::convert::From;
 use std::io::ErrorKind;
 
-use liana::{config::ConfigError, descriptors::LianaDescError, spend::SpendCreationError};
+use liana::{descriptors::LianaDescError, spend::SpendCreationError};
+use lianad::config::ConfigError;
 
 use crate::{
     app::{settings::SettingsError, wallet::WalletError},

liana-gui/src/app/message.rs

@@ -1,14 +1,12 @@
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
-use liana::{
-    config::Config as DaemonConfig,
-    miniscript::bitcoin::{
-        bip32::{ChildNumber, Fingerprint},
-        psbt::Psbt,
-        Address, Txid,
-    },
+use liana::miniscript::bitcoin::{
+    bip32::{ChildNumber, Fingerprint},
+    psbt::Psbt,
+    Address, Txid,
 };
+use lianad::config::Config as DaemonConfig;
 
 use crate::{
     app::{cache::Cache, error::Error, view, wallet::Wallet},

liana-gui/src/app/mod.rs

@@ -19,11 +19,12 @@ use iced::{clipboard, time, Command, Subscription};
 use tokio::runtime::Handle;
 use tracing::{error, info, warn};
 
-pub use liana::{commands::CoinStatus, config::Config as DaemonConfig, miniscript::bitcoin};
+pub use liana::miniscript::bitcoin;
 use liana_ui::{
     component::network_banner,
     widget::{Column, Element},
 };
+pub use lianad::{commands::CoinStatus, config::Config as DaemonConfig};
 
 pub use config::Config;
 pub use message::Message;

liana-gui/src/app/state/coins.rs

@@ -4,8 +4,8 @@ use std::{cmp::Ordering, collections::HashSet};
 
 use iced::Command;
 
-use liana::commands::CoinStatus;
 use liana_ui::widget::Element;
+use lianad::commands::CoinStatus;
 
 use crate::{
     app::{

liana-gui/src/app/state/mod.rs

@@ -13,11 +13,9 @@ use std::sync::Arc;
 use std::time::{SystemTime, UNIX_EPOCH};
 
 use iced::{Command, Subscription};
-use liana::{
-    commands::CoinStatus,
-    miniscript::bitcoin::{Amount, OutPoint},
-};
+use liana::miniscript::bitcoin::{Amount, OutPoint};
 use liana_ui::widget::*;
+use lianad::commands::CoinStatus;
 
 use super::{
     cache::Cache,

liana-gui/src/app/state/psbt.rs

@@ -7,10 +7,10 @@ use iced::Subscription;
 
 use iced::Command;
 use liana::{
-    commands::CoinStatus,
     descriptors::LianaPolicy,
     miniscript::bitcoin::{bip32::Fingerprint, psbt::Psbt, Network, Txid},
 };
+use lianad::commands::CoinStatus;
 
 use liana_ui::component::toast;
 use liana_ui::{

liana-gui/src/app/state/recovery.rs

@@ -4,14 +4,12 @@ use std::sync::Arc;
 
 use iced::Command;
 
-use liana::{
-    commands::CoinStatus,
-    miniscript::bitcoin::{
-        bip32::{DerivationPath, Fingerprint},
-        secp256k1,
-    },
+use liana::miniscript::bitcoin::{
+    bip32::{DerivationPath, Fingerprint},
+    secp256k1,
 };
 use liana_ui::{component::form, widget::Element};
+use lianad::commands::CoinStatus;
 
 use crate::{
     app::{

liana-gui/src/app/state/settings/bitcoind.rs

@@ -8,11 +8,9 @@ use chrono::{NaiveDate, Utc};
 use iced::Command;
 use tracing::info;
 
-use liana::{
-    config::{
-        BitcoinBackend, BitcoinConfig, BitcoindConfig, BitcoindRpcAuth, Config, ElectrumConfig,
-    },
-    miniscript::bitcoin::Network,
+use liana::miniscript::bitcoin::Network;
+use lianad::config::{
+    BitcoinBackend, BitcoinConfig, BitcoindConfig, BitcoindRpcAuth, Config, ElectrumConfig,
 };
 
 use liana_ui::{component::form, widget::Element};
@@ -353,7 +351,7 @@ impl BitcoindSettings {
                 if let (true, Some(rpc_auth)) = (self.addr.valid, rpc_auth) {
                     let mut daemon_config = daemon.config().cloned().unwrap();
                     daemon_config.bitcoin_backend =
-                        Some(liana::config::BitcoinBackend::Bitcoind(BitcoindConfig {
+                        Some(lianad::config::BitcoinBackend::Bitcoind(BitcoindConfig {
                             rpc_auth,
                             addr: new_addr.unwrap(),
                         }));
@@ -461,7 +459,7 @@ impl ElectrumSettings {
                 if self.addr.valid {
                     let mut daemon_config = daemon.config().cloned().unwrap();
                     daemon_config.bitcoin_backend =
-                        Some(liana::config::BitcoinBackend::Electrum(ElectrumConfig {
+                        Some(lianad::config::BitcoinBackend::Electrum(ElectrumConfig {
                             addr: self.addr.value.clone(),
                         }));
                     self.processing = true;

liana-gui/src/app/state/spend/mod.rs

@@ -5,11 +5,9 @@ use std::sync::Arc;
 
 use iced::Command;
 
-use liana::{
-    commands::CoinStatus,
-    miniscript::bitcoin::{Network, OutPoint},
-};
+use liana::miniscript::bitcoin::{Network, OutPoint};
 use liana_ui::widget::Element;
+use lianad::commands::CoinStatus;
 
 use super::{redirect, State};
 use crate::{

liana-gui/src/app/state/spend/step.rs

@@ -8,13 +8,13 @@ use std::{
 
 use iced::{Command, Subscription};
 use liana::{
-    commands::ListCoinsEntry,
     descriptors::LianaDescriptor,
     miniscript::bitcoin::{
         address, psbt::Psbt, secp256k1, Address, Amount, Denomination, Network, OutPoint,
     },
     spend::{SpendCreationError, MAX_FEERATE},
 };
+use lianad::commands::ListCoinsEntry;
 
 use liana_ui::{component::form, widget::Element};
 

liana-gui/src/app/state/transactions.rs

@@ -7,14 +7,14 @@ use std::{
 
 use iced::Command;
 use liana::{
-    commands::CoinStatus,
     miniscript::bitcoin::{OutPoint, Txid},
     spend::{SpendCreationError, MAX_FEERATE},
 };
 use liana_ui::{
     component::{form, modal::Modal},
     widget::*,
 };
+use lianad::commands::CoinStatus;
 
 pub const HISTORY_EVENT_PAGE_SIZE: u64 = 20;
 

liana-gui/src/app/view/settings.rs

@@ -8,10 +8,10 @@ use iced::{
 };
 
 use liana::{
-    config::BitcoindRpcAuth,
     descriptors::{LianaDescriptor, LianaPolicy},
     miniscript::bitcoin::{bip32::Fingerprint, Network},
 };
+use lianad::config::BitcoindRpcAuth;
 
 use super::{dashboard, message::*};
 
@@ -452,7 +452,7 @@ pub fn bitcoind_edit<'a>(
 pub fn bitcoind<'a>(
     is_configured_node_type: bool,
     network: Network,
-    config: &liana::config::BitcoindConfig,
+    config: &lianad::config::BitcoindConfig,
     blockheight: i32,
     is_running: Option<bool>,
     can_edit: bool,
@@ -638,7 +638,7 @@ pub fn electrum_edit<'a>(
 pub fn electrum<'a>(
     is_configured_node_type: bool,
     network: Network,
-    config: &liana::config::ElectrumConfig,
+    config: &lianad::config::ElectrumConfig,
     blockheight: i32,
     is_running: Option<bool>,
     can_edit: bool,

liana-gui/src/daemon/client/mod.rs

@@ -4,7 +4,6 @@ use std::iter::FromIterator;
 use std::path::Path;
 
 use async_trait::async_trait;
-use liana::commands::{CoinStatus, CreateRecoveryResult};
 use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
@@ -13,10 +12,10 @@ use tracing::{error, info};
 pub mod error;
 pub mod jsonrpc;
 
-use liana::{
-    commands::LabelItem,
+use liana::miniscript::bitcoin::{address, psbt::Psbt, Address, Network, OutPoint, Txid};
+use lianad::{
+    commands::{CoinStatus, CreateRecoveryResult, LabelItem},
     config::Config,
-    miniscript::bitcoin::{address, psbt::Psbt, Address, Network, OutPoint, Txid},
 };
 
 use super::{model::*, Daemon, DaemonBackend, DaemonError};

liana-gui/src/daemon/embedded.rs

@@ -4,10 +4,10 @@ use tokio::sync::Mutex;
 
 use super::{model::*, node, Daemon, DaemonBackend, DaemonError};
 use async_trait::async_trait;
-use liana::{
+use liana::miniscript::bitcoin::{address, psbt::Psbt, Address, Network, OutPoint, Txid};
+use lianad::{
     commands::{CoinStatus, LabelItem},
     config::Config,
-    miniscript::bitcoin::{address, psbt::Psbt, Address, Network, OutPoint, Txid},
     DaemonControl, DaemonHandle,
 };
 

liana-gui/src/daemon/mod.rs

@@ -11,12 +11,12 @@ use std::path::Path;
 
 use async_trait::async_trait;
 
-use liana::{
+use liana::miniscript::bitcoin::{
+    address, bip32::Fingerprint, psbt::Psbt, secp256k1, Address, Network, OutPoint, Txid,
+};
+use lianad::{
     commands::{CoinStatus, LabelItem, TransactionInfo},
     config::Config,
-    miniscript::bitcoin::{
-        address, bip32::Fingerprint, psbt::Psbt, secp256k1, Address, Network, OutPoint, Txid,
-    },
     StartupError,
 };