Merge pull request #914 from TheBlueMatt/2021-05-log-txids

Always log_info when we broadcast a transaction, including the txid

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -1568,6 +1568,7 @@ impl<Signer: Sign> ChannelMonitorImpl<Signer> {
 					L::Target: Logger,
 	{
 		for tx in self.get_latest_holder_commitment_txn(logger).iter() {
+			log_info!(logger, "Broadcasting local {}", log_tx!(tx));
 			broadcaster.broadcast_transaction(tx);
 		}
 		self.pending_monitor_events.push(MonitorEvent::CommitmentTxBroadcasted(self.funding_info.0));

lightning/src/ln/channelmanager.rs

@@ -2540,6 +2540,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 				},
 			}
 			if let Some(tx) = funding_broadcastable {
+				log_info!(self.logger, "Broadcasting funding transaction with txid {}", tx.txid());
 				self.tx_broadcaster.broadcast_transaction(&tx);
 			}
 			if let Some(msg) = funding_locked {
@@ -2695,6 +2696,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 				hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
 			}
 		};
+		log_info!(self.logger, "Broadcasting funding transaction with txid {}", funding_tx.txid());
 		self.tx_broadcaster.broadcast_transaction(&funding_tx);
 		Ok(())
 	}
@@ -2809,7 +2811,7 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 			}
 		};
 		if let Some(broadcast_tx) = tx {
-			log_trace!(self.logger, "Broadcast onchain {}", log_tx!(broadcast_tx));
+			log_info!(self.logger, "Broadcasting {}", log_tx!(broadcast_tx));
 			self.tx_broadcaster.broadcast_transaction(&broadcast_tx);
 		}
 		if let Some(chan) = chan_option {

lightning/src/ln/onchaintx.rs

@@ -742,7 +742,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 					self.claimable_outpoints.insert(k.clone(), (txid, height));
 				}
 				self.pending_claim_requests.insert(txid, claim_material);
-				log_trace!(logger, "Broadcast onchain {}", log_tx!(tx));
+				log_info!(logger, "Broadcasting onchain {}", log_tx!(tx));
 				broadcaster.broadcast_transaction(&tx);
 			}
 		}
@@ -859,7 +859,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 		log_trace!(logger, "Bumping {} candidates", bump_candidates.len());
 		for (first_claim_txid, claim_material) in bump_candidates.iter() {
 			if let Some((new_timer, new_feerate, bump_tx)) = self.generate_claim_tx(height, &claim_material, &*fee_estimator, &*logger) {
-				log_trace!(logger, "Broadcast onchain {}", log_tx!(bump_tx));
+				log_info!(logger, "Broadcasting onchain {}", log_tx!(bump_tx));
 				broadcaster.broadcast_transaction(&bump_tx);
 				if let Some(claim_material) = self.pending_claim_requests.get_mut(first_claim_txid) {
 					claim_material.height_timer = new_timer;
@@ -926,6 +926,7 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
 			if let Some((new_timer, new_feerate, bump_tx)) = self.generate_claim_tx(height, &claim_material, &&*fee_estimator, &&*logger) {
 				claim_material.height_timer = new_timer;
 				claim_material.feerate_previous = new_feerate;
+				log_info!(logger, "Broadcasting onchain {}", log_tx!(bump_tx));
 				broadcaster.broadcast_transaction(&bump_tx);
 			}
 		}

lightning/src/util/macro_logger.rs

@@ -100,27 +100,29 @@ impl<'a> std::fmt::Display for DebugTx<'a> {
 		if self.0.input.len() >= 1 && self.0.input.iter().any(|i| !i.witness.is_empty()) {
 			if self.0.input.len() == 1 && self.0.input[0].witness.last().unwrap().len() == 71 &&
 					(self.0.input[0].sequence >> 8*3) as u8 == 0x80 {
-				write!(f, "commitment tx")?;
+				write!(f, "commitment tx ")?;
 			} else if self.0.input.len() == 1 && self.0.input[0].witness.last().unwrap().len() == 71 {
-				write!(f, "closing tx")?;
+				write!(f, "closing tx ")?;
 			} else if self.0.input.len() == 1 && HTLCType::scriptlen_to_htlctype(self.0.input[0].witness.last().unwrap().len()) == Some(HTLCType::OfferedHTLC) &&
 					self.0.input[0].witness.len() == 5 {
-				write!(f, "HTLC-timeout tx")?;
+				write!(f, "HTLC-timeout tx ")?;
 			} else if self.0.input.len() == 1 && HTLCType::scriptlen_to_htlctype(self.0.input[0].witness.last().unwrap().len()) == Some(HTLCType::AcceptedHTLC) &&
 					self.0.input[0].witness.len() == 5 {
-				write!(f, "HTLC-success tx")?;
+				write!(f, "HTLC-success tx ")?;
 			} else {
 				for inp in &self.0.input {
 					if !inp.witness.is_empty() {
 						if HTLCType::scriptlen_to_htlctype(inp.witness.last().unwrap().len()) == Some(HTLCType::OfferedHTLC) { write!(f, "preimage-")?; break }
 						else if HTLCType::scriptlen_to_htlctype(inp.witness.last().unwrap().len()) == Some(HTLCType::AcceptedHTLC) { write!(f, "timeout-")?; break }
 					}
 				}
-				write!(f, "tx")?;
+				write!(f, "tx ")?;
 			}
 		} else {
-			write!(f, "INVALID TRANSACTION")?;
+			debug_assert!(false, "We should never generate unknown transaction types");
+			write!(f, "unknown tx type ").unwrap();
 		}
+		write!(f, "with txid {}", self.0.txid())?;
 		Ok(())
 	}
 }