Skip to content

Add ChannelContext::get_commitment_stats - #3682

Merged
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication
Apr 9, 2025
Merged

Add ChannelContext::get_commitment_stats#3682
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication

Conversation

@tankyleo

@tankyleotankyleo commented Mar 24, 2025

Copy link
Copy Markdown
Contributor
 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
 Require all HTLC success states to hold their corresponding preimage
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.

@ldk-reviews-bot

ldk-reviews-bot commented Mar 24, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino 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
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from 0af1b43 to 31300c3CompareMarch 25, 2025 04:01
@tankyleo
tankyleo marked this pull request as draft March 25, 2025 04:08
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Why is this draft?

@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

I'm working on further cleanups now.

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from d6b1f51 to c540347CompareMarch 25, 2025 19:52
@tankyleo
tankyleo marked this pull request as ready for review March 25, 2025 19:59
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from c540347 to c9b30cbCompareMarch 26, 2025 00:06
@tankyleo
tankyleo requested a review from wpaulinoMarch 26, 2025 03:12
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from e637050 to 4d6bf13CompareMarch 26, 2025 17:40
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from 5a212d8 to d682615CompareMarch 27, 2025 15:24
@codecov

codecovBot commented Mar 27, 2025

Copy link
Copy Markdown

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 linesPatch %Lines
lightning/src/ln/chan_utils.rs86.66%2 Missing ⚠️
lightning/src/ln/channel.rs98.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
tankyleoforce-pushed the commitment-stats-less-duplication branch from d682615 to 6f80f99CompareMarch 27, 2025 16:14
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt take a look when you can thank you!

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from a6c6eac to 71df614CompareApril 1, 2025 17:47

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, one nit. Sorry somehow I lost track of this one.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Needs rebase, it seems

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 6d8fb6e to 793d4d2CompareApril 3, 2025 18:58
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

A question for you in an above comment Matt thanks :)

@TheBlueMatt
TheBlueMatt removed their request for review April 4, 2025 12:38
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 0c7bab6 to 285f1b9CompareApril 4, 2025 20:57
@tankyleo
tankyleo requested a review from wpaulinoApril 4, 2025 21:02
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 285f1b9 to 39f11e6CompareApril 8, 2025 00:19
@tankyleo
tankyleo requested a review from wpaulinoApril 8, 2025 00:20
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 39f11e6 to 107619eCompareApril 8, 2025 15:40

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, two minor comments

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
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 when actually
building a commitment transaction, but current network behavior
produces very few concurrent htlcs on channels. Furthermore, each
iteration of the loop in the stats calculation is very cheap.
The motivating use case for `build_commitment_stats` is to calculate the
balances of the channel parties in order to validate the
`funding_contribution_satoshis` field of `splice_init` and `splice_ack`
messages without building a full commitment transaction.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 186a320 to fb69869CompareApril 8, 2025 17:38
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from fb69869 to 671c4b0CompareApril 8, 2025 18:04
@wpaulino
wpaulino merged commit ef0fcab into lightningdevkit:mainApr 9, 2025
@tankyleotankyleo mentioned this pull request Mar 29, 2025
24 tasks
@tankyleo
tankyleo deleted the commitment-stats-less-duplication branch April 11, 2025 15:38
Sign up for freeto 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

@tankyleo@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add `ChannelContext::get_commitment_stats` by tankyleo · Pull Request #3682 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add ChannelContext::get_commitment_stats - #3682

Merged
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication
Apr 9, 2025
Merged

Add ChannelContext::get_commitment_stats#3682
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication

Conversation

@tankyleo

@tankyleotankyleo commented Mar 24, 2025

Copy link
Copy Markdown
Contributor
 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
 Require all HTLC success states to hold their corresponding preimage
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.

@ldk-reviews-bot

ldk-reviews-bot commented Mar 24, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino 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
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from 0af1b43 to 31300c3CompareMarch 25, 2025 04:01
@tankyleo
tankyleo marked this pull request as draft March 25, 2025 04:08
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Why is this draft?

