Defer claimable tracking until manual funding is seen

Author: martinsaposnic

lightning/src/chain/channelmonitor.rs

@@ -5497,8 +5497,10 @@ impl<Signer: EcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 		if should_broadcast_commitment {
 			let (mut claimables, mut outputs) =
 				self.generate_claimable_outpoints_and_watch_outputs(None);
-			claimable_outpoints.append(&mut claimables);
-			watch_outputs.append(&mut outputs);
+			if !self.is_manual_broadcast || self.funding_seen_onchain {
+				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)
@@ -5537,8 +5539,10 @@ 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));
-			claimable_outpoints.append(&mut new_outpoints);
-			watch_outputs.append(&mut new_outputs);
+			if !self.is_manual_broadcast || self.funding_seen_onchain {
+				claimable_outpoints.append(&mut new_outpoints);
+				watch_outputs.append(&mut new_outputs);
+			}
 		}
 
 		// Find which on-chain events have reached their confirmation threshold.