Skip to content

Follow-ups for #3979 #4028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkczyz merged 2 commits into from
Aug 26, 2025
Merged

Follow-ups for #3979 #4028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fa6e3c
Fix debug_assert on our_funding_contribution
jkczyz Aug 25, 2025
8213f65
Include fees in SpliceContribution docs
jkczyz Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lightning/src/ln/channel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11019,7 +11019,7 @@ where
};

let our_funding_contribution = funding_negotiation_context.our_funding_contribution;
debug_assert!(our_funding_contribution <= SignedAmount::MAX_MONEY);
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)?;
Expand Down
6 changes: 3 additions & 3 deletions lightning/src/ln/funding.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ pub enum SpliceContribution {
/// The amount to contribute to the splice.
value: Amount,

/// The inputs included in the splice's funding transaction to meet the contributed amount.
/// Any excess amount will be sent to a change output.
/// The inputs included in the splice's funding transaction to meet the contributed amount
/// plus fees. Any excess amount will be sent to a change output.
inputs: Vec<FundingTxInput>,

/// An optional change output script. This will be used if needed or, when not set,
Expand All @@ -35,7 +35,7 @@ pub enum SpliceContribution {
/// When funds are removed from a channel.
SpliceOut {
/// The outputs to include in the splice's funding transaction. The total value of all
/// outputs will be the amount that is removed.
/// outputs plus fees will be the amount that is removed.
outputs: Vec<TxOut>,
},
}
Expand Down
Loading