f incl always even on resolution

Author: TheBlueMatt

lightning/src/chain/channelmonitor.rs

@@ -1900,9 +1900,10 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitor<Signer> {
 								Some(commitment_tx_output_idx) == htlc.transaction_output_index
 							} else { false }
 						});
-						if !htlc_update_confd {
-							res.insert(source.clone(), (htlc.clone(),
-								us.counterparty_fulfilled_htlcs.get(&SentHTLCId::from_source(source)).cloned()));
+						let counterparty_resolved_preimage_opt =
+							us.counterparty_fulfilled_htlcs.get(&SentHTLCId::from_source(source)).cloned();
+						if !htlc_update_confd || counterparty_resolved_preimage_opt.is_some() {
+							res.insert(source.clone(), (htlc.clone(), counterparty_resolved_preimage_opt));
 						}
 					}
 				}