@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

I'm working on further cleanups now.

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from d6b1f51 to c540347CompareMarch 25, 2025 19:52
@tankyleo
tankyleo marked this pull request as ready for review March 25, 2025 19:59
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from c540347 to c9b30cbCompareMarch 26, 2025 00:06
@tankyleo
tankyleo requested a review from wpaulinoMarch 26, 2025 03:12
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from e637050 to 4d6bf13CompareMarch 26, 2025 17:40
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from 5a212d8 to d682615CompareMarch 27, 2025 15:24
@codecov

codecovBot commented Mar 27, 2025

Copy link
Copy Markdown

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 linesPatch %Lines
lightning/src/ln/chan_utils.rs86.66%2 Missing ⚠️
lightning/src/ln/channel.rs98.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
tankyleoforce-pushed the commitment-stats-less-duplication branch from d682615 to 6f80f99CompareMarch 27, 2025 16:14
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt take a look when you can thank you!

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from a6c6eac to 71df614CompareApril 1, 2025 17:47

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, one nit. Sorry somehow I lost track of this one.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Needs rebase, it seems

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 6d8fb6e to 793d4d2CompareApril 3, 2025 18:58
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

A question for you in an above comment Matt thanks :)

@TheBlueMatt
TheBlueMatt removed their request for review April 4, 2025 12:38
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 0c7bab6 to 285f1b9CompareApril 4, 2025 20:57
@tankyleo
tankyleo requested a review from wpaulinoApril 4, 2025 21:02
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 285f1b9 to 39f11e6CompareApril 8, 2025 00:19
@tankyleo
tankyleo requested a review from wpaulinoApril 8, 2025 00:20
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 39f11e6 to 107619eCompareApril 8, 2025 15:40

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, two minor comments

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
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 when actually
building a commitment transaction, but current network behavior
produces very few concurrent htlcs on channels. Furthermore, each
iteration of the loop in the stats calculation is very cheap.
The motivating use case for `build_commitment_stats` is to calculate the
balances of the channel parties in order to validate the
`funding_contribution_satoshis` field of `splice_init` and `splice_ack`
messages without building a full commitment transaction.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 186a320 to fb69869CompareApril 8, 2025 17:38
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from fb69869 to 671c4b0CompareApril 8, 2025 18:04
@wpaulino
wpaulino merged commit ef0fcab into lightningdevkit:mainApr 9, 2025
@tankyleotankyleo mentioned this pull request Mar 29, 2025
24 tasks
@tankyleo
tankyleo deleted the commitment-stats-less-duplication branch April 11, 2025 15:38
Sign up for freeto 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

@tankyleo@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add `ChannelContext::get_commitment_stats` by tankyleo · Pull Request #3682 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add ChannelContext::get_commitment_stats - #3682

Merged
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication
Apr 9, 2025
Merged

Add ChannelContext::get_commitment_stats#3682
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication

Conversation

@tankyleo

@tankyleotankyleo commented Mar 24, 2025

Copy link
Copy Markdown
Contributor
 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
 Require all HTLC success states to hold their corresponding preimage
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.

@ldk-reviews-bot

ldk-reviews-bot commented Mar 24, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino 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
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from 0af1b43 to 31300c3CompareMarch 25, 2025 04:01
@tankyleo
tankyleo marked this pull request as draft March 25, 2025 04:08
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Why is this draft?

@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

I'm working on further cleanups now.

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from d6b1f51 to c540347CompareMarch 25, 2025 19:52
@tankyleo
tankyleo marked this pull request as ready for review March 25, 2025 19:59
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from c540347 to c9b30cbCompareMarch 26, 2025 00:06
@tankyleo
tankyleo requested a review from wpaulinoMarch 26, 2025 03:12
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from e637050 to 4d6bf13CompareMarch 26, 2025 17:40
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from 5a212d8 to d682615CompareMarch 27, 2025 15:24
@codecov

codecovBot commented Mar 27, 2025

