r Add latest_stale_tip to ChannelMonitor

lightning/src/chain/channelmonitor.rs

@@ -934,6 +934,9 @@ pub(crate) struct ChannelMonitorImpl<Signer: WriteableEcdsaChannelSigner> {
 	/// Ordering of tuple data: (their_per_commitment_point, feerate_per_kw, to_broadcaster_sats,
 	/// to_countersignatory_sats)
 	initial_counterparty_commitment_info: Option<(PublicKey, u32, u64, u64)>,
+
+	/// The latest block height we've seen at the time of checking for stale channels.
+	latest_stale_tip: Option<u32>,
 }
 
 /// Transaction outputs to watch for on-chain spends.
@@ -1327,6 +1330,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 			best_block,
 			counterparty_node_id: Some(counterparty_node_id),
 			initial_counterparty_commitment_info: None,
+			latest_stale_tip: None,
 		})
 	}
 
@@ -1855,8 +1859,28 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 		spendable_outputs
 	}
 
+	fn latest_stale_tip(&self) -> Option<u32> {
+		let inner = self.inner.lock().unwrap();
+		inner.latest_stale_tip
+	}
+
+	fn set_latest_stale_tip(&self, latest_stale_tip: Option<u32>) {
+		let mut inner = self.inner.lock().unwrap();
+		inner.latest_stale_tip = latest_stale_tip;
+	}
+
+
 	pub(crate) fn is_stale(&self) -> bool {
-		self.get_claimable_balances().is_empty()
+		if let Some(latest_stale_tip) = self.latest_stale_tip() {
+			let is_below_threshold = self.current_best_block().height > latest_stale_tip;
+			let best_block = self.current_best_block();
+			self.set_latest_stale_tip(Some(best_block.height));
+			is_below_threshold && self.get_claimable_balances().is_empty()
+		} else {
+			let best_block = self.current_best_block();
+			self.set_latest_stale_tip(Some(best_block.height));
+			false
+		}
 	}
 
 	#[cfg(test)]
@@ -4725,6 +4749,7 @@ impl<'a, 'b, ES: EntropySource, SP: SignerProvider> ReadableArgs<(&'a ES, &'b SP
 			best_block,
 			counterparty_node_id,
 			initial_counterparty_commitment_info,
+			latest_stale_tip: None,
 		})))
 	}
 }