f Use claim-height pending expiry

Keep manual BOLT11 invoice reservations time-based until the
claimable event arrives, then prune by the HTLC claim deadline height
so cleanup cannot run before the claim window closes.

Co-Authored-By: HAL 9000

Author: tnull

src/event.rs

@@ -52,7 +52,7 @@ use crate::payment::asynchronous::static_invoice_store::StaticInvoiceStore;
 use crate::payment::store::{
 	PaymentDetails, PaymentDetailsUpdate, PaymentDirection, PaymentKind, PaymentStatus,
 };
-use crate::payment::{PaymentMetadata, PendingPaymentDetails};
+use crate::payment::{PaymentMetadata, PendingPaymentDetails, PendingPaymentExpiry};
 use crate::probing::Prober;
 use crate::runtime::Runtime;
 use crate::types::{
@@ -617,9 +617,10 @@ where
 
 	async fn prune_expired_pending_payments(&self) -> Result<(), ReplayEvent> {
 		let now = Self::current_time_secs();
+		let current_height = self.channel_manager.current_best_block().height;
 		let expired_payment_ids = self
 			.pending_payment_store
-			.list_filter(|payment| payment.has_expired(now))
+			.list_filter(|payment| payment.has_expired(now, current_height))
 			.into_iter()
 			.map(|payment| payment.details.id)
 			.collect::<Vec<_>>();
@@ -932,7 +933,8 @@ where
 					}
 
 					let mut pending_payment = pending_payment.clone();
-					pending_payment.expires_at = None;
+					pending_payment.expiry =
+						claim_deadline.map(|height| PendingPaymentExpiry::Height { height });
 					if let Err(e) =
 						self.pending_payment_store.insert_or_update(pending_payment).await
 					{

src/payment/bolt11.rs

@@ -36,7 +36,7 @@ use crate::payment::store::{
 	LSPS2Parameters, PaymentDetails, PaymentDetailsUpdate, PaymentDirection, PaymentKind,
 	PaymentStatus,
 };
-use crate::payment::PendingPaymentDetails;
+use crate::payment::{PendingPaymentDetails, PendingPaymentExpiry};
 use crate::peer_store::{PeerInfo, PeerStore};
 use crate::runtime::Runtime;
 use crate::types::{ChannelManager, PaymentStore, PendingPaymentStore};
@@ -109,9 +109,10 @@ impl Bolt11Payment {
 
 	fn prune_expired_pending_payments(&self) -> Result<(), Error> {
 		let now = Self::current_time_secs();
+		let current_height = self.channel_manager.current_best_block().height;
 		let expired_payment_ids = self
 			.pending_payment_store
-			.list_filter(|payment| payment.has_expired(now))
+			.list_filter(|payment| payment.has_expired(now, current_height))
 			.into_iter()
 			.map(|payment| payment.details.id)
 			.collect::<Vec<_>>();
@@ -138,8 +139,9 @@ impl Bolt11Payment {
 			PaymentDirection::Inbound,
 			PaymentStatus::Pending,
 		);
-		let expires_at = Some(Self::current_time_secs().saturating_add(expiry_secs as u64));
-		PendingPaymentDetails::new_with_expiry(payment, Vec::new(), expires_at)
+		let timestamp = Self::current_time_secs().saturating_add(expiry_secs as u64);
+		let expiry = Some(PendingPaymentExpiry::Time { timestamp });
+		PendingPaymentDetails::new_with_expiry(payment, Vec::new(), expiry)
 	}
 
 	fn reserve_manual_claim_invoice(

src/payment/pending_payment_store.rs

@@ -474,7 +474,11 @@ mod tests {
 			PaymentDirection::Inbound,
 			PaymentStatus::Pending,
 		);
-		PendingPaymentDetails::new_with_expiry(details, Vec::new(), Some(1_000_000))
+		PendingPaymentDetails::new_with_expiry(
+			details,
+			Vec::new(),
+			Some(PendingPaymentExpiry::Time { timestamp: 1_000_000 }),
+		)
 	}
 
 	#[tokio::test]