Skip to content

Commit 5b2cd64

Browse files
jkczyzclaude
andcommitted
Emit SpliceFailed event when funded channels shut down with active splice negotiations
Adds SpliceFailed event emission immediately after ChannelClosed events when a FundedChannel is shut down while having an active splice negotiation. This ensures users are notified when splice operations are terminated due to channel closure. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 4a19bfb commit 5b2cd64

File tree

2 files changed

+63
-1
lines changed

2 files changed

+63
-1
lines changed

lightning/src/ln/channel.rs

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,6 +1188,9 @@ pub(crate) struct ShutdownResult {
11881188
pub(crate) unbroadcasted_funding_tx: Option<Transaction>,
11891189
pub(crate) channel_funding_txo: Option<OutPoint>,
11901190
pub(crate) last_local_balance_msat: u64,
1191+
/// If a splice was in progress when the channel was shut down, this contains
1192+
/// the splice funding information for emitting a SpliceFailed event.
1193+
pub(crate) splice_funding_failed: Option<SpliceFundingFailed>,
11911194
}
11921195

11931196
/// Tracks the transaction number, along with current and next commitment points.
@@ -2664,6 +2667,15 @@ pub(crate) struct SpliceInstructions {
26642667
locktime: u32,
26652668
}
26662669

2670+
impl SpliceInstructions {
2671+
fn into_contributed_inputs_and_outputs(self) -> (Vec<bitcoin::OutPoint>, Vec<TxOut>) {
2672+
(
2673+
self.our_funding_inputs.into_iter().map(|input| input.utxo.outpoint).collect(),
2674+
self.our_funding_outputs,
2675+
)
2676+
}
2677+
}
2678+
26672679
impl_writeable_tlv_based!(SpliceInstructions, {
26682680
(1, adjusted_funding_contribution, required),
26692681
(3, our_funding_inputs, required_vec),
@@ -6018,6 +6030,7 @@ where
60186030
is_manual_broadcast: self.is_manual_broadcast,
60196031
channel_funding_txo: funding.get_funding_txo(),
60206032
last_local_balance_msat: funding.value_to_self_msat,
6033+
splice_funding_failed: None,
60216034
}
60226035
}
60236036

@@ -6787,7 +6800,42 @@ where
67876800
}
67886801

67896802
pub fn force_shutdown(&mut self, closure_reason: ClosureReason) -> ShutdownResult {
6790-
self.context.force_shutdown(&self.funding, closure_reason)
6803+
let splice_funding_failed = self
6804+
.pending_splice
6805+
.as_mut()
6806+
.and_then(|pending_splice| pending_splice.funding_negotiation.take())
6807+
.filter(|funding_negotiation| funding_negotiation.is_initiator())
6808+
.map(|_funding_negotiation| {
6809+
// FIXME: Populte after #4120 is merged
6810+
SpliceFundingFailed {
6811+
funding_txo: todo!(),
6812+
channel_type: todo!(),
6813+
contributed_inputs: todo!(),
6814+
contributed_outputs: todo!(),
6815+
}
6816+
})
6817+
.or_else(|| {
6818+
self.quiescent_action.take().and_then(|quiescent_action| match quiescent_action {
6819+
QuiescentAction::Splice(instructions) => {
6820+
let (inputs, outputs) = instructions.into_contributed_inputs_and_outputs();
6821+
Some(SpliceFundingFailed {
6822+
funding_txo: None,
6823+
channel_type: None,
6824+
contributed_inputs: inputs,
6825+
contributed_outputs: outputs,
6826+
})
6827+
},
6828+
#[cfg(any(test, fuzzing))]
6829+
_ => {
6830+
self.quiescent_action = Some(quiescent_action);
6831+
None
6832+
},
6833+
})
6834+
});
6835+
6836+
let mut shutdown_result = self.context.force_shutdown(&self.funding, closure_reason);
6837+
shutdown_result.splice_funding_failed = splice_funding_failed;
6838+
shutdown_result
67916839
}
67926840

67936841
fn interactive_tx_constructor_mut(&mut self) -> Option<&mut InteractiveTxConstructor> {
@@ -10222,6 +10270,7 @@ where
1022210270
is_manual_broadcast: self.context.is_manual_broadcast,
1022310271
channel_funding_txo: self.funding.get_funding_txo(),
1022410272
last_local_balance_msat: self.funding.value_to_self_msat,
10273+
splice_funding_failed: None,
1022510274
}
1022610275
}
1022710276

lightning/src/ln/channelmanager.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4509,6 +4509,19 @@ where
45094509
last_local_balance_msat: Some(shutdown_res.last_local_balance_msat),
45104510
}, None));
45114511

4512+
// Emit SpliceFailed event immediately after ChannelClosed if there was an active splice negotiation
4513+
if let Some(splice_funding_failed) = shutdown_res.splice_funding_failed.take() {
4514+
pending_events.push_back((events::Event::SpliceFailed {
4515+
channel_id: shutdown_res.channel_id,
4516+
counterparty_node_id: shutdown_res.counterparty_node_id,
4517+
user_channel_id: shutdown_res.user_channel_id,
4518+
funding_txo: splice_funding_failed.funding_txo,
4519+
channel_type: splice_funding_failed.channel_type,
4520+
contributed_inputs: splice_funding_failed.contributed_inputs,
4521+
contributed_outputs: splice_funding_failed.contributed_outputs,
4522+
}, None));
4523+
}
4524+
45124525
if let Some(transaction) = shutdown_res.unbroadcasted_funding_tx {
45134526
let funding_info = if shutdown_res.is_manual_broadcast {
45144527
FundingInfo::OutPoint {

0 commit comments

Comments
 (0)