← Watch feed
Add `validate_splice_ack` helper function
Public commit record
58/100 · Thin
What the developer wrote
Authored by Leo Nash
Add `validate_splice_ack` helper function
As in `splice_init`, this helps clearly delineate `splice_ack` message
validation from the subsequent state mutations.
This is a code-move.
✓ Descriptive subject✓ Provides detailed explanatory context
What changed, and why it matters
This commit is a pure code reorganization: it moves the validation logic for a 'splice_ack' message into a new helper function called validate_splice_ack, then makes the existing splice_ack handler call that helper. No behavior changes, no new checks, no security fixes, and no new vulnerabilities are introduced.
Recommended action
No security action needed. Treat as a normal code-cleanliness refactor.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The diff extracts the inline validation block from Channel::splice_ack into a new private method validate_splice_ack. The extracted code performs the same pending_splice state checks, funding contribution validation, and FundingScope::for_splice construction as before. The original splice_ack method now simply calls self.validate_splice_ack(msg)?. This is a refactor with identical logic and identical error paths.
Changed components
lightning/src/ln/channel.rssplice_ack handlingsplicing feature (gated by #[cfg(splicing)])Inspect captured patch +46 / −40
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 732eedd..0dbbf6a 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -11364,7 +11364,6 @@ where
Ok(())
}
- /// See also [`validate_splice_init`]
#[cfg(splicing)]
pub(crate) fn splice_init<ES: Deref, L: Deref>(
&mut self, msg: &msgs::SpliceInit, our_funding_contribution_satoshis: i64,
@@ -11441,7 +11440,6 @@ where
})
}
- /// Handle splice_ack
#[cfg(splicing)]
pub(crate) fn splice_ack<ES: Deref, L: Deref>(
&mut self, msg: &msgs::SpliceAck, signer_provider: &SP, entropy_source: &ES,
@@ -11451,44 +11449,7 @@ where
ES::Target: EntropySource,
L::Target: Logger,
{
- // TODO(splicing): Add check that we are the splice (quiescence) initiator
-
- let funding_negotiation_context = match &self
- .pending_splice
- .as_ref()
- .ok_or(ChannelError::Ignore(format!("Channel is not in pending splice")))?
- .funding_negotiation
- {
- Some(FundingNegotiation::AwaitingAck(context)) => context,
- Some(FundingNegotiation::ConstructingTransaction(_, _))
- | Some(FundingNegotiation::AwaitingSignatures(_)) => {
- return Err(ChannelError::WarnAndDisconnect(format!(
- "Got unexpected splice_ack; splice negotiation already in progress"
- )));
- },
- None => {
- return Err(ChannelError::Ignore(format!(
- "Got unexpected splice_ack; no splice negotiation in progress"
- )));
- },
- };
-
- let our_funding_contribution = funding_negotiation_context.our_funding_contribution;
- debug_assert!(our_funding_contribution.abs() <= SignedAmount::MAX_MONEY);
-
- let their_funding_contribution = SignedAmount::from_sat(msg.funding_contribution_satoshis);
- self.validate_splice_contribution(their_funding_contribution)?;
-
- let splice_funding = FundingScope::for_splice(
- &self.funding,
- &self.context,
- our_funding_contribution,
- their_funding_contribution,
- msg.funding_pubkey,
- )?;
-
- // TODO(splicing): Pre-check for reserve requirement
- // (Note: It should also be checked later at tx_complete)
+ let splice_funding = self.validate_splice_ack(msg)?;
log_info!(
logger,
@@ -11535,6 +11496,51 @@ where
Ok(tx_msg_opt)
}
+ /// Checks during handling splice_ack
+ #[cfg(splicing)]
+ fn validate_splice_ack(&self, msg: &msgs::SpliceAck) -> Result<FundingScope, ChannelError> {
+ // TODO(splicing): Add check that we are the splice (quiescence) initiator
+
+ let funding_negotiation_context = match &self
+ .pending_splice
+ .as_ref()
+ .ok_or(ChannelError::Ignore(format!("Channel is not in pending splice")))?
+ .funding_negotiation
+ {
+ Some(FundingNegotiation::AwaitingAck(context)) => context,
+ Some(FundingNegotiation::ConstructingTransaction(_, _))
+ | Some(FundingNegotiation::AwaitingSignatures(_)) => {
+ return Err(ChannelError::WarnAndDisconnect(format!(
+ "Got unexpected splice_ack; splice negotiation already in progress"
+ )));
+ },
+ None => {
+ return Err(ChannelError::Ignore(format!(
+ "Got unexpected splice_ack; no splice negotiation in progress"
+ )));
+ },
+ };
+
+ let our_funding_contribution = funding_negotiation_context.our_funding_contribution;
+ debug_assert!(our_funding_contribution.abs() <= SignedAmount::MAX_MONEY);
+
+ let their_funding_contribution = SignedAmount::from_sat(msg.funding_contribution_satoshis);
+ self.validate_splice_contribution(their_funding_contribution)?;
+
+ let splice_funding = FundingScope::for_splice(
+ &self.funding,
+ &self.context,
+ our_funding_contribution,
+ their_funding_contribution,
+ msg.funding_pubkey,
+ )?;
+
+ // TODO(splicing): Pre-check for reserve requirement
+ // (Note: It should also be checked later at tx_complete)
+
+ Ok(splice_funding)
+ }
+
#[cfg(splicing)]
pub fn splice_locked<NS: Deref, L: Deref>(
&mut self, msg: &msgs::SpliceLocked, node_signer: &NS, chain_hash: ChainHash,
Risk score
Our methodology →Why this scored 15/100
Human-validated context
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
No validated notes yet.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.