From: Matt Corallo <git@bluematt.me>
Date: Thu, 18 Apr 2024 21:42:48 +0000 (+0000)
Subject: Log when a ChannelMonitor's claimable balances set goes empty
X-Git-Tag: v0.0.123-rc1~3^2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=refs%2Fheads%2F2024-04-2964-followups;p=rust-lightning

Log when a ChannelMonitor's claimable balances set goes empty
---

diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index 853fbbbe8..58d979597 100644
--- a/lightning/src/chain/channelmonitor.rs
+++ b/lightning/src/chain/channelmonitor.rs
@@ -1878,10 +1878,10 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 			}
 		}
 
+		const BLOCKS_THRESHOLD: u32 = 4032; // ~four weeks
 		match (inner.balances_empty_height, is_all_funds_claimed) {
 			(Some(balances_empty_height), true) => {
 				// Claimed all funds, check if reached the blocks threshold.
-				const BLOCKS_THRESHOLD: u32 = 4032; // ~four weeks
 				return current_height >= balances_empty_height + BLOCKS_THRESHOLD;
 			},
 			(Some(_), false) => {
@@ -1897,6 +1897,9 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 			(None, true) => {
 				// Claimed all funds but `balances_empty_height` is None. It is set to the
 				// current block height.
+				log_debug!(logger,
+					"ChannelMonitor funded at {} is now fully resolved. It will become archivable in {} blocks",
+					inner.get_funding_txo().0, BLOCKS_THRESHOLD);
 				inner.balances_empty_height = Some(current_height);
 				false
 			},