Copy link
Copy Markdown

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 linesPatch %Lines
lightning/src/ln/chan_utils.rs86.66%2 Missing ⚠️
lightning/src/ln/channel.rs98.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
tankyleoforce-pushed the commitment-stats-less-duplication branch from d682615 to 6f80f99CompareMarch 27, 2025 16:14
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt take a look when you can thank you!

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from a6c6eac to 71df614CompareApril 1, 2025 17:47

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, one nit. Sorry somehow I lost track of this one.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Needs rebase, it seems

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 6d8fb6e to 793d4d2CompareApril 3, 2025 18:58
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

A question for you in an above comment Matt thanks :)

@TheBlueMatt
TheBlueMatt removed their request for review April 4, 2025 12:38
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 0c7bab6 to 285f1b9CompareApril 4, 2025 20:57
@tankyleo
tankyleo requested a review from wpaulinoApril 4, 2025 21:02
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 285f1b9 to 39f11e6CompareApril 8, 2025 00:19
@tankyleo
tankyleo requested a review from wpaulinoApril 8, 2025 00:20
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 39f11e6 to 107619eCompareApril 8, 2025 15:40

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, two minor comments

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
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 when actually
building a commitment transaction, but current network behavior
produces very few concurrent htlcs on channels. Furthermore, each
iteration of the loop in the stats calculation is very cheap.
The motivating use case for `build_commitment_stats` is to calculate the
balances of the channel parties in order to validate the
`funding_contribution_satoshis` field of `splice_init` and `splice_ack`
messages without building a full commitment transaction.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 186a320 to fb69869CompareApril 8, 2025 17:38
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from fb69869 to 671c4b0CompareApril 8, 2025 18:04
@wpaulino
wpaulino merged commit ef0fcab into lightningdevkit:mainApr 9, 2025
@tankyleotankyleo mentioned this pull request Mar 29, 2025
24 tasks
@tankyleo
tankyleo deleted the commitment-stats-less-duplication branch April 11, 2025 15:38
Sign up for freeto 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

@tankyleo@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add `ChannelContext::get_commitment_stats` by tankyleo · Pull Request #3682 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add ChannelContext::get_commitment_stats - #3682

Merged
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication
Apr 9, 2025
Merged

Add ChannelContext::get_commitment_stats#3682
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication

Conversation

@tankyleo

@tankyleotankyleo commented Mar 24, 2025

Copy link
Copy Markdown
Contributor
 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
 Require all HTLC success states to hold their corresponding preimage
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.

@ldk-reviews-bot

ldk-reviews-bot commented Mar 24, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino 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
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from 0af1b43 to 31300c3CompareMarch 25, 2025 04:01
@tankyleo
tankyleo marked this pull request as draft March 25, 2025 04:08
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Why is this draft?

@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

I'm working on further cleanups now.

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from d6b1f51 to c540347CompareMarch 25, 2025 19:52
@tankyleo
tankyleo marked this pull request as ready for review March 25, 2025 19:59
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from c540347 to c9b30cbCompareMarch 26, 2025 00:06
@tankyleo
tankyleo requested a review from wpaulinoMarch 26, 2025 03:12
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from e637050 to 4d6bf13CompareMarch 26, 2025 17:40
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from 5a212d8 to d682615CompareMarch 27, 2025 15:24
@codecov

codecovBot commented Mar 27, 2025

Copy link
Copy Markdown

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 linesPatch %Lines
lightning/src/ln/chan_utils.rs86.66%2 Missing ⚠️
lightning/src/ln/channel.rs98.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
tankyleoforce-pushed the commitment-stats-less-duplication branch from d682615 to 6f80f99CompareMarch 27, 2025 16:14
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt take a look when you can thank you!

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from a6c6eac to 71df614CompareApril 1, 2025 17:47

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, one nit. Sorry somehow I lost track of this one.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Needs rebase, it seems

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 6d8fb6e to 793d4d2CompareApril 3, 2025 18:58
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

