use secp256k1::key::PublicKey;
use ln::router::Route;
+use ln::chan_utils::HTLCType;
use std;
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 &&
+ } 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 &&
- (self.0.input[0].witness.last().unwrap().len() == 138 || self.0.input[0].witness.last().unwrap().len() == 139) &&
+ } 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 inp.witness.last().unwrap().len() == 133 { write!(f, "preimage-")?; break }
- else if inp.witness.last().unwrap().len() == 138 { write!(f, "timeout-")?; break }
+ 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")?;