[KILO]: DynComms Prefactor: Refactor/evaluate htlc view #9097
+579
−1,094
Conversation
This file contains 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
ProofOfKeags
added
refactoring
dynamic commitments
size/kilo
|
Important Review skippedAuto reviews are limited to specific labels. 🏷️ Labels to auto review (1)
Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
ProofOfKeags
force-pushed
the
refactor/evaluate-htlc-view
branch
from
1a3d207
to
2eb03bb
Compare
carlaKC
reviewed
Sep 17, 2024
8 tasks
|
@yyforyongyu: review reminder |
ProofOfKeags
force-pushed
the
refactor/evaluate-htlc-view
branch
from
2eb03bb
to
96dcf2d
Compare
ProofOfKeags
changed the title
This was referenced Oct 2, 2024
The purpose of this commit is to begin the process of packing symmetric fields into the newly introduced Dual structure. The reason for this is that the Dual structure has a handy indexing method where we can supply a ChannelParty and get back a value. This will cut down on the amount of branching code in the main lines of the codebase logic, making it easier to follow what is going on.
This commit begins the process of moving towards a more principled means of state tracking. We eliminate the mutateState argument from processAddEntry and processRemoveEntry and move the responsibility of mutating said state to the call-sites. The current call-sites of these functions still have their *own* mutateState argument which will be eliminated during upcoming commits. However, following the principle of micro-commits I opted to break these changes up to make review simpler.
This commit redoes the API and semantics of processFeeUpdate to make it consistent with the semantics of it's sister functions. This is part of an ongoing series of commits to remove mutateState arguments pervasively from the codebase. As with the previous commit this makes state mutation the caller's responsibility. This temporarily increases code duplication at the call-sites, but this will unlock other refactor opportunities.
In this commit we observe that the previous commit reduced the role of this function to a single assignment statement with numerous newly irrelevant parameters. This commit makes the choice of inlining it at the two call-sites within evaluateHTLCView and removing the funciton definition entirely. This also allows us to drop a huge portion of newly irrelevant test code.
This commit makes the observation that the nextHeight parameter of these two functions is no longer used by those funcitons themselves as a result of extracting the state mutation to the call-sites. This removes the parameter entirely.
In line with previous commits we are progressively removing the mutateState argument from this call stack for a more principled software design approach. NOTE FOR REVIEWERS: We take a naive approach to updating the tests here and simply take the functionality we are removing from evaluateHTLCView and run it directly after the function in the test suite. It's possible that we should instead remove this from the test suite altogether but I opted to take a more conservative approach with respect to reducing the scope of tests. If you have opinions here, please make them known.
This commit removes another raw boolean value and replaces it with a more clear type/name. This will also assist us when we later try and consolidate the logic of evaluateHTLCView into a single coherent computation.
This commit moves the collection of updates behind a Dual structure. This allows us in a later commit to index into it via a ChannelParty parameter which will simplify the loops in evaluateHTLCView.
ProofOfKeags
force-pushed
the
refactor/evaluate-htlc-view
branch
from
96dcf2d
to
238720a
Compare
This commit simplifies how we compute the commitment fee rate based off of the live updates. Prior to this commit we processed all of the FeeUpdate paymentDescriptors of both ChannelParty's. Now we only process the last FeeUpdate of the OpeningParty
We had four for-loops in evaluateHTLCView that were exact mirror images of each other. By making use of the new ChannelParty and Dual facilities introduced in prior commits, we consolidate these into two for-loops.
This further reduces loop complexity in evaluateHTLCView by using explicit filter steps rather than loop continue statements.
This commit observes that processAddEntry and processRemoveEntry are only invoked at a single call-site. Here we inline them at their call-sites, which will unlock further simplifications of the code that will allow us to remove pointer mutations in favor of explicit expression oriented programming. We also delete the tests associated with these functions, the overall functionality is implicitly tested by the TestEvaluateHTLCView tests.
Here we return the balance deltas from evaluateHTLCView rather than passing in references to variables that will be modified. It is a far cleaner and compositional approach which allows readers of this code to more effectively reason about the code without having to keep the whole codebase in their head.
ProofOfKeags
force-pushed
the
refactor/evaluate-htlc-view
branch
from
238720a
to
d2e2ef6
Compare
carlaKC
reviewed
Oct 8, 2024
| @@ -4873,7 +4864,9 @@ func genHtlcSigValidationJobs(chanState *channeldb.OpenChannel, | |||
| ) | |||
| } | |||
|
|
|||
| hashCache := input.NewTxSigHashesV0Only(successTx) | |||
| hashCache := | |||
There was a problem hiding this comment.
Unrelated change?
If the linter requires the change to pass, should follow wrapping convention.
lnwallet/channel.go
Outdated
| return | ||
| } | ||
| theirBalance *lnwire.MilliSatoshi, _ uint64, | ||
| _ lntypes.ChannelParty, isIncoming bool) { |
There was a problem hiding this comment.
can remove unused uint64 and lntypes.ChannelParty parameters rather than keeping them with _? Same applies for processFeeUpdate later on.
| // corresponding to whoseCommitmentChain. | ||
| isUncommitted := func(update *paymentDescriptor) bool { | ||
| switch update.EntryType { | ||
| case Add: |
There was a problem hiding this comment.
Just looking for a sanity check on my understanding here, nothing actionable:
- Previously we would only mutate entries with zero add height that are not in
skipUs/skipThemmaps. - This change reduces the check to only look at add height.
This is okay because:
- An
Addentry is only inskipUs/skipThemif a settle/fail entry exits for them in the other party's log. - We can't have an
Addwith zero add height in theskiplist, because the add MUST be irrevocably committed before we try to resolve it
| ) | ||
| if err != nil { | ||
| return 0, 0, 0, nil, err | ||
| } | ||
| if updateState { |
There was a problem hiding this comment.
I'd suggest pulling all of the code in this if out into a LightningChannel.applyStateUpdate method that's called here and in the test (tried in this patch and it's a minor lift).
We can leave a comment in the test that they used to be one function, and that the coverage should (eventually) be migrated to computeView if it's not already covered.
| // If we're settling an inbound HTLC, and it hasn't been | ||
| // processed yet, then increment our state tracking the total | ||
| // number of satoshis we've received within the channel. | ||
| if mutateState && entry.EntryType == Settle && |
There was a problem hiding this comment.
Comment on 2920 is outdated now that the mutation has been purged 🔪
| // TestProcessAddRemoveEntry tests the updating of our and their balances when | ||
| // we process adds, settles and fails. It also tests the mutating of add and | ||
| // remove heights. | ||
| func TestProcessAddRemoveEntry(t *testing.T) { |
There was a problem hiding this comment.
CI failing rn, but I would like to sanity check coveralls to make sure we're not losing any coverage before merge.
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.
Change Description
This is the next logical chunk extracted off the front of #8755. This is a pure refactor change. The core behavior of the code modified should be identical.
Steps to Test
make unit
Pull Request Checklist
Testing
Code Style and Documentation
[skip ci]in the commit message for small changes.📝 Please see our Contribution Guidelines for further guidance.