From: Antoine Riard <ariard@student.42.fr>
Date: Sun, 30 Dec 2018 19:21:58 +0000 (-0500)
Subject: Log resolution of offered HTLC by HTLC-timeout tx
X-Git-Tag: v0.0.12~249^2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=cb53ae76f36f4540474691ec6fecff04318a2b18;p=rust-lightning

Log resolution of offered HTLC by HTLC-timeout tx
---

diff --git a/src/ln/channelmonitor.rs b/src/ln/channelmonitor.rs
index 5415fefec..4ebeba047 100644
--- a/src/ln/channelmonitor.rs
+++ b/src/ln/channelmonitor.rs
@@ -1815,9 +1815,12 @@ impl ChannelMonitor {
 					}
 					if payment_data.is_none() {
 						for htlc_output in $htlc_outputs {
-							if input.previous_output.vout == htlc_output.transaction_output_index {
+							if input.previous_output.vout == htlc_output.transaction_output_index && !htlc_output.offered {
 								log_info!(self, "Input spending {}:{} in {} resolves inbound HTLC with timeout from {}", input.previous_output.txid, input.previous_output.vout, tx.txid(), $source);
 								continue 'outer_loop;
+							} else if input.previous_output.vout == htlc_output.transaction_output_index && tx.lock_time > 0 {
+								log_info!(self, "Input spending {}:{} in {} resolves offered HTLC with HTLC-timeout from {}", input.previous_output.txid, input.previous_output.vout, tx.txid(), $source);
+								continue 'outer_loop;
 							}
 						}
 					}