A question for you in an above comment Matt thanks :)

@TheBlueMatt
TheBlueMatt removed their request for review April 4, 2025 12:38
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 0c7bab6 to 285f1b9CompareApril 4, 2025 20:57
@tankyleo
tankyleo requested a review from wpaulinoApril 4, 2025 21:02
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 285f1b9 to 39f11e6CompareApril 8, 2025 00:19
@tankyleo
tankyleo requested a review from wpaulinoApril 8, 2025 00:20
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 39f11e6 to 107619eCompareApril 8, 2025 15:40

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, two minor comments

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
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 when actually
building a commitment transaction, but current network behavior
produces very few concurrent htlcs on channels. Furthermore, each
iteration of the loop in the stats calculation is very cheap.
The motivating use case for `build_commitment_stats` is to calculate the
balances of the channel parties in order to validate the
`funding_contribution_satoshis` field of `splice_init` and `splice_ack`
messages without building a full commitment transaction.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 186a320 to fb69869CompareApril 8, 2025 17:38
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from fb69869 to 671c4b0CompareApril 8, 2025 18:04
@wpaulino
wpaulino merged commit ef0fcab into lightningdevkit:mainApr 9, 2025
@tankyleotankyleo mentioned this pull request Mar 29, 2025
24 tasks
@tankyleo
tankyleo deleted the commitment-stats-less-duplication branch April 11, 2025 15:38
Sign up for freeto 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

@tankyleo@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Add `ChannelContext::get_commitment_stats` by tankyleo · Pull Request #3682 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add ChannelContext::get_commitment_stats - #3682

Merged
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication
Apr 9, 2025
Merged

Add ChannelContext::get_commitment_stats#3682
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication

Conversation

@tankyleo

@tankyleotankyleo commented Mar 24, 2025

Copy link
Copy Markdown
Contributor
 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
 Require all HTLC success states to hold their corresponding preimage
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.

@ldk-reviews-bot

ldk-reviews-bot commented Mar 24, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino 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
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from 0af1b43 to 31300c3CompareMarch 25, 2025 04:01
@tankyleo
tankyleo marked this pull request as draft March 25, 2025 04:08
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Why is this draft?

@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

I'm working on further cleanups now.

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from d6b1f51 to c540347CompareMarch 25, 2025 19:52
@tankyleo
tankyleo marked this pull request as ready for review March 25, 2025 19:59
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from c540347 to c9b30cbCompareMarch 26, 2025 00:06
@tankyleo
tankyleo requested a review from wpaulinoMarch 26, 2025 03:12
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from e637050 to 4d6bf13CompareMarch 26, 2025 17:40
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from 5a212d8 to d682615CompareMarch 27, 2025 15:24
@codecov

codecovBot commented Mar 27, 2025

Copy link
Copy Markdown

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 linesPatch %Lines
lightning/src/ln/chan_utils.rs86.66%2 Missing ⚠️
lightning/src/ln/channel.rs98.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
tankyleoforce-pushed the commitment-stats-less-duplication branch from d682615 to 6f80f99CompareMarch 27, 2025 16:14
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt take a look when you can thank you!

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from a6c6eac to 71df614CompareApril 1, 2025 17:47

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, one nit. Sorry somehow I lost track of this one.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Needs rebase, it seems

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 6d8fb6e to 793d4d2CompareApril 3, 2025 18:58
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

A question for you in an above comment Matt thanks :)

