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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Replace OUR_MAX_HTLCS with config knob #2138

Merged
merged 1 commit into from
Apr 17, 2023
Merged

Replace OUR_MAX_HTLCS with config knob #2138

merged 1 commit into from
Apr 17, 2023

Conversation

swilliamson5
Copy link
Contributor

@swilliamson5 swilliamson5 commented Mar 29, 2023 •
edited

Add a config knob for holder_max_accepted_htlcs to replace the constant OUR_MAX_HTLCS.

resolves #1990

@swilliamson5 swilliamson5 changed the title Replace OUR_MAX_HTLCS with config knob [DRAFT] Replace OUR_MAX_HTLCS with config knob Mar 30, 2023
TheBlueMatt
TheBlueMatt reviewed Mar 30, 2023
View reviewed changes
Copy link
Collaborator

@TheBlueMatt TheBlueMatt left a comment

Choose a reason for hiding this comment

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

You should add a config knob in ChannelHandshakeConfig in config.rs.

lightning/src/ln/channel.rs Outdated Show resolved Hide resolved
lightning/src/ln/channel.rs Outdated Show resolved Hide resolved
lightning/src/ln/channel.rs Outdated Show resolved Hide resolved
TheBlueMatt
TheBlueMatt reviewed Apr 3, 2023
View reviewed changes
lightning/src/ln/channel.rs Outdated Show resolved Hide resolved
lightning/src/ln/channel.rs Outdated Show resolved Hide resolved
lightning/src/ln/channel.rs Show resolved Hide resolved
lightning/src/util/config.rs Show resolved Hide resolved
@codecov-commenter
Copy link

codecov-commenter commented Apr 8, 2023 •
edited

Codecov Report

Patch coverage: 94.11% and project coverage change: -0.03 ⚠️

Comparison is base (e1e3819) 91.35% compared to head (604eb91) 91.33%.

❗ Current head 604eb91 differs from pull request most recent head f656609. Consider uploading reports for the commit f656609 to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #2138      +/-   ##
==========================================
- Coverage   91.35%   91.33%   -0.03%     
==========================================
  Files         102      102              
  Lines       50382    50389       +7     
  Branches    50382    50389       +7     
==========================================
- Hits        46027    46021       -6     
- Misses       4355     4368      +13
Impacted Files Coverage Δ
lightning/src/util/config.rs 40.00% <0.00%> (-0.63%) ⬇️
lightning/src/ln/channel.rs 90.16% <100.00%> (+0.01%) ⬆️
lightning/src/ln/functional_tests.rs 98.25% <100.00%> (ø)

... and 3 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@TheBlueMatt
Copy link
Collaborator

Still needs more docs on the knob ( #2138 (comment) ) but the code looks good to me! When you do address that, feel free to rebase and squash so that its a clean set of non-merge commits based on upstream (see https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md#rebasing-changes for how to).

@TheBlueMatt TheBlueMatt mentioned this pull request Apr 12, 2023
Merged
@TheBlueMatt
Copy link
Collaborator

Probably can mark this non-draft too, when you get there :)

@swilliamson5 swilliamson5 changed the title [DRAFT] Replace OUR_MAX_HTLCS with config knob Replace OUR_MAX_HTLCS with config knob Apr 15, 2023
@swilliamson5 swilliamson5 marked this pull request as ready for review April 15, 2023 00:24
@swilliamson5 swilliamson5 force-pushed the replace-our-max-htlcs-constant branch 2 times, most recently from 54ca4fa to 09b9a19 Compare April 15, 2023 01:31
@swilliamson5 swilliamson5 force-pushed the replace-our-max-htlcs-constant branch from 09b9a19 to f8deb84 Compare April 15, 2023 01:34
@swilliamson5 swilliamson5 changed the title Replace OUR_MAX_HTLCS with config knob Replace OUR_MAX_HTLCS with config knob Apr 15, 2023
TheBlueMatt
TheBlueMatt reviewed Apr 16, 2023
View reviewed changes
lightning/src/ln/channel.rs Outdated Show resolved Hide resolved
lightning/src/util/config.rs Outdated Show resolved Hide resolved
lightning/src/util/config.rs Outdated Show resolved Hide resolved
lightning/src/util/config.rs Outdated Show resolved Hide resolved
@swilliamson5 swilliamson5 force-pushed the replace-our-max-htlcs-constant branch 2 times, most recently from c99da4c to 44ff074 Compare April 16, 2023 20:57
@swilliamson5 swilliamson5 force-pushed the replace-our-max-htlcs-constant branch from 44ff074 to fce8013 Compare April 16, 2023 21:56
TheBlueMatt
TheBlueMatt previously approved these changes Apr 16, 2023
View reviewed changes
Copy link
Collaborator

@TheBlueMatt TheBlueMatt left a comment

Choose a reason for hiding this comment

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

LGTM! We'll get another reviewer on this Monday, thanks!

lightning/src/ln/channel.rs Outdated Show resolved Hide resolved
@swilliamson5
Replace OUR_MAX_HTLCS constant with config knob
f656609 
holder_max_accepted_htlcs. Set upper bound of 483

Writes an even TLV if the value isn't 50
@swilliamson5 swilliamson5 force-pushed the replace-our-max-htlcs-constant branch from fce8013 to f656609 Compare April 16, 2023 23:29
@TheBlueMatt TheBlueMatt added this to the 0.0.115 milestone Apr 17, 2023
arik-so
arik-so approved these changes Apr 17, 2023
View reviewed changes
Copy link
Contributor

@arik-so arik-so left a comment

Choose a reason for hiding this comment

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

looks good!

@TheBlueMatt TheBlueMatt merged commit 2ebbe6f into lightningdevkit:main Apr 17, 2023
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheBlueMatt TheBlueMatt TheBlueMatt approved these changes

@arik-so arik-so arik-so approved these changes

Assignees
No one assigned
Labels
Seeking Code Review
Projects
None yet
Milestone
0.0.115
Development

Successfully merging this pull request may close these issues.

Replace OUR_MAX_HTLCS constant with a config knob
4 participants
@swilliamson5 @codecov-commenter @TheBlueMatt @arik-so