fix: unifying recipients before send

Author: sdmg15

src/commands.rs

@@ -380,7 +380,7 @@ pub enum OfflineWalletSubCommand {
         /// Adds a recipient to the transaction.
         // Clap Doesn't support complex vector parsing https://github.com/clap-rs/clap/issues/1704.
         // Address and amount parsing is done at run time in handler function.
-        #[arg(env = "ADDRESS:SAT", long = "to", required = true, value_parser = parse_recipient)]
+        #[arg(env = "ADDRESS:SAT", long = "to", value_parser = parse_recipient)]
         recipients: Vec<(ScriptBuf, u64)>,
         #[cfg(feature = "dns_payment")]
         /// Adds DNS recipients to the transaction

src/dns_payment_instructions.rs

@@ -4,8 +4,9 @@ use bitcoin_payment_instructions::{
     PaymentMethodType, amount, dns_resolver::DNSHrnResolver,
 };
 use core::{net::SocketAddr, str::FromStr};
+use tokio::time::timeout;
 
-use crate::{error::BDKCliError as Error, utils::shorten};
+use crate::error::BDKCliError as Error;
 
 #[derive(Debug)]
 pub struct ResolvedPaymentInfo {
@@ -24,7 +25,7 @@ impl ResolvedPaymentInfo {
             .iter()
             .map(|pm| match pm {
                 PaymentMethod::LightningBolt11(bolt11) => {
-                    format!("Bolt 11 invoice ({})", shorten(bolt11, 20, 15))
+                    format!("Bolt 11 invoice ({})", bolt11)
                 }
                 PaymentMethod::LightningBolt12(offer) => format!("Bolt 12 invoice ({})", offer),
                 PaymentMethod::OnChain(address) => format!("On chain ({})", address),
@@ -58,7 +59,12 @@ pub(crate) async fn parse_dns_instructions(
         ParseError::HrnResolutionError("Unable to create socket from provided address")
     })?;
     let resolver = DNSHrnResolver(sock_addr);
-    let instructions = PaymentInstructions::parse(hrn, network, &resolver, true).await?;
+    let instructions = timeout(
+        std::time::Duration::from_secs(30),
+        PaymentInstructions::parse(hrn, network, &resolver, true),
+    )
+    .await
+    .map_err(|_| ParseError::HrnResolutionError("Resolution request timed out"))??;
     Ok((resolver, instructions))
 }
 

src/handlers.rs

@@ -529,7 +529,7 @@ pub async fn handle_offline_wallet_subcommand(
             }
         }
         CreateTx {
-            recipients,
+            mut recipients,
             #[cfg(feature = "dns_payment")]
             dns_recipients,
             #[cfg(feature = "dns_payment")]
@@ -547,28 +547,32 @@ pub async fn handle_offline_wallet_subcommand(
         } => {
             let mut tx_builder = wallet.build_tx();
 
+            #[cfg(feature = "dns_payment")]
+            for recipient in dns_recipients {
+                log::info!("Resolving DNS instructions for recipient {}", recipient.0);
+                let amount = Amount::from_sat(recipient.1);
+                let (resolver, instructions) =
+                    parse_dns_instructions(&recipient.0, cli_opts.network, &dns_resolver)
+                        .await
+                        .map_err(|e| Error::Generic(format!("Parsing error occured {e:#?}")))?;
+                let payment = process_instructions(amount, &instructions, resolver).await?;
+
+                recipients.push((payment.0.into(), payment.1.to_sat()));
+            }
+
+            if recipients.is_empty() {
+                return Err(Error::Generic(
+                    "Either --to or --to_dns parameters must be specified".to_string(),
+                ));
+            }
+
             if send_all {
                 tx_builder.drain_wallet().drain_to(recipients[0].0.clone());
             } else {
-                #[allow(unused_mut)]
-                let mut recipients: Vec<_> = recipients
+                let recipients: Vec<_> = recipients
                     .into_iter()
                     .map(|(script, amount)| (script, Amount::from_sat(amount)))
                     .collect();
-
-                #[cfg(feature = "dns_payment")]
-                for recipient in dns_recipients {
-                    println!("Resolving DNS instructions for recipient {}", recipient.0);
-                    let amount = Amount::from_sat(recipient.1);
-                    let (resolver, instructions) =
-                        parse_dns_instructions(&recipient.0, cli_opts.network, &dns_resolver)
-                            .await
-                            .map_err(|e| Error::Generic(format!("Parsing error occured {e:#?}")))?;
-                    let payment = process_instructions(amount, &instructions, resolver).await?;
-
-                    recipients.push((payment.0.into(), payment.1));
-                }
-
                 tx_builder.set_recipients(recipients);
             }