f - use absolute expiry in add_new_awaiting_invoice

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -7213,9 +7213,23 @@ where
 		let invoice_request = builder.build_and_sign()?;
 		let reply_path = self.create_one_hop_blinded_path();
 
+		#[cfg(feature = "std")]
+		let duration_since_epoch = std::time::SystemTime::now()
+			.duration_since(std::time::SystemTime::UNIX_EPOCH)
+			.expect("SystemTime::now() should come after SystemTime::UNIX_EPOCH");
+		#[cfg(not(feature = "std"))]
+		let duration_since_epoch = Duration::from_secs(
+			self.highest_seen_timestamp.load(Ordering::Acquire) as u64
+		);
+
+		const INVOICE_REQUEST_RELATIVE_EXPIRY: Duration = Duration::from_secs(3 * 60);
+		let absolute_expiry = duration_since_epoch
+			.checked_add(INVOICE_REQUEST_RELATIVE_EXPIRY)
+			.unwrap_or(Duration::from_secs(u64::MAX));
+
 		self.pending_outbound_payments
-			.add_new_awaiting_invoice_for_offer(
-				payment_id, retry_strategy, max_total_routing_fee_msat
+			.add_new_awaiting_invoice(
+				payment_id, absolute_expiry, retry_strategy, max_total_routing_fee_msat
 			)
 			.map_err(|_| Bolt12SemanticError::DuplicatePaymentId)?;