git commit -m feat: added evn to CLI flags

Cargo.toml

@@ -6,6 +6,6 @@ edition = "2021"
 [dependencies]
 bitcoincore-rpc = "0.19"
 bitcoin = "0.32"
-clap = { version = "4", features = ["derive"] }
+clap = { version = "4", features = ["derive", "env"] }
 anyhow = "1"
 serde_json = "1.0.149"

src/cli.rs

@@ -7,17 +7,19 @@ use clap::{Parser, Subcommand, ValueEnum};
 )]
 pub struct Cli {
     /// Bitcoin Core RPC URL
-    #[arg(long, default_value = "http://127.0.0.1:18443")]
+    #[arg(long, default_value = "http://127.0.0.1:18443", env = "DUST_RPC_URL")]
     pub rpc_url: String,
 
-    #[arg(long)]
+    /// Bitcoin Core RPC username
+    #[arg(long, env = "DUST_RPC_USER")]
     pub rpc_user: String,
 
-    #[arg(long)]
+    /// Bitcoin Core RPC password
+    #[arg(long, env = "DUST_RPC_PASS")]
     pub rpc_pass: String,
 
-    /// Custom dust threshold in sats. If omitted, uses per-script-type thresholds
-    #[arg(long)]
+    /// Dust threshold in sats. If omitted, uses per-script-type thresholds
+    #[arg(long, env = "DUST_THRESHOLD")]
     pub threshold: Option<u64>,
 
     #[command(subcommand)]
@@ -42,7 +44,7 @@ pub enum Commands {
         #[arg(long, default_value = "false")]
         dry_run: bool,
 
-        /// Sweep method: op-return (burn to fees)
+        /// Sweep method: consolidate (default) or op-return (burn to fees)
         #[arg(long, value_enum, default_value = "consolidate")]
         method: SweepMethod,
     },

src/main.rs

@@ -1,13 +1,13 @@
+mod analyzer;
 mod cli;
+mod psbt_builder;
 mod rpc;
 mod scanner;
-mod analyzer;
-mod psbt_builder;
 mod types;
 
+use bitcoincore_rpc::Client;
 use clap::Parser;
 use cli::{Cli, Commands, SweepMethod};
-use bitcoincore_rpc::Client;
 
 fn handle_scan(client: &Client, user_threshold: Option<u64>) -> anyhow::Result<()> {
     let utxos = scanner::fetch_utxos(client)?;
@@ -17,7 +17,10 @@ fn handle_scan(client: &Client, user_threshold: Option<u64>) -> anyhow::Result<(
         Some(t) => format!("{} sats (custom)", t),
         None => "per-script-type (P2PKH:546, P2WPKH:294, P2TR:294, P2SH:540)".to_string(),
     };
-    println!("Found {} total UTXOs (threshold: {})\n", total_utxos, threshold_display);
+    println!(
+        "Found {} total UTXOs (threshold: {})\n",
+        total_utxos, threshold_display
+    );
 
     let (dust_utxos, clean_utxos) = analyzer::classify_utxos_smart(utxos, user_threshold);
 
@@ -26,7 +29,9 @@ fn handle_scan(client: &Client, user_threshold: Option<u64>) -> anyhow::Result<(
         println!("   none");
     }
     for utxo in &dust_utxos {
-        let addr = utxo.address.as_ref()
+        let addr = utxo
+            .address
+            .as_ref()
             .map(|a| a.clone().assume_checked().to_string())
             .unwrap_or_else(|| "unknown".to_string());
         let script_type = analyzer::detect_script_type(&addr);
@@ -59,8 +64,16 @@ fn handle_scan(client: &Client, user_threshold: Option<u64>) -> anyhow::Result<(
     println!("\n─────────────────────────────────────────");
     println!("📊 Summary");
     println!("   Total UTXOs:    {}", total_utxos);
-    println!("   Dust UTXOs:     {} ({} sats)", dust_utxos.len(), total_dust_sats);
-    println!("   Clean UTXOs:    {} ({} sats)", clean_utxos.len(), total_clean_sats);
+    println!(
+        "   Dust UTXOs:     {} ({} sats)",
+        dust_utxos.len(),
+        total_dust_sats
+    );
+    println!(
+        "   Clean UTXOs:    {} ({} sats)",
+        clean_utxos.len(),
+        total_clean_sats
+    );
     println!("   Threshold:      {}", threshold_display);
 
     if !dust_utxos.is_empty() {
@@ -105,7 +118,10 @@ fn handle_sweep(
         println!("   Total dust:        {} sats", result.total_dust_sats);
         println!("   Funder UTXO:       {} sats", result.funder_sats);
         println!("   Estimated fee:     {} sats", result.estimated_fee_sats);
-        println!("   Estimated output:  {} sats", result.estimated_output_sats);
+        println!(
+            "   Estimated output:  {} sats",
+            result.estimated_output_sats
+        );
         println!("\n   Run without --dry-run to create the PSBT.");
         return Ok(());
     }
@@ -148,4 +164,4 @@ fn main() -> anyhow::Result<()> {
     }
 
     Ok(())
-}
+}

src/psbt_builder.rs

@@ -32,12 +32,10 @@ fn build_inputs(
     funder: &ListUnspentResultEntry,
     dust_utxos: &[ListUnspentResultEntry],
 ) -> Vec<serde_json::Value> {
-    let mut inputs = vec![
-        serde_json::json!({
-            "txid": funder.txid.to_string(),
-            "vout": funder.vout,
-        })
-    ];
+    let mut inputs = vec![serde_json::json!({
+        "txid": funder.txid.to_string(),
+        "vout": funder.vout,
+    })];
     for utxo in dust_utxos {
         inputs.push(serde_json::json!({
             "txid": utxo.txid.to_string(),
@@ -132,7 +130,10 @@ pub fn build_op_return_psbt(
     }
 
     let funder = select_funder(clean_utxos)?;
-    println!("\n   ℹ️  Using clean UTXO to fund fees: {} sats", funder.amount.to_sat());
+    println!(
+        "\n   ℹ️  Using clean UTXO to fund fees: {} sats",
+        funder.amount.to_sat()
+    );
 
     let all_inputs = build_inputs(funder, dust_utxos);
 
@@ -173,4 +174,4 @@ pub fn build_op_return_psbt(
         dust_input_count: dust_utxos.len(),
         total_dust_sats,
     })
-}
+}