Skip to content
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.

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

Add ChannelContext::get_commitment_stats #3682

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

tankyleo
Copy link
Contributor

@tankyleo tankyleo commented Mar 24, 2025

    Add `ChannelContext::get_commitment_stats`
    
    It can be useful to get the stats on a potential commitment transaction
    without actually building it. Therefore, this commit splits the stats
    calculations from the actual build of a commitment transaction.
    
    This introduces an extra loop over the pending htlcs, but current
    network behavior produces very few concurrent htlcs on channels.
    Furthermore, each iteration of the loop in the stats calculation is very
    cheap.

Requested by @wpaulino in #3641

    Rename `CommitmentTransaction::htlcs` to `nondust_htlcs`
    Remove unnecessary clones of the HTLC-HTLCSource table

@ldk-reviews-bot
Copy link

ldk-reviews-bot commented Mar 24, 2025

👋 Thanks for assigning @TheBlueMatt as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@tankyleo tankyleo force-pushed the commitment-stats-less-duplication branch 2 times, most recently from 0af1b43 to 31300c3 Compare March 25, 2025 04:01
@tankyleo tankyleo marked this pull request as draft March 25, 2025 04:08
@TheBlueMatt
Copy link
Collaborator

Why is this draft?

@tankyleo
Copy link
Contributor Author

Why is this draft?

@TheBlueMatt I don't feel great about the code duplication between get_commitment_stats and build_commitment_transaction. Both functions filter for the non-dust HTLCs, but they do different things with them.

Let me know what you think.

@tankyleo
Copy link
Contributor Author

I'm working on further cleanups now.

@tankyleo tankyleo force-pushed the commitment-stats-less-duplication branch from d6b1f51 to c540347 Compare March 25, 2025 19:52
@tankyleo tankyleo marked this pull request as ready for review March 25, 2025 19:59
@tankyleo
Copy link
Contributor Author

@wpaulino the PR is in a better spot now, let me know what you think.

@tankyleo tankyleo force-pushed the commitment-stats-less-duplication branch from c540347 to c9b30cb Compare March 26, 2025 00:06
@tankyleo tankyleo requested a review from wpaulino March 26, 2025 03:12
@tankyleo tankyleo force-pushed the commitment-stats-less-duplication branch 3 times, most recently from e637050 to 4d6bf13 Compare March 26, 2025 17:40
@tankyleo tankyleo force-pushed the commitment-stats-less-duplication branch 3 times, most recently from 5a212d8 to d682615 Compare March 27, 2025 15:24
Copy link

codecov bot commented Mar 27, 2025

Codecov Report

Attention: Patch coverage is 98.00995% with 4 lines in your changes missing coverage. Please review.

Project coverage is 89.16%. Comparing base (2e435de) to head (71df614).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
lightning/src/ln/chan_utils.rs 86.66% 2 Missing ⚠️
lightning/src/ln/channel.rs 98.77% 1 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3682      +/-   ##
==========================================
- Coverage   89.18%   89.16%   -0.03%     
==========================================
  Files         155      155              
  Lines      120796   120861      +65     
  Branches   120796   120861      +65     
==========================================
+ Hits       107731   107760      +29     
- Misses      10415    10446      +31     
- Partials     2650     2655       +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@tankyleo tankyleo force-pushed the commitment-stats-less-duplication branch from d682615 to 6f80f99 Compare March 27, 2025 16:14
@tankyleo
Copy link
Contributor Author

@TheBlueMatt take a look when you can thank you!

@@ -223,6 +223,25 @@ impl From<&InboundHTLCState> for Option<InboundHTLCStateDetails> {
}
}

impl InboundHTLCState {
fn as_str(&self) -> &str {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heh, if its just for logging I think we can #[derive(Debug)] :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debug would log all their inner contents too - don't think that's what we want here ?

I would have to derive Debug in a bunch more places.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I'll just move that function to an impl fmt::Debug for InboundHTLCState :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Went with an impl fmt::Display here, seems this corresponds most to what we want.

/// have not yet committed it. Such HTLCs will only be included in transactions which are being
/// generated by the peer which proposed adding the HTLCs, and thus we need to understand both
/// which peer generated this transaction and "to whom" this transaction flows.
fn for_each_inbound<F>(&self, generated_by_local: bool, mut for_each: F)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fn name here doesn't really communicate what it does/is used for. Maybe inbound_htlcs_in_commitment? It might also be more Rust-y to return an impl Iterator and let the callsite do the for, rather than doing it as a callback.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We initially had something like this is it closer to what you have in mind?

                for htlc in self.pending_inbound_htlcs.iter() {
                        if htlc.state.included_in_commitment(generated_by_local) {
                               ..
                        } else {
                               ..
                        }
                }

some other options for that specific function's return value:

  1. one iterator yielding (included, htlc)
  2. two iterators each yielding htlc, one for included, one for excluded.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Went with the very first option above.

tankyleo added 3 commits April 1, 2025 17:06
It can be useful to get the stats on a potential commitment transaction
without actually building it. Therefore, this commit splits the stats
calculations from the actual build of a commitment transaction.

This introduces an extra loop over the pending htlcs, but current
network behavior produces very few concurrent htlcs on channels.
Furthermore, each iteration of the loop in the stats calculation is very
cheap.
@tankyleo tankyleo force-pushed the commitment-stats-less-duplication branch from a6c6eac to 71df614 Compare April 1, 2025 17:47
@tankyleo tankyleo requested a review from TheBlueMatt April 1, 2025 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants