f check all monitor update types

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -5350,27 +5350,35 @@ where
 			if let OutboundHTLCState::LocalAnnounced(_) = htlc.state {
 				for update in self.blocked_monitor_updates.iter() {
 					for update in update.update.updates.iter() {
-						match update {
-							ChannelMonitorUpdateStep::LatestCounterpartyCommitmentTXInfo {
-								htlc_outputs,
+						let have_htlc = match update {
+							ChannelMonitorUpdateStep::LatestCounterpartyCommitment {
+								htlc_data,
 								..
 							} => {
-								let have_htlc = htlc_outputs.iter().any(|(_, source)| {
-									source.as_ref().map(|s| &**s) == Some(&htlc.source)
-								});
-								debug_assert!(have_htlc);
-								if have_htlc {
-									dropped_outbound_htlcs.push((
-										htlc.source.clone(),
-										htlc.payment_hash,
-										counterparty_node_id,
-										self.channel_id,
-									));
-								}
-								continue 'htlc_iter;
+								let dust =
+									htlc_data.dust_htlcs.iter().map(|(_, source)| source.as_ref());
+								let nondust =
+									htlc_data.nondust_htlc_sources.iter().map(|s| Some(s));
+								dust.chain(nondust).any(|source| source == Some(&htlc.source))
 							},
-							_ => {},
+							ChannelMonitorUpdateStep::LatestCounterpartyCommitmentTXInfo {
+								htlc_outputs,
+								..
+							} => htlc_outputs.iter().any(|(_, source)| {
+								source.as_ref().map(|s| &**s) == Some(&htlc.source)
+							}),
+							_ => continue,
+						};
+						debug_assert!(have_htlc);
+						if have_htlc {
+							dropped_outbound_htlcs.push((
+								htlc.source.clone(),
+								htlc.payment_hash,
+								counterparty_node_id,
+								self.channel_id,
+							));
 						}
+						continue 'htlc_iter;
 					}
 				}
 			}