f add splicing check in funding_transaction_signed

Author: dunxen

lightning/src/ln/channel.rs

@@ -7796,6 +7796,14 @@ where
 		Ok(())
 	}
 
+	#[cfg(splicing)]
+	fn is_splicing(&self) -> bool {
+		self.pending_splice
+			.as_ref()
+			.and_then(|pending_splice| Some(pending_splice.funding.is_some()))
+			.unwrap_or(false)
+	}
+
 	pub fn funding_transaction_signed<L: Deref>(
 		&mut self, witnesses: Vec<Witness>, logger: &L,
 	) -> Result<Option<msgs::TxSignatures>, APIError>
@@ -7809,7 +7817,14 @@ where
 				.provide_holder_witnesses(self.context.channel_id, witnesses)
 				.map_err(|err| APIError::APIMisuseError { err })?
 			{
-				if self.is_awaiting_initial_mon_persist() {
+				#[cfg(splicing)]
+				let is_monitor_update_in_progress = self.is_awaiting_initial_mon_persist()
+					|| self.is_splicing()
+						&& self.context.channel_state.is_monitor_update_in_progress();
+				#[cfg(not(splicing))]
+				let is_monitor_update_in_progress = self.is_awaiting_initial_mon_persist();
+
+				if is_monitor_update_in_progress {
 					log_debug!(logger, "Not sending tx_signatures: a monitor update is in progress. Setting monitor_pending_tx_signatures.");
 					self.context.monitor_pending_tx_signatures = Some(holder_tx_signatures);
 					return Ok(None);