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

Author: Camillarhi

src/payment/unified_qr.rs

@@ -16,7 +16,6 @@ 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};
@@ -94,14 +93,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)?,
@@ -163,7 +162,6 @@ impl UnifiedQrPayment {
 					"Configurable amount payments not supported in this version"
 				);
 				return Err(Error::InvalidUri);
-				return Err(Error::InvalidAmount);
 			},
 			PaymentInstructions::FixedAmount(instructions) => {
 				for method in instructions.methods() {
@@ -201,11 +199,11 @@ impl UnifiedQrPayment {
 						},
 					}
 				}
+
+				log_error!(self.logger, "No payable methods found in URI");
+				Err(Error::InvalidUri)
 			},
 		}
-
-		log_error!(self.logger, "No valid payment method found in the URI.");
-		Err(Error::InvalidUri)
 	}
 }