fixup! move the bolt12 invoice inside HTLCSource::OutboundRoute

Signed-off-by: Vincenzo Palazzo <[email protected]>

Author: vincenzopalazzo

lightning/src/ln/channelmanager.rs

@@ -668,7 +668,9 @@ mod fuzzy_channelmanager {
 			/// doing a double-pass on route when we get a failure back
 			first_hop_htlc_msat: u64,
 			payment_id: PaymentId,
-			// TODO(vincenzopalazzo): add the documentation for this field
+			/// The BOLT12 invoice associated with this payment, if any. This is stored here to ensure
+			/// we can provide proof-of-payment details in payment claim events even after a restart
+			/// with a stale ChannelManager state.
 			bolt12_invoice: Option<PaidBolt12Invoice>,
 		},
 	}

lightning/src/ln/outbound_payment.rs

@@ -1044,7 +1044,6 @@ impl OutboundPayments {
 			hash_map::Entry::Occupied(entry) => match entry.get() {
 				PendingOutboundPayment::InvoiceReceived { .. } => {
 					let (retryable_payment, onion_session_privs) = Self::create_pending_payment(
-						// FIXME: remove the bolt12_invoice here! we need to clean up this part!
 						payment_hash, recipient_onion.clone(), keysend_preimage, None, Some(bolt12_invoice.clone()), &route,
 						Some(retry_strategy), payment_params, entropy_source, best_block_height,
 					);
@@ -1056,7 +1055,6 @@ impl OutboundPayments {
 						invoice_request
 					} else { unreachable!() };
 					let (retryable_payment, onion_session_privs) = Self::create_pending_payment(
-						// FIXME: We do not need anymore the bolt12_invoice here! we need to clean up this part!
 						payment_hash, recipient_onion.clone(), keysend_preimage, Some(invreq), Some(bolt12_invoice.clone()), &route,
 						Some(retry_strategy), payment_params, entropy_source, best_block_height
 					);
@@ -2067,7 +2065,6 @@ impl OutboundPayments {
 		let mut outbounds = self.pending_outbound_payments.lock().unwrap();
 		let mut pending_events = pending_events.lock().unwrap();
 		for source in sources {
-			// TODO(vincenzopalazzo): This should contain the paid bolt12 invoice.
 			if let HTLCSource::OutboundRoute { session_priv, payment_id, path, .. } = source {
 				let mut session_priv_bytes = [0; 32];
 				session_priv_bytes.copy_from_slice(&session_priv[..]);