Merge pull request #3810 from tnull/2025-05-fix-new-bolt11-payment-interface

Various BOLT11 payment interface fixes

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -82,8 +82,8 @@ use crate::ln::our_peer_storage::EncryptedOurPeerStorage;
 #[cfg(test)]
 use crate::ln::outbound_payment;
 use crate::ln::outbound_payment::{
-	Bolt11PaymentError, OutboundPayments, PendingOutboundPayment, RetryableInvoiceRequest,
-	SendAlongPathArgs, StaleExpiration,
+	OutboundPayments, PendingOutboundPayment, RetryableInvoiceRequest, SendAlongPathArgs,
+	StaleExpiration,
 };
 use crate::ln::types::ChannelId;
 use crate::offers::flow::OffersMessageFlow;
@@ -187,7 +187,8 @@ use core::{cmp, mem};
 #[cfg(any(test, feature = "_externalize_tests"))]
 pub(crate) use crate::ln::outbound_payment::PaymentSendFailure;
 pub use crate::ln::outbound_payment::{
-	Bolt12PaymentError, ProbeSendFailure, RecipientOnionFields, Retry, RetryableSendFailure,
+	Bolt11PaymentError, Bolt12PaymentError, ProbeSendFailure, RecipientOnionFields, Retry,
+	RetryableSendFailure,
 };
 use crate::ln::script::ShutdownScript;
 
@@ -5142,10 +5143,11 @@ where
 	///
 	/// # Handling Invoice Amounts
 	/// Some invoices include a specific amount, while others require you to specify one.
-	/// - If the invoice **includes** an amount, user must not provide `amount_msats`.
+	/// - If the invoice **includes** an amount, user may provide an amount greater or equal to it
+	/// to allow for overpayments.
 	/// - If the invoice **doesn't include** an amount, you'll need to specify `amount_msats`.
 	///
-	/// If these conditions aren’t met, the function will return `Bolt11PaymentError::InvalidAmount`.
+	/// If these conditions aren’t met, the function will return [`Bolt11PaymentError::InvalidAmount`].
 	///
 	/// # Custom Routing Parameters
 	/// Users can customize routing parameters via [`RouteParametersConfig`].

lightning/src/ln/outbound_payment.rs

@@ -603,8 +603,7 @@ pub(crate) enum PaymentSendFailure {
 #[derive(Debug)]
 pub enum Bolt11PaymentError {
 	/// Incorrect amount was provided to [`ChannelManager::pay_for_bolt11_invoice`].
-	/// This happens when an amount is specified when [`Bolt11Invoice`] already contains
-	/// an amount, or vice versa.
+	/// This happens when the user-provided amount is less than an amount specified in the [`Bolt11Invoice`].
 	///
 	/// [`Bolt11Invoice`]: lightning_invoice::Bolt11Invoice
 	/// [`ChannelManager::pay_for_bolt11_invoice`]: crate::ln::channelmanager::ChannelManager::pay_for_bolt11_invoice
@@ -917,7 +916,9 @@ impl OutboundPayments {
 
 		let amount = match (invoice.amount_milli_satoshis(), amount_msats) {
 			(Some(amt), None) | (None, Some(amt)) => amt,
-			(None, None) | (Some(_), Some(_)) => return Err(Bolt11PaymentError::InvalidAmount),
+			(Some(inv_amt), Some(user_amt)) if user_amt < inv_amt => return Err(Bolt11PaymentError::InvalidAmount),
+			(Some(_), Some(user_amt)) => user_amt,
+			(None, None) => return Err(Bolt11PaymentError::InvalidAmount),
 		};
 
 		let mut recipient_onion = RecipientOnionFields::secret_only(*invoice.payment_secret());

lightning/src/routing/router.rs

@@ -1142,7 +1142,7 @@ impl PaymentParameters {
 }
 
 /// A struct for configuring parameters for routing the payment.
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub struct RouteParametersConfig {
 	/// The maximum total fees, in millisatoshi, that may accrue during route finding.
 	///