logging in channel monitor

Author: Sharmalm

lightning/src/chain/channelmonitor.rs

@@ -3390,6 +3390,8 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 					let mut balance_spendable_csv = None;
 					log_info!(logger, "Channel {} closed by funding output spend in txid {}.",
 						&self.funding_info.0.to_channel_id(), txid);
+				    // logging only that spends funding output
+					log_trace!(logger, "Transaction id {} confirmed in block {}", txid , block_hash);
 					self.funding_spend_seen = true;
 					let mut commitment_tx_to_counterparty_output = None;
 					if (tx.input[0].sequence.0 >> 8*3) as u8 == 0x80 && (tx.lock_time.0 >> 8*3) as u8 == 0x20 {
@@ -3438,6 +3440,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 						if let Some(new_outputs) = new_outputs_option {
 							watch_outputs.push(new_outputs);
 						}
+						log_trace!(logger, "Transaction id {} confirmed in block {}", commitment_txid , block_hash);
 						// Since there may be multiple HTLCs for this channel (all spending the
 						// same commitment tx) being claimed by the counterparty within the same
 						// transaction, and `check_spend_counterparty_htlc` already checks all the

lightning/src/ln/channelmanager.rs

@@ -7009,12 +7009,6 @@ where
 			let timestamp = self.highest_seen_timestamp.load(Ordering::Acquire);
 			self.do_chain_event(Some(last_best_block_height), |channel| channel.best_block_updated(last_best_block_height, timestamp as u32, self.genesis_hash.clone(), &self.node_signer, &self.default_configuration, &self.logger));
 		}
-		// log each confirmed tansaction's Txid.
-		for tx in txdata.iter() {
-			let (index, transaction) = tx;
-			let txid = transaction.txid();
-			log_trace!(self.logger, "Transaction id {} confirmed in block {}", txid, block_hash);
-		}
 	}
 
 	fn best_block_updated(&self, header: &BlockHeader, height: u32) {