X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Fmacro_logger.rs;h=f962251cd65bd7baf072a9bcbfa0d731d4bfec64;hb=3eb61f7e9b55531626936cf84c57cd7530a878a4;hp=cd79a3f7bba8b3d500bf7036c1a202e4d6f2cd71;hpb=f99301dd8a7f056c0ed09ec827fddc00f325b3e5;p=rust-lightning

diff --git a/lightning/src/util/macro_logger.rs b/lightning/src/util/macro_logger.rs
index cd79a3f7..f962251c 100644
--- a/lightning/src/util/macro_logger.rs
+++ b/lightning/src/util/macro_logger.rs
@@ -7,29 +7,25 @@
 // You may not use this file except in accordance with one or both of these
 // licenses.
 
-use chain::transaction::OutPoint;
-use chain::keysinterface::SpendableOutputDescriptor;
+use crate::ln::ChannelId;
+use crate::sign::SpendableOutputDescriptor;
 
-use bitcoin::hash_types::Txid;
 use bitcoin::blockdata::transaction::Transaction;
-use bitcoin::secp256k1::PublicKey;
 
-use routing::router::Route;
-use ln::chan_utils::HTLCType;
-use util::logger::DebugBytes;
+use crate::routing::router::Route;
+use crate::ln::chan_utils::HTLCClaim;
 
-pub(crate) struct DebugPubKey<'a>(pub &'a PublicKey);
-impl<'a> core::fmt::Display for DebugPubKey<'a> {
-	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
-		for i in self.0.serialize().iter() {
-			write!(f, "{:02x}", i)?;
-		}
-		Ok(())
+macro_rules! log_iter {
+	($obj: expr) => {
+		$crate::util::logger::DebugIter($obj)
 	}
 }
+
+/// Logs a pubkey in hex format.
+#[macro_export]
 macro_rules! log_pubkey {
 	($obj: expr) => {
-		::util::macro_logger::DebugPubKey(&$obj)
+		$crate::util::logger::DebugPubKey(&$obj)
 	}
 }
 
@@ -41,30 +37,17 @@ macro_rules! log_bytes {
 	}
 }
 
-pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
-impl<'a> core::fmt::Display for DebugFundingChannelId<'a> {
+pub(crate) struct DebugFundingInfo<'a>(pub &'a ChannelId);
+impl<'a> core::fmt::Display for DebugFundingInfo<'a> {
 	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
-		for i in (OutPoint { txid: self.0.clone(), index: self.1 }).to_channel_id().iter() {
-			write!(f, "{:02x}", i)?;
-		}
-		Ok(())
-	}
-}
-macro_rules! log_funding_channel_id {
-	($funding_txid: expr, $funding_txo: expr) => {
-		::util::macro_logger::DebugFundingChannelId(&$funding_txid, $funding_txo)
-	}
-}
-
-pub(crate) struct DebugFundingInfo<'a, T: 'a>(pub &'a (OutPoint, T));
-impl<'a, T> core::fmt::Display for DebugFundingInfo<'a, T> {
-	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
-		DebugBytes(&(self.0).0.to_channel_id()[..]).fmt(f)
+		self.0.fmt(f)
 	}
 }
 macro_rules! log_funding_info {
 	($key_storage: expr) => {
-		::util::macro_logger::DebugFundingInfo(&$key_storage.get_funding_txo())
+		$crate::util::macro_logger::DebugFundingInfo(
+			&$key_storage.channel_id()
+		)
 	}
 }
 
