Support held_htlc_available counterparty reply path

As part of supporting sending payments as an often-offline sender, the sender
needs to send held_htlc_available onion messages such that the reply path to
the message terminates at their always-online channel counterparty that is
holding the HTLC. That way when the recipient responds with release_held_htlc,
the sender's counterparty will receive that message.

Here we lay some groundwork for using a counterparty-created reply path when
sending held_htlc_available as an async sender in the next commit.

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -92,7 +92,7 @@ use crate::ln::outbound_payment::{
 };
 use crate::ln::types::ChannelId;
 use crate::offers::async_receive_offer_cache::AsyncReceiveOfferCache;
-use crate::offers::flow::{InvreqResponseInstructions, OffersMessageFlow};
+use crate::offers::flow::{HeldHtlcReplyPath, InvreqResponseInstructions, OffersMessageFlow};
 use crate::offers::invoice::{
 	Bolt12Invoice, DerivedSigningPubkey, InvoiceBuilder, DEFAULT_RELATIVE_EXPIRY,
 };
@@ -5436,11 +5436,12 @@ where
 					);
 				}
 			} else {
-				let enqueue_held_htlc_available_res = self.flow.enqueue_held_htlc_available(
-					invoice,
+				let reply_path = HeldHtlcReplyPath::ToUs {
 					payment_id,
-					self.get_peers_for_blinded_path(),
-				);
+					peers: self.get_peers_for_blinded_path(),
+				};
+				let enqueue_held_htlc_available_res =
+					self.flow.enqueue_held_htlc_available(invoice, reply_path);
 				if enqueue_held_htlc_available_res.is_err() {
 					self.abandon_payment_with_reason(
 						payment_id,

lightning/src/offers/flow.rs

@@ -412,6 +412,26 @@ pub enum InvreqResponseInstructions {
 	},
 }
 
+/// Parameters for the reply path to a [`HeldHtlcAvailable`] onion message.
+pub enum HeldHtlcReplyPath {
+	/// The reply path to the [`HeldHtlcAvailable`] message should terminate at our node.
+	ToUs {
+		/// The id of the payment.
+		payment_id: PaymentId,
+		/// The peers to use when creating this reply path.
+		peers: Vec<MessageForwardNode>,
+	},
+	/// The reply path to the [`HeldHtlcAvailable`] message should terminate at our next-hop channel
+	/// counterparty, as they are holding our HTLC until they receive the corresponding
+	/// [`ReleaseHeldHtlc`] message.
+	///
+	/// [`ReleaseHeldHtlc`]: crate::onion_message::async_payments::ReleaseHeldHtlc
+	ToCounterparty {
+		/// The blinded path provided to us by our counterparty.
+		path: BlindedMessagePath,
+	},
+}
+
 impl<MR: Deref> OffersMessageFlow<MR>
 where
 	MR::Target: MessageRouter,
@@ -1131,14 +1151,19 @@ where
 	/// [`ReleaseHeldHtlc`]: crate::onion_message::async_payments::ReleaseHeldHtlc
 	/// [`supports_onion_messages`]: crate::types::features::Features::supports_onion_messages
 	pub fn enqueue_held_htlc_available(
-		&self, invoice: &StaticInvoice, payment_id: PaymentId, peers: Vec<MessageForwardNode>,
+		&self, invoice: &StaticInvoice, reply_path_params: HeldHtlcReplyPath,
 	) -> Result<(), Bolt12SemanticError> {
-		let context =
-			MessageContext::AsyncPayments(AsyncPaymentsContext::OutboundPayment { payment_id });
-
-		let reply_paths = self
-			.create_blinded_paths(peers, context)
-			.map_err(|_| Bolt12SemanticError::MissingPaths)?;
+		let reply_paths = match reply_path_params {
+			HeldHtlcReplyPath::ToUs { payment_id, peers } => {
+				let context =
+					MessageContext::AsyncPayments(AsyncPaymentsContext::OutboundPayment {
+						payment_id,
+					});
+				self.create_blinded_paths(peers, context)
+					.map_err(|_| Bolt12SemanticError::MissingPaths)?
+			},
+			HeldHtlcReplyPath::ToCounterparty { path } => vec![path],
+		};
 
 		let mut pending_async_payments_messages =
 			self.pending_async_payments_messages.lock().unwrap();