use chain::transaction::OutPoint;
+use chain::keysinterface::SpendableOutputDescriptor;
-use bitcoin_hashes::sha256d::Hash as Sha256dHash;
+use bitcoin::hash_types::Txid;
use bitcoin::blockdata::transaction::Transaction;
-use secp256k1::key::PublicKey;
+use bitcoin::secp256k1::key::PublicKey;
-use ln::router::Route;
+use routing::router::Route;
+use ln::chan_utils::HTLCType;
use std;
}
}
-pub(crate) struct DebugFundingChannelId<'a>(pub &'a Sha256dHash, pub u16);
+pub(crate) struct DebugFundingChannelId<'a>(pub &'a Txid, pub u16);
impl<'a> std::fmt::Display for DebugFundingChannelId<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
for i in OutPoint::new(self.0.clone(), self.1).to_channel_id().iter() {
}
}
-pub(crate) struct DebugFundingInfo<'a, T: 'a>(pub &'a Option<(OutPoint, T)>);
+pub(crate) struct DebugFundingInfo<'a, T: 'a>(pub &'a (OutPoint, T));
impl<'a, T> std::fmt::Display for DebugFundingInfo<'a, T> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
- match self.0.as_ref() {
- Some(&(ref funding_output, _)) => DebugBytes(&funding_output.to_channel_id()[..]).fmt(f),
- None => write!(f, "without funding output set"),
- }
+ DebugBytes(&(self.0).0.to_channel_id()[..]).fmt(f)
}
}
macro_rules! log_funding_info {
($key_storage: expr) => {
- match $key_storage {
- Storage::Local { ref funding_info, .. } => {
- ::util::macro_logger::DebugFundingInfo(&funding_info)
- },
- Storage::Watchtower { .. } => {
- ::util::macro_logger::DebugFundingInfo(&None)
- }
- }
+ ::util::macro_logger::DebugFundingInfo(&$key_storage.funding_info)
}
}
pub(crate) struct DebugRoute<'a>(pub &'a Route);
impl<'a> std::fmt::Display for DebugRoute<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
- for h in self.0.hops.iter() {
- write!(f, "node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}\n", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?;
+ for (idx, p) in self.0.paths.iter().enumerate() {
+ write!(f, "path {}:\n", idx)?;
+ for h in p.iter() {
+ write!(f, " node_id: {}, short_channel_id: {}, fee_msat: {}, cltv_expiry_delta: {}\n", log_pubkey!(h.pubkey), h.short_channel_id, h.fee_msat, h.cltv_expiry_delta)?;
+ }
}
Ok(())
}
pub(crate) struct DebugTx<'a>(pub &'a Transaction);
impl<'a> std::fmt::Display for DebugTx<'a> {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
- 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")?; }
- else if self.0.input.len() == 1 && self.0.input[0].witness.last().unwrap().len() == 71 { write!(f, "closing tx")?; }
- else if self.0.input.len() == 1 && self.0.input[0].witness.last().unwrap().len() == 133 && self.0.input[0].witness.len() == 5 { write!(f, "HTLC-timeout tx")?; }
- else if self.0.input.len() == 1 && (self.0.input[0].witness.last().unwrap().len() == 138 || self.0.input[0].witness.last().unwrap().len() == 139) && self.0.input[0].witness.len() == 5 { write!(f, "HTLC-success tx")?; }
- else {
- for inp in &self.0.input {
- if inp.witness.last().unwrap().len() == 133 { write!(f, "preimage tx")?; break }
- else if inp.witness.last().unwrap().len() == 138 { write!(f, "timeout tx")?; break }
+ 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")?;
+ } else if self.0.input.len() == 1 && self.0.input[0].witness.last().unwrap().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 {
+ 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")?;
+ } 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")?;
}
+ } else {
+ write!(f, "INVALID TRANSACTION")?;
}
Ok(())
}
}
}
+pub(crate) struct DebugSpendable<'a>(pub &'a SpendableOutputDescriptor);
+impl<'a> std::fmt::Display for DebugSpendable<'a> {
+ fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
+ match self.0 {
+ &SpendableOutputDescriptor::StaticOutput { ref outpoint, .. } => {
+ write!(f, "StaticOutput {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
+ }
+ &SpendableOutputDescriptor::DynamicOutputP2WSH { ref outpoint, .. } => {
+ write!(f, "DynamicOutputP2WSH {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
+ }
+ &SpendableOutputDescriptor::DynamicOutputP2WPKH { ref outpoint, .. } => {
+ write!(f, "DynamicOutputP2WPKH {}:{} marked for spending", outpoint.txid, outpoint.vout)?;
+ }
+ }
+ Ok(())
+ }
+}
+
+macro_rules! log_spendable {
+ ($obj: expr) => {
+ ::util::macro_logger::DebugSpendable(&$obj)
+ }
+}
+
macro_rules! log_internal {
($self: ident, $lvl:expr, $($arg:tt)+) => (
&$self.logger.log(&::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
projects / rust-lightning / blobdiff