Add config saving to payjoin-cli

This Pr adds the ability to save config files
for V2 to payjoin-cli . This is introduced
via a set-config commandline arg that only
works for v2 and when the right set of supporting
args is present .

Fix msrv issue due to more recent toml version

Fix msrv issue due to more recent toml version

Fix msrv issue due to more recent toml version

Fix msrv issue due to more recent toml version

Fix msrv issue due to more recent toml version

Author: zealsham

Cargo-minimal.lock

@@ -1706,6 +1706,7 @@ dependencies = [
  "tempfile",
  "tokio",
  "tokio-rustls",
+ "toml",
  "url",
 ]
 

Cargo-recent.lock

@@ -1706,6 +1706,7 @@ dependencies = [
  "tempfile",
  "tokio",
  "tokio-rustls",
+ "toml",
  "url",
 ]
 

payjoin-cli/Cargo.toml

@@ -47,10 +47,13 @@ serde = { version = "1.0.160", features = ["derive"] }
 sled = "0.34"
 tokio = { version = "1.38.1", features = ["full"] }
 tokio-rustls = { version = "0.25", features = ["ring"], default-features = false, optional = true }
+toml = "0.5.11"
 url = { version = "2.3.1", features = ["serde"] }
 dirs = "5.0.1"
 
 [dev-dependencies]
 nix = "0.26.4"
 payjoin-test-utils = { version = "0.0.1" }
 tempfile = "3.20.0"
+
+

payjoin-cli/src/app/config.rs

@@ -204,6 +204,77 @@ impl Config {
         Ok(config)
     }
 
+    #[cfg(feature = "v2")]
+    pub fn save_config(cli: &Cli) -> Result<(), anyhow::Error> {
+        let version = Self::determine_version(cli)
+            .map_err(|e| anyhow::anyhow!("Failed to determine version: {e}"))?;
+
+        if version != Version::Two {
+            return Err(anyhow::anyhow!("--set-config is only available for bip77 (v2) mode"));
+        }
+
+        // Ensure all required parameters are present
+        if cli.rpcuser.is_none()
+            || cli.rpcpassword.is_none()
+            || cli.rpchost.is_none()
+            || cli.pj_directory.is_none()
+            || cli.ohttp_relays.is_none()
+        {
+            return Err(anyhow::anyhow!(
+                "--set-config requires ALL of: \
+                 --rpcuser, --rpcpassword, --rpchost, \
+                 --pj-directory, --ohttp-relays"
+            ));
+        }
+
+        // Build the TOML map , this feels a bit hacky but it works
+        let mut toml_map = toml::map::Map::new();
+        let mut bitcoind_map = toml::map::Map::new();
+
+        bitcoind_map.insert("rpcuser".into(), toml::Value::String(cli.rpcuser.clone().unwrap()));
+        bitcoind_map
+            .insert("rpcpassword".into(), toml::Value::String(cli.rpcpassword.clone().unwrap()));
+        bitcoind_map.insert(
+            "rpchost".into(),
+            toml::Value::String(cli.rpchost.clone().unwrap().to_string()),
+        );
+        toml_map.insert("bitcoind".into(), toml::Value::Table(bitcoind_map));
+
+        let mut v2_map = toml::map::Map::new();
+        v2_map.insert(
+            "pj_directory".into(),
+            toml::Value::String(cli.pj_directory.as_ref().unwrap().to_string()),
+        );
+        let relay_list: Vec<toml::Value> = cli
+            .ohttp_relays
+            .as_ref()
+            .unwrap()
+            .iter()
+            .map(|url| toml::Value::String(url.to_string()))
+            .collect();
+        v2_map.insert("ohttp_relays".into(), toml::Value::Array(relay_list));
+        toml_map.insert("v2".into(), toml::Value::Table(v2_map));
+
+        let toml_content = toml::Value::Table(toml_map);
+        let toml_str = toml::to_string_pretty(&toml_content)?;
+
+        let config_path = std::env::current_dir()?.join("config.toml");
+        let final_path = if !config_path.exists() {
+            if let Some(config_dir) = dirs::config_dir() {
+                let global_dir = config_dir.join(CONFIG_DIR);
+                std::fs::create_dir_all(&global_dir)?;
+                global_dir.join("config.toml")
+            } else {
+                config_path
+            }
+        } else {
+            config_path
+        };
+
+        std::fs::write(final_path, toml_str)?;
+        Ok(())
+    }
+
     #[cfg(feature = "v1")]
     pub fn v1(&self) -> Result<&V1Config, anyhow::Error> {
         match &self.version {

payjoin-cli/src/cli/mod.rs

@@ -76,6 +76,10 @@ pub struct Cli {
     #[arg(long = "pj-directory", help = "The directory to store payjoin requests", value_parser = value_parser!(Url))]
     pub pj_directory: Option<Url>,
 
+    #[cfg(feature = "v2")]
+    #[arg(long = "set-config", help = "Save current configuration parameters to config.toml", value_parser = value_parser!(bool))]
+    pub set_config: bool,
+
     #[cfg(feature = "_danger-local-https")]
     #[arg(long = "root-certificate", help = "Specify a TLS certificate to be added as a root", value_parser = value_parser!(PathBuf))]
     pub root_certificate: Option<PathBuf>,

payjoin-cli/src/main.rs

@@ -16,6 +16,11 @@ async fn main() -> Result<()> {
     env_logger::init();
 
     let cli = Cli::parse();
+
+    #[cfg(feature = "v2")]
+    if cli.set_config {
+        Config::save_config(&cli)?;
+    }
     let config = Config::new(&cli)?;
 
     #[allow(clippy::if_same_then_else)]