Include invreq in payment onion when sending async payments.

Author: valentinewallace

lightning/src/ln/outbound_payment.rs

@@ -1257,7 +1257,7 @@ impl OutboundPayments {
 				}
 			}
 		}
-		let (total_msat, recipient_onion, keysend_preimage, onion_session_privs) = {
+		let (total_msat, recipient_onion, keysend_preimage, invoice_request, onion_session_privs) = {
 			let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 			match outbounds.entry(payment_id) {
 				hash_map::Entry::Occupied(mut payment) => {
@@ -1299,7 +1299,7 @@ impl OutboundPayments {
 
 							payment.get_mut().increment_attempts();
 
-							(total_msat, recipient_onion, keysend_preimage, onion_session_privs)
+							(total_msat, recipient_onion, keysend_preimage, None, onion_session_privs)
 						},
 						PendingOutboundPayment::Legacy { .. } => {
 							log_error!(logger, "Unable to retry payments that were initially sent on LDK versions prior to 0.0.102");
@@ -1316,11 +1316,11 @@ impl OutboundPayments {
 							return
 						},
 						PendingOutboundPayment::StaticInvoiceReceived { .. } => {
-							let (payment_hash, keysend_preimage, retry_strategy) =
+							let (payment_hash, keysend_preimage, retry_strategy, invoice_request) =
 								if let PendingOutboundPayment::StaticInvoiceReceived {
-									payment_hash, keysend_preimage, retry_strategy, ..
+									payment_hash, keysend_preimage, retry_strategy, invoice_request, ..
 								} = payment.remove() {
-									(payment_hash, keysend_preimage, retry_strategy)
+									(payment_hash, keysend_preimage, retry_strategy, invoice_request)
 								} else { debug_assert!(false); return };
 							let keysend_preimage = Some(keysend_preimage);
 							let total_amount = route_params.final_value_msat;
@@ -1332,7 +1332,8 @@ impl OutboundPayments {
 								payment_params, entropy_source, best_block_height
 							);
 							outbounds.insert(payment_id, retryable_payment);
-							(total_amount, recipient_onion, keysend_preimage, onion_session_privs)
+							(total_amount, recipient_onion, keysend_preimage, Some(invoice_request),
+							 onion_session_privs)
 						},
 						PendingOutboundPayment::Fulfilled { .. } => {
 							log_error!(logger, "Payment already completed");
@@ -1351,8 +1352,8 @@ impl OutboundPayments {
 			}
 		};
 		let res = self.pay_route_internal(&route, payment_hash, &recipient_onion, keysend_preimage,
-			None, payment_id, Some(total_msat), onion_session_privs, node_signer, best_block_height,
-			&send_payment_along_path);
+			invoice_request.as_ref(), payment_id, Some(total_msat), onion_session_privs, node_signer,
+			best_block_height, &send_payment_along_path);
 		log_info!(logger, "Result retrying payment id {}: {:?}", &payment_id, res);
 		if let Err(e) = res {
 			self.handle_pay_route_err(e, payment_id, payment_hash, route, route_params, router, first_hops, inflight_htlcs, entropy_source, node_signer, best_block_height, logger, pending_events, send_payment_along_path);