Filter claims from get_onchain_failed_htlcs return value

This isn't a bug at the moment because a claim in this situation would already
be filtered out due to its inclusion in htlcs_resolved_to_user. However, when
we stop issuing ReleasePaymentComplete monitor updates for claims in upcoming
commits, HTLC claims will no longer be in htlcs_resolved_to_user when
get_onchain_failed_htlcs checks.

Author: valentinewallace

lightning/src/chain/channelmonitor.rs

@@ -3318,7 +3318,11 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitor<Signer> {
 							// The HTLC was not included in the confirmed commitment transaction,
 							// which has now reached ANTI_REORG_DELAY confirmations and thus the
 							// HTLC has been failed.
-							res.insert(source.clone(), candidate_htlc.payment_hash);
+							// However, if we have the preimage, the HTLC was fulfilled off-chain
+							// and should not be reported as failed.
+							if !us.counterparty_fulfilled_htlcs.contains_key(&htlc_id) {
+								res.insert(source.clone(), candidate_htlc.payment_hash);
+							}
 						}
 					}
 				};