@TheBlueMatt
TheBlueMatt removed their request for review April 4, 2025 12:38
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 0c7bab6 to 285f1b9CompareApril 4, 2025 20:57
@tankyleo
tankyleo requested a review from wpaulinoApril 4, 2025 21:02
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 285f1b9 to 39f11e6CompareApril 8, 2025 00:19
@tankyleo
tankyleo requested a review from wpaulinoApril 8, 2025 00:20
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 39f11e6 to 107619eCompareApril 8, 2025 15:40

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, two minor comments

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
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 when actually
building a commitment transaction, but current network behavior
produces very few concurrent htlcs on channels. Furthermore, each
iteration of the loop in the stats calculation is very cheap.
The motivating use case for `build_commitment_stats` is to calculate the
balances of the channel parties in order to validate the
`funding_contribution_satoshis` field of `splice_init` and `splice_ack`
messages without building a full commitment transaction.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 186a320 to fb69869CompareApril 8, 2025 17:38
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from fb69869 to 671c4b0CompareApril 8, 2025 18:04
@wpaulino
wpaulino merged commit ef0fcab into lightningdevkit:mainApr 9, 2025
@tankyleotankyleo mentioned this pull request Mar 29, 2025
24 tasks
@tankyleo
tankyleo deleted the commitment-stats-less-duplication branch April 11, 2025 15:38
Sign up for freeto 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

@tankyleo@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add `ChannelContext::get_commitment_stats` by tankyleo · Pull Request #3682 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add ChannelContext::get_commitment_stats - #3682

Merged
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication
Apr 9, 2025
Merged

Add ChannelContext::get_commitment_stats#3682
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication

Conversation

@tankyleo

@tankyleotankyleo commented Mar 24, 2025

Copy link
Copy Markdown
Contributor
 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
 Require all HTLC success states to hold their corresponding preimage
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.

@ldk-reviews-bot

ldk-reviews-bot commented Mar 24, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino 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
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from 0af1b43 to 31300c3CompareMarch 25, 2025 04:01
@tankyleo
tankyleo marked this pull request as draft March 25, 2025 04:08
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Why is this draft?

@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

I'm working on further cleanups now.

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from d6b1f51 to c540347CompareMarch 25, 2025 19:52
@tankyleo
tankyleo marked this pull request as ready for review March 25, 2025 19:59
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from c540347 to c9b30cbCompareMarch 26, 2025 00:06
@tankyleo
tankyleo requested a review from wpaulinoMarch 26, 2025 03:12
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from e637050 to 4d6bf13CompareMarch 26, 2025 17:40
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from 5a212d8 to d682615CompareMarch 27, 2025 15:24
@codecov

codecovBot commented Mar 27, 2025

Copy link
Copy Markdown

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 linesPatch %Lines
lightning/src/ln/chan_utils.rs86.66%2 Missing ⚠️
lightning/src/ln/channel.rs98.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
tankyleoforce-pushed the commitment-stats-less-duplication branch from d682615 to 6f80f99CompareMarch 27, 2025 16:14
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt take a look when you can thank you!

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from a6c6eac to 71df614CompareApril 1, 2025 17:47

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, one nit. Sorry somehow I lost track of this one.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Needs rebase, it seems

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 6d8fb6e to 793d4d2CompareApril 3, 2025 18:58
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

A question for you in an above comment Matt thanks :)

@TheBlueMatt
TheBlueMatt removed their request for review April 4, 2025 12:38
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 0c7bab6 to 285f1b9CompareApril 4, 2025 20:57
@tankyleo
tankyleo requested a review from wpaulinoApril 4, 2025 21:02
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 285f1b9 to 39f11e6CompareApril 8, 2025 00:19
@tankyleo
tankyleo requested a review from wpaulinoApril 8, 2025 00:20
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 39f11e6 to 107619eCompareApril 8, 2025 15:40

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, two minor comments

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
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 when actually
building a commitment transaction, but current network behavior
produces very few concurrent htlcs on channels. Furthermore, each
iteration of the loop in the stats calculation is very cheap.
The motivating use case for `build_commitment_stats` is to calculate the
balances of the channel parties in order to validate the
`funding_contribution_satoshis` field of `splice_init` and `splice_ack`
messages without building a full commitment transaction.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 186a320 to fb69869CompareApril 8, 2025 17:38
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from fb69869 to 671c4b0CompareApril 8, 2025 18:04
@wpaulino
wpaulino merged commit ef0fcab into lightningdevkit:mainApr 9, 2025
@tankyleotankyleo mentioned this pull request Mar 29, 2025
24 tasks
@tankyleo
tankyleo deleted the commitment-stats-less-duplication branch April 11, 2025 15:38
Sign up for freeto 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

