Skip to content

Commit 8a5d821

Browse files
committed
f add splicing check in funding_transaction_signed
1 parent 2262f33 commit 8a5d821

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

lightning/src/ln/channel.rs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7649,7 +7649,20 @@ where
76497649
.provide_holder_witnesses(self.context.channel_id, witnesses)
76507650
.map_err(|err| APIError::APIMisuseError { err })?
76517651
{
7652-
if self.is_awaiting_initial_mon_persist() {
7652+
#[cfg(splicing)]
7653+
let is_monitor_update_in_progress = self.is_awaiting_initial_mon_persist()
7654+
|| self
7655+
.pending_splice
7656+
.as_ref()
7657+
.and_then(|pending_splice| Some(pending_splice.funding.is_some()))
7658+
.unwrap_or(false) && self
7659+
.context
7660+
.channel_state
7661+
.is_monitor_update_in_progress();
7662+
#[cfg(not(splicing))]
7663+
let is_monitor_update_in_progress = self.is_awaiting_initial_mon_persist();
7664+
7665+
if is_monitor_update_in_progress {
76537666
log_debug!(logger, "Not sending tx_signatures: a monitor update is in progress. Setting monitor_pending_tx_signatures.");
76547667
self.context.monitor_pending_tx_signatures = Some(holder_tx_signatures);
76557668
return Ok(None);

0 commit comments

Comments
 (0)