Replace parts of the QR-code scanning with bitcoin-payment-instructions from rust-bitcoin

Author: Camillarhi

Cargo.toml

@@ -87,6 +87,8 @@ log = { version = "0.4.22", default-features = false, features = ["std"]}
 vss-client = "0.3"
 prost = { version = "0.11.6", default-features = false}
 
+bitcoin-payment-instructions = { version = "0.4.0" }
+
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winbase"] }
 

src/payment/unified_qr.rs

@@ -16,6 +16,7 @@ use crate::logger::{log_error, LdkLogger, Logger};
 use crate::payment::{bolt11::maybe_wrap_invoice, Bolt11Payment, Bolt12Payment, OnchainPayment};
 use crate::Config;
 
+use bitcoin::script::Instruction;
 use lightning::ln::channelmanager::PaymentId;
 use lightning::offers::offer::Offer;
 use lightning_invoice::{Bolt11Invoice, Bolt11InvoiceDescription, Description};
@@ -28,6 +29,9 @@ use bitcoin::{Amount, Txid};
 use std::sync::Arc;
 use std::vec::IntoIter;
 
+use bitcoin_payment_instructions::hrn_resolution::DummyHrnResolver;
+use bitcoin_payment_instructions::{PaymentInstructions, PaymentMethod};
+
 type Uri<'a> = bip21::Uri<'a, NetworkChecked, Extras>;
 
 #[derive(Debug, Clone)]
@@ -90,14 +94,14 @@ impl UnifiedQrPayment {
 
 		let amount_msats = amount_sats * 1_000;
 
-		let bolt12_offer = match self.bolt12_payment.receive(amount_msats, description, None, None)
-		{
-			Ok(offer) => Some(offer),
-			Err(e) => {
-				log_error!(self.logger, "Failed to create offer: {}", e);
-				return Err(Error::OfferCreationFailed);
-			},
-		};
+		// let bolt12_offer = match self.bolt12_payment.receive(amount_msats, description, None, None)
+		// {
+		// 	Ok(offer) => Some(offer),
+		// 	Err(e) => {
+		// 		log_error!(self.logger, "Failed to create offer: {}", e);
+		// 		return Err(Error::OfferCreationFailed);
+		// 	},
+		// };
 
 		let invoice_description = Bolt11InvoiceDescription::Direct(
 			Description::new(description.to_string()).map_err(|_| Error::InvoiceCreationFailed)?,
@@ -115,7 +119,7 @@ impl UnifiedQrPayment {
 			},
 		};
 
-		let extras = Extras { bolt11_invoice, bolt12_offer };
+		let extras = Extras { bolt11_invoice, bolt12_offer: None };
 
 		let mut uri = Uri::with_extras(onchain_address, extras);
 		uri.amount = Some(Amount::from_sat(amount_sats));
@@ -135,42 +139,73 @@ impl UnifiedQrPayment {
 	///
 	/// [BIP 21]: https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki
 	pub fn send(&self, uri_str: &str) -> Result<QrPaymentResult, Error> {
-		let uri: bip21::Uri<NetworkUnchecked, Extras> =
-			uri_str.parse().map_err(|_| Error::InvalidUri)?;
-
-		let uri_network_checked =
-			uri.clone().require_network(self.config.network).map_err(|_| Error::InvalidNetwork)?;
-
-		if let Some(offer) = uri_network_checked.extras.bolt12_offer {
-			match self.bolt12_payment.send(&offer, None, None) {
-				Ok(payment_id) => return Ok(QrPaymentResult::Bolt12 { payment_id }),
-				Err(e) => log_error!(self.logger, "Failed to send BOLT12 offer: {:?}. This is part of a unified QR code payment. Falling back to the BOLT11 invoice.", e),
-			}
-		}
-
-		if let Some(invoice) = uri_network_checked.extras.bolt11_invoice {
-			let invoice = maybe_wrap_invoice(invoice);
-			match self.bolt11_invoice.send(&invoice, None) {
-				Ok(payment_id) => return Ok(QrPaymentResult::Bolt11 { payment_id }),
-				Err(e) => log_error!(self.logger, "Failed to send BOLT11 invoice: {:?}. This is part of a unified QR code payment. Falling back to the on-chain transaction.", e),
-			}
-		}
-
-		let amount = match uri_network_checked.amount {
-			Some(amount) => amount,
-			None => {
-				log_error!(self.logger, "No amount specified in the URI. Aborting the payment.");
+		let rt = tokio::runtime::Runtime::new().map_err(|e| {
+			log_error!(self.logger, "Failed to create Tokio runtime: {}", e);
+			Error::InvalidInvoice
+		})?;
+
+		let instructions = rt
+			.block_on(PaymentInstructions::parse(
+				uri_str,
+				self.config.network,
+				&DummyHrnResolver,
+				false,
+			))
+			.map_err(|e| {
+				log_error!(self.logger, "Failed to parse payment instructions: {:?}", e);
+				Error::InvalidUri
+			})?;
+
+		match instructions {
+			PaymentInstructions::ConfigurableAmount(_) => {
+				log_error!(
+					self.logger,
+					"Configurable amount payments not supported in this version"
+				);
+				return Err(Error::InvalidUri);
 				return Err(Error::InvalidAmount);
 			},
-		};
-
-		let txid = self.onchain_payment.send_to_address(
-			&uri_network_checked.address,
-			amount.to_sat(),
-			None,
-		)?;
+			PaymentInstructions::FixedAmount(instructions) => {
+				for method in instructions.methods() {
+					match method {
+						PaymentMethod::LightningBolt12(offer) => {
+							match self.bolt12_payment.send(&offer, None, None) {
+								Ok(payment_id) => return Ok(QrPaymentResult::Bolt12 { payment_id }),
+								Err(e) => log_error!(self.logger, "Failed to send BOLT12 offer: {:?}. This is part of a unified QR code payment. Falling back to the BOLT11 invoice.", e),
+							}
+						},
+						PaymentMethod::LightningBolt11(invoice) => {
+							match self.bolt11_invoice.send(&invoice, None) {
+								Ok(payment_id) => return Ok(QrPaymentResult::Bolt11 { payment_id }),
+								Err(e) => log_error!(self.logger, "Failed to send BOLT11 invoice: {:?}. This is part of a unified QR code payment. Falling back to the on-chain transaction.", e),
+							}
+						},
+						PaymentMethod::OnChain(address) => {
+							let amount = match instructions.onchain_payment_amount() {
+								Some(amount) => amount,
+								None => {
+									log_error!(
+										self.logger,
+										"No amount specified in the URI. Aborting the payment."
+									);
+									return Err(Error::InvalidAmount);
+								},
+							};
+
+							let txid = self.onchain_payment.send_to_address(
+								&address,
+								amount.sats().unwrap(),
+								None,
+							)?;
+							return Ok(QrPaymentResult::Onchain { txid });
+						},
+					}
+				}
+			},
+		}
 
-		Ok(QrPaymentResult::Onchain { txid })
+		log_error!(self.logger, "No valid payment method found in the URI.");
+		Err(Error::InvalidUri)
 	}
 }