daemon: rename Minisafe to Liana

.cirrus.yml

@@ -31,7 +31,7 @@ task:
     fingerprint_script:
       - rustc --version
       - cat Cargo.lock
-  minisafed_build_script: cargo build --release
+  lianad_build_script: cargo build --release
 
   deps_script: apt update && apt install -y python3 python3-pip
 
@@ -50,6 +50,6 @@ task:
     export BITCOIND_PATH=bitcoin-24.0rc1/bin/bitcoind
 
     # Run the functional tests
-    MINISAFED_PATH=$PWD/target/release/minisafed pytest $TEST_GROUP -vvv -n 2
+    LIANAD_PATH=$PWD/target/release/lianad pytest $TEST_GROUP -vvv -n 2
 
   before_cache_script: rm -rf $CARGO_HOME/registry/index

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
           - nightly
         os:
           - ubuntu-latest
-          # See issue https://github.com/revault/minisafe/issues/69
+          # See issue https://github.com/revault/liana/issues/69
           #- macOS-latest
           - windows-latest
     runs-on: ${{ matrix.os }}

Cargo.toml

@@ -1,21 +1,21 @@
 [package]
-name = "minisafe"
+name = "liana"
 version = "0.0.1"
 authors = ["Antoine Poinsot <[email protected]>"]
 edition = "2018"
-repository = "https://github.com/revault/minisafed"
+repository = "https://github.com/revault/liana"
 license-file = "LICENCE"
 keywords = ["bitcoin", "wallet", "safe", "script", "miniscript", "inheritance", "recovery"]
-description = "Minisafe wallet daemon"
+description = "Liana wallet daemon"
 exclude = [".github/", ".cirrus.yml", "tests/",  "test_data/", "contrib/", "pyproject.toml"]
 
 [[bin]]
-name = "minisafed"
+name = "lianad"
 path = "src/bin/daemon.rs"
 required-features = ["jsonrpc_server"]
 
 [[bin]]
-name = "minisafe-cli"
+name = "liana-cli"
 path = "src/bin/cli.rs"
 required-features = ["jsonrpc_server"]
 

LICENCE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2022, The Minisafe developers
+Copyright (c) 2022, The Liana developers
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

src/bin/cli.rs

