fixup: move manual broadcast check into generate_claimable_outpoints_and_watch_outputs

Author: martinsaposnic

lightning/src/chain/channelmonitor.rs

@@ -3930,6 +3930,12 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 	fn generate_claimable_outpoints_and_watch_outputs(
 		&mut self, generate_monitor_event_with_reason: Option<ClosureReason>,
 	) -> (Vec<PackageTemplate>, Vec<TransactionOutputs>) {
+		// In manual-broadcast mode, if we have not yet observed the funding transaction on-chain,
+		// return empty vectors.
+		if self.is_manual_broadcast && !self.funding_seen_onchain {
+			return (Vec::new(), Vec::new());
+		}
+
 		let funding = get_confirmed_funding_scope!(self);
 		let holder_commitment_tx = &funding.current_holder_commitment_tx;
 		let funding_outp = HolderFundingOutput::build(
@@ -4005,9 +4011,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 			message: "ChannelMonitor-initiated commitment transaction broadcast".to_owned(),
 		};
 		let (claimable_outpoints, _) = self.generate_claimable_outpoints_and_watch_outputs(Some(reason));
-		// In manual-broadcast mode, if `require_funding_seen` is true and we have not yet observed
-		// the funding transaction on-chain, do not queue any transactions.
-		if require_funding_seen && self.is_manual_broadcast && !self.funding_seen_onchain {
+		// In manual-broadcast mode with `require_funding_seen` set, if we have not yet observed
+		// the funding transaction on-chain, `generate_claimable_outpoints_and_watch_outputs` will
+		// return empty vectors and we won't queue any transactions.
+		if require_funding_seen && claimable_outpoints.is_empty() {
 			log_info!(logger, "Not broadcasting holder commitment for manual-broadcast channel before funding appears on-chain");
 			return;
 		}
@@ -5600,10 +5607,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		if should_broadcast_commitment {
 			let (mut claimables, mut outputs) =
 				self.generate_claimable_outpoints_and_watch_outputs(None);
-			if !self.is_manual_broadcast || self.funding_seen_onchain {
-				claimable_outpoints.append(&mut claimables);
-				watch_outputs.append(&mut outputs);
-			}
+			claimable_outpoints.append(&mut claimables);
+			watch_outputs.append(&mut outputs);
 		}
 
 		self.block_confirmed(height, block_hash, txn_matched, watch_outputs, claimable_outpoints, &broadcaster, &fee_estimator, logger)
@@ -5644,10 +5649,8 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 				let reason = ClosureReason::HTLCsTimedOut { payment_hash: Some(payment_hash) };
 				let (mut new_outpoints, mut new_outputs) =
 					self.generate_claimable_outpoints_and_watch_outputs(Some(reason));
-				if !self.is_manual_broadcast || self.funding_seen_onchain {
-					claimable_outpoints.append(&mut new_outpoints);
-					watch_outputs.append(&mut new_outputs);
-				}
+				claimable_outpoints.append(&mut new_outpoints);
+				watch_outputs.append(&mut new_outputs);
 			}
 		}