Extract preimage from revoked HTLC-Success to claim backward

Remove log_claim

Author: Antoine Riard

src/ln/channelmonitor.rs

@@ -1870,23 +1870,17 @@ impl ChannelMonitor {
 			let accepted_preimage_claim = input.witness.len() == 5 && input.witness[4].len() == ACCEPTED_HTLC_SCRIPT_WEIGHT;
 			let offered_preimage_claim = input.witness.len() == 3 && input.witness[2].len() == OFFERED_HTLC_SCRIPT_WEIGHT;
 
-			macro_rules! log_claim {
-				($tx_info: expr, $local_tx: expr, $htlc: expr, $source_avail: expr) => {
-					// We found the output in question, but aren't failing it backwards
-					// as we have no corresponding source. This implies either it is an
-					// inbound HTLC or an outbound HTLC on a revoked transaction.
-					let outbound_htlc = $local_tx == $htlc.offered;
-					if ($local_tx && revocation_sig_claim) ||
-							(outbound_htlc && !$source_avail && (accepted_preimage_claim || offered_preimage_claim)) {
-						log_error!(self, "Input spending {} ({}:{}) in {} resolves {} HTLC with payment hash {} with {}!",
-							$tx_info, input.previous_output.txid, input.previous_output.vout, tx.txid(),
-							if outbound_htlc { "outbound" } else { "inbound" }, log_bytes!($htlc.payment_hash.0),
-							if revocation_sig_claim { "revocation sig" } else { "preimage claim after we'd passed the HTLC resolution back" });
-					} else {
-						log_info!(self, "Input spending {} ({}:{}) in {} resolves {} HTLC with payment hash {} with {}",
-							$tx_info, input.previous_output.txid, input.previous_output.vout, tx.txid(),
-							if outbound_htlc { "outbound" } else { "inbound" }, log_bytes!($htlc.payment_hash.0),
-							if revocation_sig_claim { "revocation sig" } else if accepted_preimage_claim || offered_preimage_claim { "preimage" } else { "timeout" });
+			macro_rules! check_htlc_valid_remote {
+				($remote_txid: expr, $htlc_output: expr) => {
+					if let &Some(txid) = $remote_txid {
+						for &(ref pending_htlc, ref pending_source) in self.remote_claimable_outpoints.get(&txid).unwrap() {
+							if pending_htlc.payment_hash == $htlc_output.payment_hash && pending_htlc.amount_msat == $htlc_output.amount_msat {
+								if let &Some(ref source) = pending_source {
+									payment_data = Some(((**source).clone(), $htlc_output.payment_hash));
+									break;
+								}
+							}
+						}
 					}
 				}
 			}
@@ -1903,9 +1897,12 @@ impl ChannelMonitor {
 								// has timed out, or we screwed up. In any case, we should now
 								// resolve the source HTLC with the original sender.
 								payment_data = Some(((*source).clone(), htlc_output.payment_hash));
-							} else {
-								log_claim!($tx_info, $local_tx, htlc_output, false);
-								continue 'outer_loop;
+							} else if !$local_tx {
+								if let Storage::Local { ref current_remote_commitment_txid, .. } = self.key_storage {
+									check_htlc_valid_remote!(current_remote_commitment_txid, htlc_output);
+								} else if let Storage::Local { ref prev_remote_commitment_txid, .. } = self.key_storage {
+									check_htlc_valid_remote!(prev_remote_commitment_txid, htlc_output);
+								}
 							}
 						}
 					}