X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Fchannelmonitor.rs;h=4ebeba047585c109fe665fed1a6e6f68fe3c3b10;hb=cb53ae76f36f4540474691ec6fecff04318a2b18;hp=9fed550982177f1d7433ddddd4e36cd98b8cd1c2;hpb=8e07259326eb240b3a483db34eb66d7b204397f3;p=rust-lightning

diff --git a/src/ln/channelmonitor.rs b/src/ln/channelmonitor.rs
index 9fed5509..4ebeba04 100644
--- a/src/ln/channelmonitor.rs
+++ b/src/ln/channelmonitor.rs
@@ -568,6 +568,8 @@ impl ChannelMonitor {
 		}
 
 		let new_txid = unsigned_commitment_tx.txid();
+		log_trace!(self, "Tracking new remote commitment transaction with txid {} at commitment number {} with {} HTLC outputs", new_txid, commitment_number, htlc_outputs.len());
+		log_trace!(self, "New potential remote commitment transaction: {}", encode::serialize_hex(unsigned_commitment_tx));
 		if let Storage::Local { ref mut current_remote_commitment_txid, ref mut prev_remote_commitment_txid, .. } = self.key_storage {
 			*prev_remote_commitment_txid = current_remote_commitment_txid.take();
 			*current_remote_commitment_txid = Some(new_txid);
@@ -1246,6 +1248,8 @@ impl ChannelMonitor {
 			watch_outputs.append(&mut tx.output.clone());
 			self.remote_commitment_txn_on_chain.insert(commitment_txid, (commitment_number, tx.output.iter().map(|output| { output.script_pubkey.clone() }).collect()));
 
+			log_trace!(self, "Got broadcast of non-revoked remote commitment transaction {}", commitment_txid);
+
 			if let Some(revocation_points) = self.their_cur_revocation_points {
 				let revocation_point_option =
 					if revocation_points.0 == commitment_number { Some(&revocation_points.1) }
@@ -1811,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;
 							}
 						}
 					}