@@ -73,16 +56,17 @@ impl<'a> core::fmt::Display for DebugRoute<'a> {
 	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 		for (idx, p) in self.0.paths.iter().enumerate() {
 			writeln!(f, "path {}:", idx)?;
-			for h in p.iter() {
+			for h in p.hops.iter() {
 				writeln!(f, " node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?;
 			}
+			writeln!(f, " blinded_tail: {:?}", p.blinded_tail)?;
 		}
 		Ok(())
 	}
 }
 macro_rules! log_route {
 	($obj: expr) => {
-		::util::macro_logger::DebugRoute(&$obj)
+		$crate::util::macro_logger::DebugRoute(&$obj)
 	}
 }
 
@@ -90,25 +74,34 @@ pub(crate) struct DebugTx<'a>(pub &'a Transaction);
 impl<'a> core::fmt::Display for DebugTx<'a> {
 	fn fmt(&self, f: &mut core::fmt::Formatter) -> Result<(), core::fmt::Error> {
 		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.0 >> 8*3) as u8 == 0x80 {
+			let first_input = &self.0.input[0];
+			let witness_script_len = first_input.witness.last().unwrap_or(&[]).len();
+			if self.0.input.len() == 1 && witness_script_len == 71 &&
+					(first_input.sequence.0 >> 8*3) as u8 == 0x80 {
 				write!(f, "commitment tx ")?;
-			} else if self.0.input.len() == 1 && self.0.input[0].witness.last().unwrap().len() == 71 {
+			} else if self.0.input.len() == 1 && witness_script_len == 71 {
 				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 {
+			} else if self.0.input.len() == 1 && HTLCClaim::from_witness(&first_input.witness) == Some(HTLCClaim::OfferedTimeout) {
 				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 {
+			} else if self.0.input.len() == 1 && HTLCClaim::from_witness(&first_input.witness) == Some(HTLCClaim::AcceptedPreimage) {
 				write!(f, "HTLC-success tx ")?;
 			} else {
+				let mut num_preimage = 0;
+				let mut num_timeout = 0;
+				let mut num_revoked = 0;
 				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 }
+					let htlc_claim = HTLCClaim::from_witness(&inp.witness);
+					match htlc_claim {
+						Some(HTLCClaim::AcceptedPreimage)|Some(HTLCClaim::OfferedPreimage) => num_preimage += 1,
+						Some(HTLCClaim::AcceptedTimeout)|Some(HTLCClaim::OfferedTimeout) => num_timeout += 1,
+						Some(HTLCClaim::Revocation) => num_revoked += 1,
+						None => continue,
 					}
 				}
-				write!(f, "tx ")?;
+				if num_preimage > 0 || num_timeout > 0 || num_revoked > 0 {
+					write!(f, "HTLC claim tx ({} preimage, {} timeout, {} revoked) ",
+						num_preimage, num_timeout, num_revoked)?;
+				}
 			}
 		} else {
 			debug_assert!(false, "We should never generate unknown transaction types");
@@ -121,7 +114,7 @@ impl<'a> core::fmt::Display for DebugTx<'a> {
 
 macro_rules! log_tx {
 	($obj: expr) => {
-		::util::macro_logger::DebugTx(&$obj)
+		$crate::util::macro_logger::DebugTx(&$obj)
 	}
 }
 
@@ -145,7 +138,7 @@ impl<'a> core::fmt::Display for DebugSpendable<'a> {
 
 macro_rules! log_spendable {
 	($obj: expr) => {
-		::util::macro_logger::DebugSpendable(&$obj)
+		$crate::util::macro_logger::DebugSpendable(&$obj)
 	}
 }
 
@@ -155,7 +148,7 @@ macro_rules! log_spendable {
 #[macro_export]
 macro_rules! log_internal {
 	($logger: expr, $lvl:expr, $($arg:tt)+) => (
-		$logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()))
+		$logger.log($crate::util::logger::Record::new($lvl, None, None, format_args!($($arg)+), module_path!(), file!(), line!()))
 	);
 }
 
@@ -166,17 +159,17 @@ macro_rules! log_given_level {
 	($logger: expr, $lvl:expr, $($arg:tt)+) => (
 		match $lvl {
 			#[cfg(not(any(feature = "max_level_off")))]
-			$crate::util::logger::Level::Error => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Error => $crate::log_internal!($logger, $lvl, $($arg)*),
 			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error")))]
-			$crate::util::logger::Level::Warn => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Warn => $crate::log_internal!($logger, $lvl, $($arg)*),
 			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn")))]
-			$crate::util::logger::Level::Info => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Info => $crate::log_internal!($logger, $lvl, $($arg)*),
 			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info")))]
-			$crate::util::logger::Level::Debug => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Debug => $crate::log_internal!($logger, $lvl, $($arg)*),
 			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug")))]
-			$crate::util::logger::Level::Trace => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Trace => $crate::log_internal!($logger, $lvl, $($arg)*),
 			#[cfg(not(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace")))]
-			$crate::util::logger::Level::Gossip => log_internal!($logger, $lvl, $($arg)*),
+			$crate::util::logger::Level::Gossip => $crate::log_internal!($logger, $lvl, $($arg)*),
 
 			#[cfg(any(feature = "max_level_off", feature = "max_level_error", feature = "max_level_warn", feature = "max_level_info", feature = "max_level_debug", feature = "max_level_trace"))]
 			_ => {
@@ -190,7 +183,7 @@ macro_rules! log_given_level {
 #[macro_export]
 macro_rules! log_error {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Error, $($arg)*);
 	)
 }
 
@@ -198,7 +191,7 @@ macro_rules! log_error {
 #[macro_export]
 macro_rules! log_warn {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Warn, $($arg)*);
 	)
 }
 
@@ -206,7 +199,7 @@ macro_rules! log_warn {
 #[macro_export]
 macro_rules! log_info {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Info, $($arg)*);
 	)
 }
 
@@ -214,7 +207,7 @@ macro_rules! log_info {
 #[macro_export]
 macro_rules! log_debug {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Debug, $($arg)*);
 	)
 }
 
@@ -222,7 +215,7 @@ macro_rules! log_debug {
 #[macro_export]
 macro_rules! log_trace {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Trace, $($arg)*)
 	)
 }
 
@@ -230,6 +223,6 @@ macro_rules! log_trace {
 #[macro_export]
 macro_rules! log_gossip {
 	($logger: expr, $($arg:tt)*) => (
-		log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
+		$crate::log_given_level!($logger, $crate::util::logger::Level::Gossip, $($arg)*);
 	)
 }