@@ -1,4 +1,4 @@
-use minisafe::config::{config_folder_path, Config};
+use liana::config::{config_folder_path, Config};
 
 use std::{
     env,
@@ -14,7 +14,7 @@ use std::os::unix::net::UnixStream;
 // Exits with error
 fn show_usage() {
     eprintln!("Usage:");
-    eprintln!(" minisafe-cli [--conf conf_path] [--raw] <command> [<param 1> <param 2> ...]");
+    eprintln!(" liana-cli [--conf conf_path] [--raw] <command> [<param 1> <param 2> ...]");
     process::exit(1);
 }
 
@@ -73,7 +73,7 @@ fn rpc_request(method: String, params: Vec<String>) -> Json {
     object.insert("jsonrpc".to_string(), Json::String("2.0".to_string()));
     object.insert(
         "id".to_string(),
-        Json::String(format!("minisafe-cli-{}", process::id())),
+        Json::String(format!("liana-cli-{}", process::id())),
     );
     object.insert("method".to_string(), method);
     object.insert("params".to_string(), params);
@@ -94,7 +94,7 @@ fn socket_file(conf_file: Option<PathBuf>) -> PathBuf {
     [
         data_dir,
         config.bitcoin_config.network.to_string().as_str(),
-        "minisafed_rpc",
+        "lianad_rpc",
     ]
     .iter()
     .collect()
@@ -160,7 +160,7 @@ fn main() {
                         println!("{:#}", serde_json::json!({ "error": e }));
                     } else {
                         log::warn!(
-                            "minisafed response doesn't contain result or error: '{}'",
+                            "lianad response doesn't contain result or error: '{}'",
                             response
                         );
                         println!("{:#}", response);

src/bin/daemon.rs

@@ -5,7 +5,7 @@ use std::{
     process, thread, time,
 };
 
-use minisafe::{config::Config, DaemonHandle};
+use liana::{config::Config, DaemonHandle};
 
 fn parse_args(args: Vec<String>) -> Option<PathBuf> {
     if args.len() == 1 {
@@ -61,7 +61,7 @@ fn main() {
 
     let daemon = DaemonHandle::start_default(config).unwrap_or_else(|e| {
         // The panic hook will log::error
-        panic!("Starting Minisafe daemon: {}", e);
+        panic!("Starting Liana daemon: {}", e);
     });
     daemon
         .rpc_server()

src/commands/mod.rs

@@ -1,6 +1,6 @@
-//! # Minisafe commands
+//! # Liana commands
 //!
-//! External interface to the Minisafe daemon.
+//! External interface to the Liana daemon.
 
 mod utils;
 
@@ -632,15 +632,15 @@ mod tests {
 
     #[test]
     fn getinfo() {
-        let ms = DummyMinisafe::new();
+        let ms = DummyLiana::new();
         // We can query getinfo
         ms.handle.control.get_info();
         ms.shutdown();
     }
 
     #[test]
     fn getnewaddress() {
-        let ms = DummyMinisafe::new();
+        let ms = DummyLiana::new();
 
         let control = &ms.handle.control;
         // We can get an address
@@ -661,7 +661,7 @@ mod tests {
 
     #[test]
     fn create_spend() {
-        let ms = DummyMinisafe::new();
+        let ms = DummyLiana::new();
         let control = &ms.handle.control;
 
         // Arguments sanity checking
@@ -777,7 +777,7 @@ mod tests {
 
     #[test]
     fn update_spend() {
-        let ms = DummyMinisafe::new();
+        let ms = DummyLiana::new();
         let control = &ms.handle.control;
         let mut db_conn = control.db().lock().unwrap().connection();
 

src/config.rs

@@ -144,11 +144,11 @@ impl From<std::io::Error> for ConfigError {
 
 impl std::error::Error for ConfigError {}
 
-/// Get the absolute path to the minisafe configuration folder.
+/// Get the absolute path to the liana configuration folder.
 ///
-/// It's a "minisafe/<network>/" directory in the XDG standard configuration directory for
-/// all OSes but Linux-based ones, for which it's `~/.minisafe/<network>/`.
-/// There is only one config file at `minisafe/config.toml`, which specifies the network.
+/// It's a "liana/<network>/" directory in the XDG standard configuration directory for
+/// all OSes but Linux-based ones, for which it's `~/.liana/<network>/`.
+/// There is only one config file at `liana/config.toml`, which specifies the network.
 /// Rationale: we want to have the database, RPC socket, etc.. in the same folder as the
 /// configuration file but for Linux the XDG specifoes a data directory (`~/.local/share/`)
 /// different from the configuration one (`~/.config/`).
@@ -161,10 +161,10 @@ pub fn config_folder_path() -> Option<PathBuf> {
 
     if let Some(mut path) = configs_dir {
         #[cfg(target_os = "linux")]
-        path.push(".minisafe");
+        path.push(".liana");
 
         #[cfg(not(target_os = "linux"))]
-        path.push("Minisafe");
+        path.push("Liana");
 
         return Some(path);
     }
@@ -174,7 +174,7 @@ pub fn config_folder_path() -> Option<PathBuf> {
 
 fn config_file_path() -> Option<PathBuf> {
     config_folder_path().map(|mut path| {
-        path.push("minisafe.toml");
+        path.push("liana.toml");
         path
     })
 }
@@ -306,17 +306,17 @@ mod tests {
         #[cfg(target_os = "linux")]
         {
             assert!(filepath.as_path().starts_with("/home/"));
-            assert!(filepath.as_path().ends_with(".minisafe/minisafe.toml"));
+            assert!(filepath.as_path().ends_with(".liana/liana.toml"));
         }
 
         #[cfg(target_os = "macos")]
         assert!(filepath
             .as_path()
-            .ends_with("Library/Application Support/Minisafe/minisafe.toml"));
+            .ends_with("Library/Application Support/Liana/liana.toml"));
 
         #[cfg(target_os = "windows")]
         assert!(filepath
             .as_path()
-            .ends_with(r#"AppData\Roaming\Minisafe\minisafe.toml"#));
+            .ends_with(r#"AppData\Roaming\Liana\liana.toml"#));
     }
 }

src/database/mod.rs

@@ -1,4 +1,4 @@
-///! Database interface for Minisafe.
+///! Database interface for Liana.
 ///!
 ///! Record wallet metadata, spent and unspent coins, ongoing transactions.
 pub mod sqlite;

src/database/sqlite/mod.rs

@@ -563,7 +563,7 @@ mod tests {
         fs::create_dir_all(&tmp_dir).unwrap();
         let secp = secp256k1::Secp256k1::verification_only();
 
-        let db_path: path::PathBuf = [tmp_dir.as_path(), path::Path::new("minisafed.sqlite3")]
+        let db_path: path::PathBuf = [tmp_dir.as_path(), path::Path::new("lianad.sqlite3")]
             .iter()
             .collect();
         let options = dummy_options();
@@ -578,7 +578,7 @@ mod tests {
         fs::create_dir_all(&tmp_dir).unwrap();
         let secp = secp256k1::Secp256k1::verification_only();
 
-        let db_path: path::PathBuf = [tmp_dir.as_path(), path::Path::new("minisafed.sqlite3")]
+        let db_path: path::PathBuf = [tmp_dir.as_path(), path::Path::new("lianad.sqlite3")]
             .iter()
             .collect();
         assert!(SqliteDb::new(db_path.clone(), None, &secp)

src/jsonrpc/server.rs

@@ -101,7 +101,7 @@ fn connection_handler(
         let req_id = req.id.clone();
         if &req.method == "stop" {
             shutdown.store(true, atomic::Ordering::Relaxed);
-            log::info!("Stopping the minisafe daemon.");
+            log::info!("Stopping the liana daemon.");
         }
 
         log::trace!("JSONRPC request: {:?}", serde_json::to_string(&req));
@@ -146,7 +146,7 @@ pub fn rpcserver_loop(
 
         let handler_id = connections_counter.load(atomic::Ordering::Relaxed);
         thread::Builder::new()
-            .name(format!("minisafe-jsonrpc-{}", handler_id))
+            .name(format!("liana-jsonrpc-{}", handler_id))
             .spawn({
                 let control = daemon_control.clone();
                 let counter = connections_counter.clone();
@@ -260,7 +260,7 @@ mod tests {
     #[test]
     fn command_read_single() {
         let socket_path = env::temp_dir().join(format!(
-            "minisafed-jsonrpc-socket-{}-{:?}",
+            "lianad-jsonrpc-socket-{}-{:?}",
             process::id(),
             thread::current().id()
         ));
@@ -287,7 +287,7 @@ mod tests {
     #[test]
     fn command_read_parts() {
         let socket_path = env::temp_dir().join(format!(
-            "minisafed-jsonrpc-socket-{}-{:?}",
+            "lianad-jsonrpc-socket-{}-{:?}",
             process::id(),
             thread::current().id()
         ));
@@ -320,7 +320,7 @@ mod tests {
     #[test]
     fn command_read_multiple() {
         let socket_path = env::temp_dir().join(format!(
-            "minisafed-jsonrpc-socket-{}-{:?}",
+            "lianad-jsonrpc-socket-{}-{:?}",
             process::id(),
             thread::current().id()
         ));
@@ -367,7 +367,7 @@ mod tests {
     #[test]
     fn command_read_linebreak() {
         let socket_path = env::temp_dir().join(format!(
-            "minisafed-jsonrpc-socket-{}-{:?}",
+            "lianad-jsonrpc-socket-{}-{:?}",
             process::id(),
             thread::current().id()
         ));
@@ -400,12 +400,12 @@ mod tests {
     #[cfg(not(target_os = "macos"))]
     #[test]
     fn server_sanity_check() {
-        let ms = DummyMinisafe::new();
+        let ms = DummyLiana::new();
         let socket_path: path::PathBuf = [
             ms.tmp_dir.as_path(),
             path::Path::new("d"),
             path::Path::new("bitcoin"),
-            path::Path::new("minisafed_rpc"),
+            path::Path::new("lianad_rpc"),
         ]
         .iter()
         .collect();