Don't take() outbound invoice requests on retry

Prior to this patch, we would take() the invoice request stored for
AwaitingInvoice outbound payments when retrying sending the invoice request
onion message. This doesn't work for async payments because we need to keep the
invoice request stored for inclusion in the payment onion. Therefore, clone it
instead of take()ing it.

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -10046,6 +10046,7 @@ where
 			let retryable_invoice_request = RetryableInvoiceRequest {
 				invoice_request: invoice_request.clone(),
 				nonce,
+				needs_retry: true,
 			};
 			self.pending_outbound_payments
 				.add_new_awaiting_invoice(
@@ -11915,7 +11916,7 @@ where
 			.pending_outbound_payments
 			.release_invoice_requests_awaiting_invoice()
 		{
-			let RetryableInvoiceRequest { invoice_request, nonce } = retryable_invoice_request;
+			let RetryableInvoiceRequest { invoice_request, nonce, .. } = retryable_invoice_request;
 			let hmac = payment_id.hmac_for_offer_payment(nonce, &self.inbound_payment_key);
 			let context = MessageContext::Offers(OffersContext::OutboundPayment {
 				payment_id,
@@ -12250,6 +12251,7 @@ where
 								let retryable_invoice_request = RetryableInvoiceRequest {
 									invoice_request: invoice_request.clone(),
 									nonce,
+									needs_retry: true,
 								};
 								self.pending_outbound_payments
 									.received_offer(payment_id, Some(retryable_invoice_request))

lightning/src/ln/outbound_payment.rs

@@ -134,13 +134,16 @@ pub(crate) enum PendingOutboundPayment {
 	},
 }
 
+#[derive(Clone)]
 pub(crate) struct RetryableInvoiceRequest {
 	pub(crate) invoice_request: InvoiceRequest,
 	pub(crate) nonce: Nonce,
+	pub(super) needs_retry: bool,
 }
 
 impl_writeable_tlv_based!(RetryableInvoiceRequest, {
 	(0, invoice_request, required),
+	(1, needs_retry, (default_value, true)),
 	(2, nonce, required),
 });
 
@@ -760,7 +763,12 @@ pub(super) struct OutboundPayments {
 impl OutboundPayments {
 	pub(super) fn new(pending_outbound_payments: HashMap<PaymentId, PendingOutboundPayment>) -> Self {
 		let has_invoice_requests = pending_outbound_payments.values().any(|payment| {
-			matches!(payment, PendingOutboundPayment::AwaitingInvoice { retryable_invoice_request: Some(_), .. })
+			matches!(
+				payment,
+				PendingOutboundPayment::AwaitingInvoice {
+					retryable_invoice_request: Some(invreq), ..
+				} if invreq.needs_retry
+			)
 		});
 
 		Self {
@@ -2228,11 +2236,12 @@ impl OutboundPayments {
 			.iter_mut()
 			.filter_map(|(payment_id, payment)| {
 				if let PendingOutboundPayment::AwaitingInvoice {
-					retryable_invoice_request, ..
+					retryable_invoice_request: Some(invreq), ..
 				} = payment {
-					retryable_invoice_request.take().map(|retryable_invoice_request| {
-						(*payment_id, retryable_invoice_request)
-					})
+					if invreq.needs_retry {
+						invreq.needs_retry = false;
+						Some((*payment_id, invreq.clone()))
+					} else { None }
 				} else {
 					None
 				}