Skip to content

Commit d55ecf0

Browse files
committed
f add splicing check in funding_transaction_signed
1 parent 894caef commit d55ecf0

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
@@ -7604,7 +7604,20 @@ where
76047604
.provide_holder_witnesses(self.context.channel_id, witnesses)
76057605
.map_err(|err| APIError::APIMisuseError { err })?
76067606
{
7607-
if self.is_awaiting_initial_mon_persist() {
7607+
#[cfg(splicing)]
7608+
let is_monitor_update_in_progress = self.is_awaiting_initial_mon_persist()
7609+
|| self
7610+
.pending_splice
7611+
.as_ref()
7612+
.and_then(|pending_splice| Some(pending_splice.funding.is_some()))
7613+
.unwrap_or(false) && self
7614+
.context
7615+
.channel_state
7616+
.is_monitor_update_in_progress();
7617+
#[cfg(not(splicing))]
7618+
let is_monitor_update_in_progress = self.is_awaiting_initial_mon_persist();
7619+
7620+
if is_monitor_update_in_progress {
76087621
log_debug!(logger, "Not sending tx_signatures: a monitor update is in progress. Setting monitor_pending_tx_signatures.");
76097622
self.context.monitor_pending_tx_signatures = Some(holder_tx_signatures);
76107623
return Ok(None);

0 commit comments

Comments
 (0)