Add support for paying to BOLT12

cli/src/commands.rs

@@ -4,7 +4,7 @@ use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
 
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use breez_sdk_liquid::prelude::*;
 use clap::{arg, Parser};
 use qrcode_rs::render::unicode;
@@ -21,10 +21,14 @@ use serde_json::to_string_pretty;
 pub(crate) enum Command {
     /// Send a payment directly or via a swap
     SendPayment {
-        /// Invoice which has to be paid
+        /// Invoice which has to be paid (BOLT11 or BOLT12)
         #[arg(long)]
         invoice: Option<String>,
 
+        /// BOLT12 offer. If specified, amount_sat must also be set.
+        #[arg(long)]
+        offer: Option<String>,
+
         /// Either BIP21 URI or Liquid address we intend to pay to
         #[arg(long)]
         address: Option<String>,
@@ -286,12 +290,12 @@ pub(crate) async fn handle_command(
                 InputType::Bolt11 { invoice } => result.push_str(&build_qr_text(&invoice.bolt11)),
                 InputType::LiquidAddress { address } => {
                     result.push_str(&build_qr_text(&address.to_uri().map_err(|e| {
-                        anyhow::anyhow!("Could not build BIP21 from address data: {e:?}")
+                        anyhow!("Could not build BIP21 from address data: {e:?}")
                     })?))
                 }
                 InputType::BitcoinAddress { address } => {
                     result.push_str(&build_qr_text(&address.to_uri().map_err(|e| {
-                        anyhow::anyhow!("Could not build BIP21 from address data: {e:?}")
+                        anyhow!("Could not build BIP21 from address data: {e:?}")
                     })?))
                 }
                 _ => {}
@@ -308,24 +312,24 @@ pub(crate) async fn handle_command(
         }
         Command::SendPayment {
             invoice,
+            offer,
             address,
             amount_sat,
             delay,
         } => {
-            let destination = match (invoice, address) {
-                (None, None) => {
-                    return Err(anyhow::anyhow!(
-                        "Must specify either an invoice or a direct/BIP21 address."
-                    ))
-                }
-                (Some(invoice), None) => invoice,
-                (None, Some(address)) => address,
-                (Some(_), Some(_)) => {
-                    return Err(anyhow::anyhow!(
-                        "Cannot specify both invoice and address at the same time."
+            let destination = match (invoice, offer, address) {
+                (Some(invoice), None, None) => Ok(invoice),
+                (None, Some(offer), None) => match amount_sat {
+                    Some(_) => Ok(offer),
+                    None => Err(anyhow!(
+                        "Must specify either a BOLT11 invoice, a BOLT12 offer or a direct/BIP21 address."
                     ))
-                }
-            };
+                },
+                (None, None, Some(address)) => Ok(address),
+                _ => Err(anyhow!(
+                    "Must specify either a BOLT11 invoice, a BOLT12 offer or a direct/BIP21 address."
+                ))
+            }?;
 
             let prepare_response = sdk
                 .prepare_send_payment(&PrepareSendRequest {
@@ -368,7 +372,7 @@ pub(crate) async fn handle_command(
             let amount = match drain.unwrap_or(false) {
                 true => PayOnchainAmount::Drain,
                 false => PayOnchainAmount::Receiver {
-                    amount_sat: receiver_amount_sat.ok_or(anyhow::anyhow!(
+                    amount_sat: receiver_amount_sat.ok_or(anyhow!(
                         "Must specify `receiver_amount_sat` if not draining"
                     ))?,
                 },
@@ -482,7 +486,7 @@ pub(crate) async fn handle_command(
             match maybe_payment {
                 Some(payment) => command_result!(payment),
                 None => {
-                    return Err(anyhow::anyhow!("Payment not found."));
+                    return Err(anyhow!("Payment not found."));
                 }
             }
         }
@@ -585,7 +589,7 @@ pub(crate) async fn handle_command(
                         .await?;
                     Ok(pay_res)
                 }
-                _ => Err(anyhow::anyhow!("Invalid input")),
+                _ => Err(anyhow!("Invalid input")),
             }?;
 
             command_result!(res)
@@ -609,7 +613,7 @@ pub(crate) async fn handle_command(
                         .await?;
                     Ok(withdraw_res)
                 }
-                _ => Err(anyhow::anyhow!("Invalid input")),
+                _ => Err(anyhow!("Invalid input")),
             }?;
 
             command_result!(res)
@@ -622,7 +626,7 @@ pub(crate) async fn handle_command(
                     let auth_res = sdk.lnurl_auth(ad).await?;
                     serde_json::to_string_pretty(&auth_res).map_err(|e| e.into())
                 }
-                _ => Err(anyhow::anyhow!("Unexpected result type")),
+                _ => Err(anyhow!("Unexpected result type")),
             }?;
 
             command_result!(res)