@tankyleo@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Add `ChannelContext::get_commitment_stats` by tankyleo · Pull Request #3682 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add ChannelContext::get_commitment_stats - #3682

Merged
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication
Apr 9, 2025
Merged

Add ChannelContext::get_commitment_stats#3682
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication

Conversation

@tankyleo

@tankyleotankyleo commented Mar 24, 2025

Copy link
Copy Markdown
Contributor
 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
 Require all HTLC success states to hold their corresponding preimage
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.

@ldk-reviews-bot

ldk-reviews-bot commented Mar 24, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino 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
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from 0af1b43 to 31300c3CompareMarch 25, 2025 04:01
@tankyleo
tankyleo marked this pull request as draft March 25, 2025 04:08
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Why is this draft?

@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

I'm working on further cleanups now.

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from d6b1f51 to c540347CompareMarch 25, 2025 19:52
@tankyleo
tankyleo marked this pull request as ready for review March 25, 2025 19:59
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from c540347 to c9b30cbCompareMarch 26, 2025 00:06
@tankyleo
tankyleo requested a review from wpaulinoMarch 26, 2025 03:12
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from e637050 to 4d6bf13CompareMarch 26, 2025 17:40
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from 5a212d8 to d682615CompareMarch 27, 2025 15:24
@codecov

codecovBot commented Mar 27, 2025

Copy link
Copy Markdown

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 linesPatch %Lines
lightning/src/ln/chan_utils.rs86.66%2 Missing ⚠️
lightning/src/ln/channel.rs98.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
tankyleoforce-pushed the commitment-stats-less-duplication branch from d682615 to 6f80f99CompareMarch 27, 2025 16:14
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt take a look when you can thank you!

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from a6c6eac to 71df614CompareApril 1, 2025 17:47

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, one nit. Sorry somehow I lost track of this one.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Needs rebase, it seems

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 6d8fb6e to 793d4d2CompareApril 3, 2025 18:58
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

A question for you in an above comment Matt thanks :)

@TheBlueMatt
TheBlueMatt removed their request for review April 4, 2025 12:38
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 0c7bab6 to 285f1b9CompareApril 4, 2025 20:57
@tankyleo
tankyleo requested a review from wpaulinoApril 4, 2025 21:02
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 285f1b9 to 39f11e6CompareApril 8, 2025 00:19
@tankyleo
tankyleo requested a review from wpaulinoApril 8, 2025 00:20
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 39f11e6 to 107619eCompareApril 8, 2025 15:40

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, two minor comments

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
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 when actually
building a commitment transaction, but current network behavior
produces very few concurrent htlcs on channels. Furthermore, each
iteration of the loop in the stats calculation is very cheap.
The motivating use case for `build_commitment_stats` is to calculate the
balances of the channel parties in order to validate the
`funding_contribution_satoshis` field of `splice_init` and `splice_ack`
messages without building a full commitment transaction.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 186a320 to fb69869CompareApril 8, 2025 17:38
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from fb69869 to 671c4b0CompareApril 8, 2025 18:04
@wpaulino
wpaulino merged commit ef0fcab into lightningdevkit:mainApr 9, 2025
@tankyleotankyleo mentioned this pull request Mar 29, 2025
24 tasks
@tankyleo
tankyleo deleted the commitment-stats-less-duplication branch April 11, 2025 15:38
Sign up for freeto 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

@tankyleo@ldk-reviews-bot@TheBlueMatt@wpaulino
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Add `ChannelContext::get_commitment_stats` by tankyleo · Pull Request #3682 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add ChannelContext::get_commitment_stats - #3682

Merged
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication
Apr 9, 2025
Merged

Add ChannelContext::get_commitment_stats#3682
wpaulino merged 4 commits into
lightningdevkit:mainfrom
tankyleo:commitment-stats-less-duplication

