Refactor PendingSplice
#3911
Open
Refactor PendingSplice
#3911
+168
−151
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FundedChannel::pending_funding is to be moved to PendingSplice. As such, it will be persisted with PendingSplice once persistence is added for the latter.
FundedChannel::pending_funding and FundedChannel::pending_splice were developed independently, but the former will only contain values when the latter is set.
An upcoming commit will rename PendingSplice to PendingFunding. Thus, rename the similarly named field to something more meaningful. It includes FundingScopes that have been negotiated but have not reached enough confirmations by both parties to have exchanged splice_locked.
While PendingSplice is only used for splicing a FundedChannel, it will be useful when supporting RBF for V2 channel establishment.
Now that PendingFunding directly contains the negotiated candidates, some unnecessary checks can be removed.
|
👋 Thanks for assigning @wpaulino as a reviewer! |
dunxen
reviewed
Jul 4, 2025
| @@ -12616,7 +12616,6 @@ where | |||
| (49, self.context.local_initiated_shutdown, option), // Added in 0.0.122 | |||
| (51, is_manual_broadcast, option), // Added in 0.0.124 | |||
| (53, funding_tx_broadcast_safe_event_emitted, option), // Added in 0.0.124 | |||
| (54, self.pending_funding, optional_vec), // Added in 0.2 | |||
There was a problem hiding this comment.
We still have the opportunity to reuse 54 for negotiated_candidates when we persist that, right?
lightning/src/ln/channel.rs
Outdated
| ) -> Option<msgs::SpliceLocked> | ||
| where | ||
| SP::Target: SignerProvider, | ||
| { | ||
| debug_assert!(confirmed_funding_index < self.pending_funding.len()); | ||
|
|
||
| let funding = self.pending_funding.get(confirmed_funding_index).unwrap(); |
There was a problem hiding this comment.
nit: If we're going to unwrap, why not just let funding = &self.pending_funding[confirmed_funding_index]; ?
I guess the explicit unwrap is informative on the other hand.
|
🔔 1st Reminder Hey @wpaulino! This PR has been waiting for your review. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
FundedChannel::pending_fundingandFundedChannel::pending_splicewere developed independently, but the former will only contain values when the latter is set. This PR moves the former intoPendingSpliceand renames it tonegotiated_candidates. It also removes unnecessary checks forFundedChannel::pending_spliceand renamesPendingSplicetoPendingFunding. This allows for usingPendingFundingfor V2 channel establishment in order to support RBF.