Skip to content

Commit a285743

Browse files
committed
f add splicing check in funding_transaction_signed
1 parent 3ec11de commit a285743

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
@@ -7736,7 +7736,20 @@ where
77367736
.provide_holder_witnesses(self.context.channel_id, witnesses)
77377737
.map_err(|err| APIError::APIMisuseError { err })?
77387738
{
7739-
if self.is_awaiting_initial_mon_persist() {
7739+
#[cfg(splicing)]
7740+
let is_monitor_update_in_progress = self.is_awaiting_initial_mon_persist()
7741+
|| self
7742+
.pending_splice
7743+
.as_ref()
7744+
.and_then(|pending_splice| Some(pending_splice.funding.is_some()))
7745+
.unwrap_or(false) && self
7746+
.context
7747+
.channel_state
7748+
.is_monitor_update_in_progress();
7749+
#[cfg(not(splicing))]
7750+
let is_monitor_update_in_progress = self.is_awaiting_initial_mon_persist();
7751+
7752+
if is_monitor_update_in_progress {
77407753
log_debug!(logger, "Not sending tx_signatures: a monitor update is in progress. Setting monitor_pending_tx_signatures.");
77417754
self.context.monitor_pending_tx_signatures = Some(holder_tx_signatures);
77427755
return Ok(None);

0 commit comments

Comments
 (0)