Include invreq in payment onion when retrying async payments.

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -12589,6 +12589,7 @@ where
 										payment_secret: None, // only used for retries, and we'll never retry on startup
 										payment_metadata: None, // only used for retries, and we'll never retry on startup
 										keysend_preimage: None, // only used for retries, and we'll never retry on startup
+										invoice_request: None, // only used for retries, and we'll never retry on startup
 										custom_tlvs: Vec::new(), // only used for retries, and we'll never retry on startup
 										pending_amt_msat: path_amt,
 										pending_fee_msat: Some(path_fee),

lightning/src/ln/outbound_payment.rs

@@ -94,6 +94,7 @@ pub(crate) enum PendingOutboundPayment {
 		payment_secret: Option<PaymentSecret>,
 		payment_metadata: Option<Vec<u8>>,
 		keysend_preimage: Option<PaymentPreimage>,
+		invoice_request: Option<InvoiceRequest>,
 		custom_tlvs: Vec<(u64, Vec<u8>)>,
 		pending_amt_msat: u64,
 		/// Used to track the fee paid. Present iff the payment was serialized on 0.0.103+.
@@ -946,18 +947,25 @@ impl OutboundPayments {
 		};
 
 		let payment_params = Some(route_params.payment_params.clone());
-		let (retryable_payment, onion_session_privs) = self.create_pending_payment(
-			payment_hash, recipient_onion.clone(), keysend_preimage, &route, Some(retry_strategy),
-			payment_params, entropy_source, best_block_height
-		);
+		let onion_session_privs;
 		let mut invoice_request_opt = None;
 		let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 		match outbounds.entry(payment_id) {
 			hash_map::Entry::Occupied(entry) => match entry.remove() {
 				PendingOutboundPayment::InvoiceReceived { .. } => {
+					let (retryable_payment, session_privs) = self.create_pending_payment(
+						payment_hash, recipient_onion.clone(), None, None, &route, Some(retry_strategy),
+						payment_params, entropy_source, best_block_height
+					);
+					onion_session_privs = session_privs;
 					outbounds.insert(payment_id, retryable_payment);
 				},
 				PendingOutboundPayment::StaticInvoiceReceived { invoice_request, .. } => {
+					let (retryable_payment, session_privs) = self.create_pending_payment(
+						payment_hash, recipient_onion.clone(), keysend_preimage, Some(invoice_request.clone()),
+						&route, Some(retry_strategy), payment_params, entropy_source, best_block_height
+					);
+					onion_session_privs = session_privs;
 					invoice_request_opt = Some(invoice_request);
 					outbounds.insert(payment_id, retryable_payment);
 				},
@@ -1560,7 +1568,7 @@ impl OutboundPayments {
 			hash_map::Entry::Occupied(_) => Err(PaymentSendFailure::DuplicatePayment),
 			hash_map::Entry::Vacant(entry) => {
 				let (payment, onion_session_privs) = self.create_pending_payment(
-					payment_hash, recipient_onion, keysend_preimage, route, retry_strategy,
+					payment_hash, recipient_onion, keysend_preimage, None, route, retry_strategy,
 					payment_params, entropy_source, best_block_height
 				);
 				entry.insert(payment);
@@ -1571,8 +1579,9 @@ impl OutboundPayments {
 
 	fn create_pending_payment<ES: Deref>(
 		&self, payment_hash: PaymentHash, recipient_onion: RecipientOnionFields,
-		keysend_preimage: Option<PaymentPreimage>, route: &Route, retry_strategy: Option<Retry>,
-		payment_params: Option<PaymentParameters>, entropy_source: &ES, best_block_height: u32
+		keysend_preimage: Option<PaymentPreimage>, invoice_request: Option<InvoiceRequest>,
+		route: &Route, retry_strategy: Option<Retry>, payment_params: Option<PaymentParameters>,
+		entropy_source: &ES, best_block_height: u32
 	) -> (PendingOutboundPayment, Vec<[u8; 32]>)
 	where
 		ES::Target: EntropySource,
@@ -1593,6 +1602,7 @@ impl OutboundPayments {
 			payment_secret: recipient_onion.payment_secret,
 			payment_metadata: recipient_onion.payment_metadata,
 			keysend_preimage,
+			invoice_request,
 			custom_tlvs: recipient_onion.custom_tlvs,
 			starting_block_height: best_block_height,
 			total_msat: route.get_total_amount(),
@@ -2178,6 +2188,7 @@ impl_writeable_tlv_based_enum_upgradable!(PendingOutboundPayment,
 		(9, custom_tlvs, optional_vec),
 		(10, starting_block_height, required),
 		(11, remaining_max_total_routing_fee_msat, option),
+		(13, invoice_request, option),
 		(not_written, retry_strategy, (static_value, None)),
 		(not_written, attempts, (static_value, PaymentAttempts::new())),
 	},