f - pass absolute expiry to create_refund_builder

Author: jkczyz

lightning/src/ln/channelmanager.rs

@@ -7109,16 +7109,17 @@ where
 	}
 
 	/// Creates a [`RefundBuilder`] such that the [`Refund`] it builds is recognized by the
-	/// [`ChannelManager`] when handling [`Bolt12Invoice`] messages for the refund. The refund will
-	/// not have an expiration unless otherwise set on the builder.
+	/// [`ChannelManager`] when handling [`Bolt12Invoice`] messages for the refund. The builder will
+	/// have an expiration set, if provided. Any changes to the expiration on the returned builder
+	/// will not be honored by [`ChannelManager`].
 	///
 	/// The provided `payment_id` is used to ensure that only one invoice is paid for the refund.
 	///
 	/// [`Refund`]: crate::offers::refund::Refund
 	/// [`Bolt12Invoice`]: crate::offers::invoice::Bolt12Invoice
 	pub fn create_refund_builder(
-		&self, description: String, amount_msats: u64, payment_id: PaymentId, retry_strategy: Retry,
-		max_total_routing_fee_msat: Option<u64>
+		&self, description: String, amount_msats: u64, absolute_expiry: Option<Duration>,
+		payment_id: PaymentId, retry_strategy: Retry, max_total_routing_fee_msat: Option<u64>
 	) -> Result<RefundBuilder<secp256k1::All>, Bolt12SemanticError> {
 		let node_id = self.get_our_node_id();
 		let expanded_key = &self.inbound_payment_key;
@@ -7129,8 +7130,21 @@ where
 		let builder = RefundBuilder::deriving_payer_id(
 			description, node_id, expanded_key, entropy, secp_ctx, amount_msats, payment_id
 		)?.chain_hash(self.chain_hash);
+
+		let builder = match absolute_expiry {
+			Some(absolute_expiry) => builder.absolute_expiry(absolute_expiry),
+			None => builder,
+		};
+
+		const SECONDS_PER_TIMER_TICK: u64 = 60;
+		let timer_ticks_before_expiration =
+			absolute_expiry.map(|expiry| expiry.as_secs() / SECONDS_PER_TIMER_TICK);
+
 		self.pending_outbound_payments
-			.add_new_awaiting_invoice(payment_id, retry_strategy, max_total_routing_fee_msat)
+			.add_new_awaiting_invoice_for_refund(
+				payment_id, retry_strategy, max_total_routing_fee_msat,
+				timer_ticks_before_expiration
+			)
 			.map_err(|_| Bolt12SemanticError::DuplicatePaymentId)?;
 
 		Ok(builder)