Conversation

@tankyleo

@tankyleotankyleo commented Mar 24, 2025

Copy link
Copy Markdown
Contributor
 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
 Require all HTLC success states to hold their corresponding preimage
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.

@ldk-reviews-bot

ldk-reviews-bot commented Mar 24, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @wpaulino 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
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from 0af1b43 to 31300c3CompareMarch 25, 2025 04:01
@tankyleo
tankyleo marked this pull request as draft March 25, 2025 04:08
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Why is this draft?

@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

I'm working on further cleanups now.

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from d6b1f51 to c540347CompareMarch 25, 2025 19:52
@tankyleo
tankyleo marked this pull request as ready for review March 25, 2025 19:59
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

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

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from c540347 to c9b30cbCompareMarch 26, 2025 00:06
@tankyleo
tankyleo requested a review from wpaulinoMarch 26, 2025 03:12
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from e637050 to 4d6bf13CompareMarch 26, 2025 17:40
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 3 times, most recently from 5a212d8 to d682615CompareMarch 27, 2025 15:24
@codecov

codecovBot commented Mar 27, 2025

Copy link
Copy Markdown

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 linesPatch %Lines
lightning/src/ln/chan_utils.rs86.66%2 Missing ⚠️
lightning/src/ln/channel.rs98.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
tankyleoforce-pushed the commitment-stats-less-duplication branch from d682615 to 6f80f99CompareMarch 27, 2025 16:14
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

@TheBlueMatt take a look when you can thank you!

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch 2 times, most recently from a6c6eac to 71df614CompareApril 1, 2025 17:47

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Basically LGTM, one nit. Sorry somehow I lost track of this one.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Needs rebase, it seems

@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 6d8fb6e to 793d4d2CompareApril 3, 2025 18:58
@tankyleo

Copy link
Copy Markdown
ContributorAuthor

A question for you in an above comment Matt thanks :)

@TheBlueMatt
TheBlueMatt removed their request for review April 4, 2025 12:38
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 0c7bab6 to 285f1b9CompareApril 4, 2025 20:57
@tankyleo
tankyleo requested a review from wpaulinoApril 4, 2025 21:02
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @wpaulino! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

Comment threadlightning/src/ln/channel.rs Outdated
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 285f1b9 to 39f11e6CompareApril 8, 2025 00:19
@tankyleo
tankyleo requested a review from wpaulinoApril 8, 2025 00:20
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 39f11e6 to 107619eCompareApril 8, 2025 15:40

@wpaulinowpaulino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM, two minor comments

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
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 when actually
building a commitment transaction, but current network behavior
produces very few concurrent htlcs on channels. Furthermore, each
iteration of the loop in the stats calculation is very cheap.
The motivating use case for `build_commitment_stats` is to calculate the
balances of the channel parties in order to validate the
`funding_contribution_satoshis` field of `splice_init` and `splice_ack`
messages without building a full commitment transaction.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from 186a320 to fb69869CompareApril 8, 2025 17:38
This allows us to DRY the code that calculates the
`value_to_self_msat_offset` in `ChannelContext::build_commitment_stats`.
HTLC success states have held their corresponding preimage since
0.0.105, and the release notes of 0.1 already require users running
0.0.123 and earlier to resolve their HTLCs before upgrading to 0.1. So
this change is fully compatible with existing upgrade paths to
the yet-to-be-shipped 0.2 release.
@tankyleo
tankyleoforce-pushed the commitment-stats-less-duplication branch from fb69869 to 671c4b0CompareApril 8, 2025 18:04
@wpaulino
wpaulino merged commit ef0fcab into lightningdevkit:mainApr 9, 2025
@tankyleotankyleo mentioned this pull request Mar 29, 2025
24 tasks
@tankyleo
tankyleo deleted the commitment-stats-less-duplication branch April 11, 2025 15:38
Sign up for freeto 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

@tankyleo@ldk-reviews-bot@TheBlueMatt@wpaulino