Channel Establishment for V3 Channels - #3792

Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
carlaKC:3789-channelestablishment
Jun 6, 2025
Merged

Channel Establishment for V3 Channels#3792
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom
carlaKC:3789-channelestablishment

Conversation

@carlaKC

@carlaKCcarlaKC commented May 22, 2025

Copy link
Copy Markdown
Contributor

This PR updates the channel establishment flow to allow and validate V3 channels (behind test flag).

@ldk-reviews-bot

ldk-reviews-bot commented May 22, 2025•
edited
Loading

Copy link
Copy Markdown

👋 I see @wpaulino was un-assigned.
If you'd like another reviewer assignemnt, please click here.

@carlaKC
carlaKC requested a review from TheBlueMattMay 22, 2025 15:43
@carlaKCcarlaKC mentioned this pull request May 22, 2025
Closed
43 tasks
TheBlueMatt
TheBlueMatt reviewed May 22, 2025
View reviewed changes

@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.

Cool, basically all LGTM.

Comment threadlightning/src/ln/channelmanager.rs

#[test]
fn test_anchors_zero_fee_htlc_tx_fallback() {
fn test_anchors_zero_fee_htlc_tx_downgrade() {

@TheBlueMattTheBlueMattMay 22, 2025

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.

Congrats, you touched it, now you get to move it out of channelmanager into some other test-specific file that isn't 15000 lines of code 😂

@carlaKCcarlaKCMay 23, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done this in a follow up in #3797 so that move + format can be reviewed separately.

Comment threadlightning/src/util/config.rs Outdated
Comment on lines +209 to +212
/// back to a `anchors_zero_fee_htlc` (if [`Self::negotiate_anchors_zero_fee_htlc_tx`]
/// is set) or `static_remote_key` channel.
///
/// *Implies [`Self::negotiate_anchors_zero_fee_htlc_tx`].*

@TheBlueMattTheBlueMattMay 22, 2025

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.

These are in conflict - one says we'll fall back if its set, the other says that its implied (ie always set) if we set this flag.

@ldk-reviews-bot

ldk-reviews-bot commented May 22, 2025

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented May 22, 2025

Copy link
Copy Markdown

✅ Added second reviewer: @valentinewallace

@wpaulino
wpaulino requested review from wpaulino and removed request for valentinewallaceMay 22, 2025 18:17
wpaulino
wpaulino reviewed May 23, 2025
View reviewed changes

@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 after Matt's comments are addressed

@carlaKC
carlaKCforce-pushed the 3789-channelestablishment branch from 3a36506 to b9ec89cCompareMay 23, 2025 18:30
@carlaKCcarlaKC mentioned this pull request May 23, 2025
Merged
@carlaKC

carlaKC commented May 23, 2025

Copy link
Copy Markdown
ContributorAuthor

Removed conflicting docs statement + opened followup for test separation (felt wrong to do move+format in the same PR, happy to include if we want it in here).

@ldk-reviews-bot

ldk-reviews-bot commented May 26, 2025

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt@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.

1 similar comment
@ldk-reviews-bot

ldk-reviews-bot commented May 26, 2025

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt@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.

tankyleo
tankyleo reviewed May 27, 2025
View reviewed changes

@tankyleotankyleo 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.

Sorry for the delay, here's a first pass :)

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channel.rs
@ldk-reviews-bot

ldk-reviews-bot commented May 28, 2025

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @TheBlueMatt@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.

1 similar comment
@ldk-reviews-bot

ldk-reviews-bot commented May 28, 2025

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @TheBlueMatt@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.

tankyleo
tankyleo reviewed May 28, 2025
View reviewed changes

@tankyleotankyleo 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.

Another pass :)

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/util/config.rs
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
@carlaKC
carlaKCforce-pushed the 3789-channelestablishment branch from b9ec89c to 892d87aCompareMay 29, 2025 15:50
@carlaKC

carlaKC commented May 29, 2025

Copy link
Copy Markdown
ContributorAuthor

Major change in push is using get_initial_channel_type in channel type downgrades to DRY up the code a bit.
Otherwise addressed nits + added some tests in fixups (full diff).

@carlaKC
carlaKC requested a review from tankyleoMay 29, 2025 15:53
tankyleo
tankyleo reviewed May 29, 2025
View reviewed changes

@tankyleotankyleo 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.

Thank you for the downgrade tests ! Just three nits at this point :)

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
@carlaKC
carlaKCforce-pushed the 3789-channelestablishment branch from 892d87a to e56e32aCompareMay 30, 2025 20:23
@carlaKC

carlaKC commented May 30, 2025

Copy link
Copy Markdown
ContributorAuthor

Added test + fixed minor nit.

@ldk-reviews-bot

ldk-reviews-bot commented May 31, 2025

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @TheBlueMatt@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.

1 similar comment
@ldk-reviews-bot

ldk-reviews-bot commented May 31, 2025

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @TheBlueMatt@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.

@ldk-reviews-bot

ldk-reviews-bot commented Jun 2, 2025

Copy link
Copy Markdown

🔔 4th Reminder

Hey @TheBlueMatt@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.

@carlaKC

carlaKC commented Jun 4, 2025

Copy link
Copy Markdown
ContributorAuthor

Two followups for this to do some test cleaning while we're here:

tankyleo
tankyleo reviewed Jun 4, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs Outdated
@carlaKC
ln/refactor: add helper test function for channel type downgrade
588f490
Useful for the commits that follow where we add more downgrade tests.
@carlaKC
carlaKCforce-pushed the 3789-channelestablishment branch 2 times, most recently from e430212 to 99c645eCompareJune 4, 2025 20:54
@carlaKC

carlaKC commented Jun 4, 2025

Copy link
Copy Markdown
ContributorAuthor

Rebased + addressed nit.

tankyleo
tankyleo previously approved these changes Jun 4, 2025
View reviewed changes
@codecov

codecovBot commented Jun 4, 2025•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 95.78313% with 14 lines in your changes missing coverage. Please review.

Project coverage is 89.93%. Comparing base (7b62ea4) to head (99c645e).

Files with missing linesPatch %Lines
lightning/src/ln/channel.rs93.02%9 Missing ⚠️
lightning/src/ln/functional_tests.rs94.11%2 Missing and 1 partial ⚠️
lightning/src/ln/channelmanager.rs98.56%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3792 +/- ##
==========================================
+ Coverage 89.91% 89.93% +0.02% 
==========================================
Files 160 160 Lines 129307 129579 +272 Branches 129307 129579 +272 ==========================================
+ Hits 116262 116539 +277 + Misses 10355 10352 -3 + Partials 2690 2688 -2

☔ 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.

@carlaKC
carlaKC requested a review from TheBlueMattJune 5, 2025 16:15
@carlaKCcarlaKC mentioned this pull request Jun 6, 2025
Merged
TheBlueMatt
TheBlueMatt reviewed Jun 6, 2025
View reviewed changes

@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.

Grrr, one issue sorry.

Comment threadlightning/src/ln/channel.rs Outdated
eligible_features.clear_anchor_zero_fee_commitments();
eligible_features.clear_anchors_zero_fee_htlc_tx();
assert!(!eligible_features.supports_anchor_zero_fee_commitments());
assert!(!eligible_features.supports_anchors_nonzero_fee_htlc_tx());

@TheBlueMattTheBlueMattJun 6, 2025

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.

Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit? Generally, though, all the assertions here seem like they could be debug_assertions or elided entirely (asserting that we don't support something we just cleared probably belongs in a features test, and I believe already exists).

@carlaKCcarlaKCJun 6, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Will remove the feature bit asserts 👍

Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit?

ofc, it should be on channel_type 🤦‍♀️

carlaKCand others added 7 commits June 6, 2025 11:14
@carlaKC
ln/refactor: use get_initial_channel_type for channel downgrade
3b1e691
Rather than duplicating our channel type preference ordering in
downgrade logic, make a modified version of the remote peer's supported
features and remove our current channel type from it to get the next
preferred channel type.
@carlaKC@TheBlueMatt
ln+util: add test option to enable negotiation of zero fee channels
ffddb20
To allow testing along the way in this PR, turn on negotiation of
zero fee channels.
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for channel type tests
e4465c4
@carlaKC@TheBlueMatt
ln: do not set or accept non-zero feerates in open_channel for v3
aab2d29
Sender: MUST set `feerate_per_kw` to zero
Receiver: MUST fail the channel if `feerate_per_kw` != 0
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for manual acceptance tests
67e394d
@carlaKC
ln: do not automatically accept zero fee commitment channels
41d8529
Like anchor channels, these channels require that the user reserves a
UTXO to bump the channel. If we automatically accept this channel type
and the user does not have such reserve available, they are at risk of
losing funds because they cannot fee bump the channel.
@TheBlueMatt@carlaKC
ln: set max_htlcs based on the channel type
23de01c
@carlaKC
carlaKCforce-pushed the 3789-channelestablishment branch from 99c645e to 23de01cCompareJune 6, 2025 15:37
carlaKC
carlaKC commented Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
// We should never have negotiated `anchors_nonzero_fee_htlc_tx` because it can result in a
// loss of funds.
let channel_type = &funding.channel_transaction_parameters.channel_type_features;
assert!(!channel_type.supports_anchors_nonzero_fee_htlc_tx());

@carlaKCcarlaKCJun 6, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Moved this assert up because we should never negotiate a non-zero-htlc-anchor channel, and it's a risk of lost funds if we do.

Couldn't see a historical reason why we only checked it if the channel type was supports_anchors_zero_fee_htlc_tx - went back a few commits and couldn't find reasoning. cc @TheBlueMatt

@carlaKC

carlaKC commented Jun 6, 2025

Copy link
Copy Markdown
ContributorAuthor

Removed asserts + moved supports_anchors_nonzero_fee_htlc_tx assert, diff here.

tankyleo
tankyleo reviewed Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
@TheBlueMatt
TheBlueMatt merged commit 0430b1e into lightningdevkit:mainJun 6, 2025
@wpaulino
wpaulino removed their request for review June 6, 2025 21:06
@bucko13bucko13 mentioned this pull request Jun 16, 2025
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino left review comments
@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@tankyleotankyleotankyleo approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@carlaKC@ldk-reviews-bot@TheBlueMatt@wpaulino@tankyleo
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Channel Establishment for V3 Channels - #3792
Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Jun 6, 2025
Merged
Channel Establishment for V3 Channels#3792
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Conversation
@carlaKC
@carlaKCcarlaKC
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
This PR updates the channel establishment flow to allow and validate V3 channels (behind test flag).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 I see @wpaulino was un-assigned.

If you'd like another reviewer assignemnt, please click here.
@carlaKC
carlaKC
requested a review
from TheBlueMattMay 22, 2025 15:43
@carlaKCcarlaKC
mentioned this pull request
May 22, 2025

Closed

43 tasks
TheBlueMatt
TheBlueMatt
reviewed
May 22, 2025
View reviewed changes
@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.

Cool, basically all LGTM.
Comment threadlightning/src/ln/channelmanager.rs

	#[test]
	fn test_anchors_zero_fee_htlc_tx_fallback() {
	fn test_anchors_zero_fee_htlc_tx_downgrade() {
@TheBlueMattTheBlueMattMay 22, 2025

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.

Congrats, you touched it, now you get to move it out of channelmanager into some other test-specific file that isn't 15000 lines of code 😂
@carlaKCcarlaKCMay 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done this in a follow up in #3797 so that move + format can be reviewed separately.
Comment threadlightning/src/util/config.rs
Outdated


Comment on lines

+209
 to 
+212

	/// back to a `anchors_zero_fee_htlc` (if [`Self::negotiate_anchors_zero_fee_htlc_tx`]
	/// is set) or `static_remote_key` channel.
	///
	/// *Implies [`Self::negotiate_anchors_zero_fee_htlc_tx`].*
@TheBlueMattTheBlueMattMay 22, 2025

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.

These are in conflict - one says we'll fall back if its set, the other says that its implied (ie always set) if we set this flag.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

✅ Added second reviewer: @valentinewallace
@wpaulino
wpaulino
requested review from
wpaulino
and removed request for
valentinewallaceMay 22, 2025 18:17
wpaulino
wpaulino
reviewed
May 23, 2025
View reviewed changes
@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 after Matt's comments are addressed
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
3a36506 to
b9ec89cCompareMay 23, 2025 18:30
@carlaKCcarlaKC
mentioned this pull request
May 23, 2025
 Merged

@carlaKC
carlaKC
commented
May 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed conflicting docs statement + opened followup for test separation (felt wrong to do move+format in the same PR, happy to include if we want it in here).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 27, 2025
View reviewed changes
@tankyleotankyleo
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.

Sorry for the delay, here's a first pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channel.rs
@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 28, 2025
View reviewed changes
@tankyleotankyleo
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.

Another pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/util/config.rs
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
b9ec89c to
892d87aCompareMay 29, 2025 15:50
@carlaKC
carlaKC
commented
May 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Major change in push is using get_initial_channel_type in channel type downgrades to DRY up the code a bit.

Otherwise addressed nits + added some tests in fixups (full diff).
@carlaKC
carlaKC
requested a review
from tankyleoMay 29, 2025 15:53
tankyleo
tankyleo
reviewed
May 29, 2025
View reviewed changes
@tankyleotankyleo
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.

Thank you for the downgrade tests ! Just three nits at this point :)
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
892d87a to
e56e32aCompareMay 30, 2025 20:23
@carlaKC
carlaKC
commented
May 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Added test + fixed minor nit.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 2, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @TheBlueMatt@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.
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Two followups for this to do some test cleaning while we're here:
tankyleo
tankyleo
reviewed
Jun 4, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

@carlaKC
ln/refactor: add helper test function for channel type downgrade
588f490
Useful for the commits that follow where we add more downgrade tests.
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
2 times, most recently
from
e430212 to
99c645eCompareJune 4, 2025 20:54
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Rebased + addressed nit.
tankyleo
tankyleo
previously approved these changes
Jun 4, 2025
View reviewed changes
@codecov
codecovBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 95.78313% with 14 lines in your changes missing coverage. Please review.
Project coverage is 89.93%. Comparing base (7b62ea4) to head (99c645e).
Files with missing linesPatch %Lines
lightning/src/ln/channel.rs93.02%9 Missing ⚠️
lightning/src/ln/functional_tests.rs94.11%2 Missing and 1 partial ⚠️
lightning/src/ln/channelmanager.rs98.56%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3792 +/- ##
==========================================
+ Coverage 89.91% 89.93% +0.02% 
==========================================
Files 160 160 Lines 129307 129579 +272 Branches 129307 129579 +272 ==========================================
+ Hits 116262 116539 +277 + Misses 10355 10352 -3 + Partials 2690 2688 -2 
☔ 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.
@carlaKC
carlaKC
requested a review
from TheBlueMattJune 5, 2025 16:15
@carlaKCcarlaKC
mentioned this pull request
Jun 6, 2025
 Merged

TheBlueMatt
TheBlueMatt
reviewed
Jun 6, 2025
View reviewed changes
@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.

Grrr, one issue sorry.
Comment threadlightning/src/ln/channel.rs
Outdated

 eligible_features.clear_anchor_zero_fee_commitments();
 eligible_features.clear_anchors_zero_fee_htlc_tx();
 assert!(!eligible_features.supports_anchor_zero_fee_commitments());
 assert!(!eligible_features.supports_anchors_nonzero_fee_htlc_tx());
@TheBlueMattTheBlueMattJun 6, 2025

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.

Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit? Generally, though, all the assertions here seem like they could be debug_assertions or elided entirely (asserting that we don't support something we just cleared probably belongs in a features test, and I believe already exists).
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Will remove the feature bit asserts 👍
Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit?
ofc, it should be on channel_type 🤦‍♀️
carlaKCand others
added 7 commits
June 6, 2025 11:14
@carlaKC
ln/refactor: use get_initial_channel_type for channel downgrade
3b1e691
Rather than duplicating our channel type preference ordering in
downgrade logic, make a modified version of the remote peer's supported
features and remove our current channel type from it to get the next
preferred channel type.
@carlaKC@TheBlueMatt
ln+util: add test option to enable negotiation of zero fee channels
ffddb20
To allow testing along the way in this PR, turn on negotiation of
zero fee channels.
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for channel type tests
e4465c4
@carlaKC@TheBlueMatt
ln: do not set or accept non-zero feerates in open_channel for v3
aab2d29
Sender: MUST set `feerate_per_kw` to zero
Receiver: MUST fail the channel if `feerate_per_kw` != 0
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for manual acceptance tests
67e394d
@carlaKC
ln: do not automatically accept zero fee commitment channels
41d8529
Like anchor channels, these channels require that the user reserves a
UTXO to bump the channel. If we automatically accept this channel type
and the user does not have such reserve available, they are at risk of
losing funds because they cannot fee bump the channel.
@TheBlueMatt@carlaKC
ln: set max_htlcs based on the channel type
23de01c
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
99c645e to
23de01cCompareJune 6, 2025 15:37
carlaKC
carlaKC
commented
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
 // We should never have negotiated `anchors_nonzero_fee_htlc_tx` because it can result in a
 // loss of funds.
 let channel_type = &funding.channel_transaction_parameters.channel_type_features;
 assert!(!channel_type.supports_anchors_nonzero_fee_htlc_tx());
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Moved this assert up because we should never negotiate a non-zero-htlc-anchor channel, and it's a risk of lost funds if we do.
Couldn't see a historical reason why we only checked it if the channel type was supports_anchors_zero_fee_htlc_tx - went back a few commits and couldn't find reasoning. cc @TheBlueMatt
@carlaKC
carlaKC
commented
Jun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed asserts + moved supports_anchors_nonzero_fee_htlc_tx assert, diff here.
tankyleo
tankyleo
reviewed
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
@TheBlueMatt
TheBlueMatt
merged commit 0430b1e
into
lightningdevkit:mainJun 6, 2025
@wpaulino
wpaulino
removed their request for review
June 6, 2025 21:06
@bucko13bucko13
mentioned this pull request
Jun 16, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino left review comments
@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@tankyleotankyleotankyleo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Channel Establishment for V3 Channels - #3792
Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Jun 6, 2025
Merged
Channel Establishment for V3 Channels#3792
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Conversation
@carlaKC
@carlaKCcarlaKC
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
This PR updates the channel establishment flow to allow and validate V3 channels (behind test flag).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 I see @wpaulino was un-assigned.

If you'd like another reviewer assignemnt, please click here.
@carlaKC
carlaKC
requested a review
from TheBlueMattMay 22, 2025 15:43
@carlaKCcarlaKC
mentioned this pull request
May 22, 2025

Closed

43 tasks
TheBlueMatt
TheBlueMatt
reviewed
May 22, 2025
View reviewed changes
@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.

Cool, basically all LGTM.
Comment threadlightning/src/ln/channelmanager.rs

	#[test]
	fn test_anchors_zero_fee_htlc_tx_fallback() {
	fn test_anchors_zero_fee_htlc_tx_downgrade() {
@TheBlueMattTheBlueMattMay 22, 2025

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.

Congrats, you touched it, now you get to move it out of channelmanager into some other test-specific file that isn't 15000 lines of code 😂
@carlaKCcarlaKCMay 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done this in a follow up in #3797 so that move + format can be reviewed separately.
Comment threadlightning/src/util/config.rs
Outdated


Comment on lines

+209
 to 
+212

	/// back to a `anchors_zero_fee_htlc` (if [`Self::negotiate_anchors_zero_fee_htlc_tx`]
	/// is set) or `static_remote_key` channel.
	///
	/// *Implies [`Self::negotiate_anchors_zero_fee_htlc_tx`].*
@TheBlueMattTheBlueMattMay 22, 2025

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.

These are in conflict - one says we'll fall back if its set, the other says that its implied (ie always set) if we set this flag.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

✅ Added second reviewer: @valentinewallace
@wpaulino
wpaulino
requested review from
wpaulino
and removed request for
valentinewallaceMay 22, 2025 18:17
wpaulino
wpaulino
reviewed
May 23, 2025
View reviewed changes
@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 after Matt's comments are addressed
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
3a36506 to
b9ec89cCompareMay 23, 2025 18:30
@carlaKCcarlaKC
mentioned this pull request
May 23, 2025
 Merged

@carlaKC
carlaKC
commented
May 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed conflicting docs statement + opened followup for test separation (felt wrong to do move+format in the same PR, happy to include if we want it in here).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 27, 2025
View reviewed changes
@tankyleotankyleo
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.

Sorry for the delay, here's a first pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channel.rs
@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 28, 2025
View reviewed changes
@tankyleotankyleo
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.

Another pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/util/config.rs
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
b9ec89c to
892d87aCompareMay 29, 2025 15:50
@carlaKC
carlaKC
commented
May 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Major change in push is using get_initial_channel_type in channel type downgrades to DRY up the code a bit.

Otherwise addressed nits + added some tests in fixups (full diff).
@carlaKC
carlaKC
requested a review
from tankyleoMay 29, 2025 15:53
tankyleo
tankyleo
reviewed
May 29, 2025
View reviewed changes
@tankyleotankyleo
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.

Thank you for the downgrade tests ! Just three nits at this point :)
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
892d87a to
e56e32aCompareMay 30, 2025 20:23
@carlaKC
carlaKC
commented
May 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Added test + fixed minor nit.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 2, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @TheBlueMatt@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.
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Two followups for this to do some test cleaning while we're here:
tankyleo
tankyleo
reviewed
Jun 4, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

@carlaKC
ln/refactor: add helper test function for channel type downgrade
588f490
Useful for the commits that follow where we add more downgrade tests.
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
2 times, most recently
from
e430212 to
99c645eCompareJune 4, 2025 20:54
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Rebased + addressed nit.
tankyleo
tankyleo
previously approved these changes
Jun 4, 2025
View reviewed changes
@codecov
codecovBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 95.78313% with 14 lines in your changes missing coverage. Please review.
Project coverage is 89.93%. Comparing base (7b62ea4) to head (99c645e).
Files with missing linesPatch %Lines
lightning/src/ln/channel.rs93.02%9 Missing ⚠️
lightning/src/ln/functional_tests.rs94.11%2 Missing and 1 partial ⚠️
lightning/src/ln/channelmanager.rs98.56%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3792 +/- ##
==========================================
+ Coverage 89.91% 89.93% +0.02% 
==========================================
Files 160 160 Lines 129307 129579 +272 Branches 129307 129579 +272 ==========================================
+ Hits 116262 116539 +277 + Misses 10355 10352 -3 + Partials 2690 2688 -2 
☔ 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.
@carlaKC
carlaKC
requested a review
from TheBlueMattJune 5, 2025 16:15
@carlaKCcarlaKC
mentioned this pull request
Jun 6, 2025
 Merged

TheBlueMatt
TheBlueMatt
reviewed
Jun 6, 2025
View reviewed changes
@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.

Grrr, one issue sorry.
Comment threadlightning/src/ln/channel.rs
Outdated

 eligible_features.clear_anchor_zero_fee_commitments();
 eligible_features.clear_anchors_zero_fee_htlc_tx();
 assert!(!eligible_features.supports_anchor_zero_fee_commitments());
 assert!(!eligible_features.supports_anchors_nonzero_fee_htlc_tx());
@TheBlueMattTheBlueMattJun 6, 2025

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.

Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit? Generally, though, all the assertions here seem like they could be debug_assertions or elided entirely (asserting that we don't support something we just cleared probably belongs in a features test, and I believe already exists).
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Will remove the feature bit asserts 👍
Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit?
ofc, it should be on channel_type 🤦‍♀️
carlaKCand others
added 7 commits
June 6, 2025 11:14
@carlaKC
ln/refactor: use get_initial_channel_type for channel downgrade
3b1e691
Rather than duplicating our channel type preference ordering in
downgrade logic, make a modified version of the remote peer's supported
features and remove our current channel type from it to get the next
preferred channel type.
@carlaKC@TheBlueMatt
ln+util: add test option to enable negotiation of zero fee channels
ffddb20
To allow testing along the way in this PR, turn on negotiation of
zero fee channels.
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for channel type tests
e4465c4
@carlaKC@TheBlueMatt
ln: do not set or accept non-zero feerates in open_channel for v3
aab2d29
Sender: MUST set `feerate_per_kw` to zero
Receiver: MUST fail the channel if `feerate_per_kw` != 0
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for manual acceptance tests
67e394d
@carlaKC
ln: do not automatically accept zero fee commitment channels
41d8529
Like anchor channels, these channels require that the user reserves a
UTXO to bump the channel. If we automatically accept this channel type
and the user does not have such reserve available, they are at risk of
losing funds because they cannot fee bump the channel.
@TheBlueMatt@carlaKC
ln: set max_htlcs based on the channel type
23de01c
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
99c645e to
23de01cCompareJune 6, 2025 15:37
carlaKC
carlaKC
commented
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
 // We should never have negotiated `anchors_nonzero_fee_htlc_tx` because it can result in a
 // loss of funds.
 let channel_type = &funding.channel_transaction_parameters.channel_type_features;
 assert!(!channel_type.supports_anchors_nonzero_fee_htlc_tx());
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Moved this assert up because we should never negotiate a non-zero-htlc-anchor channel, and it's a risk of lost funds if we do.
Couldn't see a historical reason why we only checked it if the channel type was supports_anchors_zero_fee_htlc_tx - went back a few commits and couldn't find reasoning. cc @TheBlueMatt
@carlaKC
carlaKC
commented
Jun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed asserts + moved supports_anchors_nonzero_fee_htlc_tx assert, diff here.
tankyleo
tankyleo
reviewed
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
@TheBlueMatt
TheBlueMatt
merged commit 0430b1e
into
lightningdevkit:mainJun 6, 2025
@wpaulino
wpaulino
removed their request for review
June 6, 2025 21:06
@bucko13bucko13
mentioned this pull request
Jun 16, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino left review comments
@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@tankyleotankyleotankyleo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

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

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

Skip to content
Channel Establishment for V3 Channels - #3792
Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Jun 6, 2025
Merged
Channel Establishment for V3 Channels#3792
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Conversation
@carlaKC
@carlaKCcarlaKC
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
This PR updates the channel establishment flow to allow and validate V3 channels (behind test flag).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 I see @wpaulino was un-assigned.

If you'd like another reviewer assignemnt, please click here.
@carlaKC
carlaKC
requested a review
from TheBlueMattMay 22, 2025 15:43
@carlaKCcarlaKC
mentioned this pull request
May 22, 2025

Closed

43 tasks
TheBlueMatt
TheBlueMatt
reviewed
May 22, 2025
View reviewed changes
@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.

Cool, basically all LGTM.
Comment threadlightning/src/ln/channelmanager.rs

	#[test]
	fn test_anchors_zero_fee_htlc_tx_fallback() {
	fn test_anchors_zero_fee_htlc_tx_downgrade() {
@TheBlueMattTheBlueMattMay 22, 2025

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.

Congrats, you touched it, now you get to move it out of channelmanager into some other test-specific file that isn't 15000 lines of code 😂
@carlaKCcarlaKCMay 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done this in a follow up in #3797 so that move + format can be reviewed separately.
Comment threadlightning/src/util/config.rs
Outdated


Comment on lines

+209
 to 
+212

	/// back to a `anchors_zero_fee_htlc` (if [`Self::negotiate_anchors_zero_fee_htlc_tx`]
	/// is set) or `static_remote_key` channel.
	///
	/// *Implies [`Self::negotiate_anchors_zero_fee_htlc_tx`].*
@TheBlueMattTheBlueMattMay 22, 2025

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.

These are in conflict - one says we'll fall back if its set, the other says that its implied (ie always set) if we set this flag.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

✅ Added second reviewer: @valentinewallace
@wpaulino
wpaulino
requested review from
wpaulino
and removed request for
valentinewallaceMay 22, 2025 18:17
wpaulino
wpaulino
reviewed
May 23, 2025
View reviewed changes
@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 after Matt's comments are addressed
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
3a36506 to
b9ec89cCompareMay 23, 2025 18:30
@carlaKCcarlaKC
mentioned this pull request
May 23, 2025
 Merged

@carlaKC
carlaKC
commented
May 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed conflicting docs statement + opened followup for test separation (felt wrong to do move+format in the same PR, happy to include if we want it in here).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 27, 2025
View reviewed changes
@tankyleotankyleo
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.

Sorry for the delay, here's a first pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channel.rs
@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 28, 2025
View reviewed changes
@tankyleotankyleo
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.

Another pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/util/config.rs
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
b9ec89c to
892d87aCompareMay 29, 2025 15:50
@carlaKC
carlaKC
commented
May 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Major change in push is using get_initial_channel_type in channel type downgrades to DRY up the code a bit.

Otherwise addressed nits + added some tests in fixups (full diff).
@carlaKC
carlaKC
requested a review
from tankyleoMay 29, 2025 15:53
tankyleo
tankyleo
reviewed
May 29, 2025
View reviewed changes
@tankyleotankyleo
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.

Thank you for the downgrade tests ! Just three nits at this point :)
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
892d87a to
e56e32aCompareMay 30, 2025 20:23
@carlaKC
carlaKC
commented
May 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Added test + fixed minor nit.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 2, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @TheBlueMatt@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.
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Two followups for this to do some test cleaning while we're here:
tankyleo
tankyleo
reviewed
Jun 4, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

@carlaKC
ln/refactor: add helper test function for channel type downgrade
588f490
Useful for the commits that follow where we add more downgrade tests.
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
2 times, most recently
from
e430212 to
99c645eCompareJune 4, 2025 20:54
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Rebased + addressed nit.
tankyleo
tankyleo
previously approved these changes
Jun 4, 2025
View reviewed changes
@codecov
codecovBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 95.78313% with 14 lines in your changes missing coverage. Please review.
Project coverage is 89.93%. Comparing base (7b62ea4) to head (99c645e).
Files with missing linesPatch %Lines
lightning/src/ln/channel.rs93.02%9 Missing ⚠️
lightning/src/ln/functional_tests.rs94.11%2 Missing and 1 partial ⚠️
lightning/src/ln/channelmanager.rs98.56%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3792 +/- ##
==========================================
+ Coverage 89.91% 89.93% +0.02% 
==========================================
Files 160 160 Lines 129307 129579 +272 Branches 129307 129579 +272 ==========================================
+ Hits 116262 116539 +277 + Misses 10355 10352 -3 + Partials 2690 2688 -2 
☔ 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.
@carlaKC
carlaKC
requested a review
from TheBlueMattJune 5, 2025 16:15
@carlaKCcarlaKC
mentioned this pull request
Jun 6, 2025
 Merged

TheBlueMatt
TheBlueMatt
reviewed
Jun 6, 2025
View reviewed changes
@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.

Grrr, one issue sorry.
Comment threadlightning/src/ln/channel.rs
Outdated

 eligible_features.clear_anchor_zero_fee_commitments();
 eligible_features.clear_anchors_zero_fee_htlc_tx();
 assert!(!eligible_features.supports_anchor_zero_fee_commitments());
 assert!(!eligible_features.supports_anchors_nonzero_fee_htlc_tx());
@TheBlueMattTheBlueMattJun 6, 2025

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.

Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit? Generally, though, all the assertions here seem like they could be debug_assertions or elided entirely (asserting that we don't support something we just cleared probably belongs in a features test, and I believe already exists).
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Will remove the feature bit asserts 👍
Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit?
ofc, it should be on channel_type 🤦‍♀️
carlaKCand others
added 7 commits
June 6, 2025 11:14
@carlaKC
ln/refactor: use get_initial_channel_type for channel downgrade
3b1e691
Rather than duplicating our channel type preference ordering in
downgrade logic, make a modified version of the remote peer's supported
features and remove our current channel type from it to get the next
preferred channel type.
@carlaKC@TheBlueMatt
ln+util: add test option to enable negotiation of zero fee channels
ffddb20
To allow testing along the way in this PR, turn on negotiation of
zero fee channels.
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for channel type tests
e4465c4
@carlaKC@TheBlueMatt
ln: do not set or accept non-zero feerates in open_channel for v3
aab2d29
Sender: MUST set `feerate_per_kw` to zero
Receiver: MUST fail the channel if `feerate_per_kw` != 0
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for manual acceptance tests
67e394d
@carlaKC
ln: do not automatically accept zero fee commitment channels
41d8529
Like anchor channels, these channels require that the user reserves a
UTXO to bump the channel. If we automatically accept this channel type
and the user does not have such reserve available, they are at risk of
losing funds because they cannot fee bump the channel.
@TheBlueMatt@carlaKC
ln: set max_htlcs based on the channel type
23de01c
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
99c645e to
23de01cCompareJune 6, 2025 15:37
carlaKC
carlaKC
commented
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
 // We should never have negotiated `anchors_nonzero_fee_htlc_tx` because it can result in a
 // loss of funds.
 let channel_type = &funding.channel_transaction_parameters.channel_type_features;
 assert!(!channel_type.supports_anchors_nonzero_fee_htlc_tx());
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Moved this assert up because we should never negotiate a non-zero-htlc-anchor channel, and it's a risk of lost funds if we do.
Couldn't see a historical reason why we only checked it if the channel type was supports_anchors_zero_fee_htlc_tx - went back a few commits and couldn't find reasoning. cc @TheBlueMatt
@carlaKC
carlaKC
commented
Jun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed asserts + moved supports_anchors_nonzero_fee_htlc_tx assert, diff here.
tankyleo
tankyleo
reviewed
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
@TheBlueMatt
TheBlueMatt
merged commit 0430b1e
into
lightningdevkit:mainJun 6, 2025
@wpaulino
wpaulino
removed their request for review
June 6, 2025 21:06
@bucko13bucko13
mentioned this pull request
Jun 16, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino left review comments
@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@tankyleotankyleotankyleo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Channel Establishment for V3 Channels - #3792
Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Jun 6, 2025
Merged
Channel Establishment for V3 Channels#3792
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Conversation
@carlaKC
@carlaKCcarlaKC
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
This PR updates the channel establishment flow to allow and validate V3 channels (behind test flag).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 I see @wpaulino was un-assigned.

If you'd like another reviewer assignemnt, please click here.
@carlaKC
carlaKC
requested a review
from TheBlueMattMay 22, 2025 15:43
@carlaKCcarlaKC
mentioned this pull request
May 22, 2025

Closed

43 tasks
TheBlueMatt
TheBlueMatt
reviewed
May 22, 2025
View reviewed changes
@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.

Cool, basically all LGTM.
Comment threadlightning/src/ln/channelmanager.rs

	#[test]
	fn test_anchors_zero_fee_htlc_tx_fallback() {
	fn test_anchors_zero_fee_htlc_tx_downgrade() {
@TheBlueMattTheBlueMattMay 22, 2025

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.

Congrats, you touched it, now you get to move it out of channelmanager into some other test-specific file that isn't 15000 lines of code 😂
@carlaKCcarlaKCMay 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done this in a follow up in #3797 so that move + format can be reviewed separately.
Comment threadlightning/src/util/config.rs
Outdated


Comment on lines

+209
 to 
+212

	/// back to a `anchors_zero_fee_htlc` (if [`Self::negotiate_anchors_zero_fee_htlc_tx`]
	/// is set) or `static_remote_key` channel.
	///
	/// *Implies [`Self::negotiate_anchors_zero_fee_htlc_tx`].*
@TheBlueMattTheBlueMattMay 22, 2025

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.

These are in conflict - one says we'll fall back if its set, the other says that its implied (ie always set) if we set this flag.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

✅ Added second reviewer: @valentinewallace
@wpaulino
wpaulino
requested review from
wpaulino
and removed request for
valentinewallaceMay 22, 2025 18:17
wpaulino
wpaulino
reviewed
May 23, 2025
View reviewed changes
@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 after Matt's comments are addressed
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
3a36506 to
b9ec89cCompareMay 23, 2025 18:30
@carlaKCcarlaKC
mentioned this pull request
May 23, 2025
 Merged

@carlaKC
carlaKC
commented
May 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed conflicting docs statement + opened followup for test separation (felt wrong to do move+format in the same PR, happy to include if we want it in here).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 27, 2025
View reviewed changes
@tankyleotankyleo
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.

Sorry for the delay, here's a first pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channel.rs
@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 28, 2025
View reviewed changes
@tankyleotankyleo
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.

Another pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/util/config.rs
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
b9ec89c to
892d87aCompareMay 29, 2025 15:50
@carlaKC
carlaKC
commented
May 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Major change in push is using get_initial_channel_type in channel type downgrades to DRY up the code a bit.

Otherwise addressed nits + added some tests in fixups (full diff).
@carlaKC
carlaKC
requested a review
from tankyleoMay 29, 2025 15:53
tankyleo
tankyleo
reviewed
May 29, 2025
View reviewed changes
@tankyleotankyleo
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.

Thank you for the downgrade tests ! Just three nits at this point :)
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
892d87a to
e56e32aCompareMay 30, 2025 20:23
@carlaKC
carlaKC
commented
May 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Added test + fixed minor nit.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 2, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @TheBlueMatt@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.
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Two followups for this to do some test cleaning while we're here:
tankyleo
tankyleo
reviewed
Jun 4, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

@carlaKC
ln/refactor: add helper test function for channel type downgrade
588f490
Useful for the commits that follow where we add more downgrade tests.
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
2 times, most recently
from
e430212 to
99c645eCompareJune 4, 2025 20:54
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Rebased + addressed nit.
tankyleo
tankyleo
previously approved these changes
Jun 4, 2025
View reviewed changes
@codecov
codecovBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 95.78313% with 14 lines in your changes missing coverage. Please review.
Project coverage is 89.93%. Comparing base (7b62ea4) to head (99c645e).
Files with missing linesPatch %Lines
lightning/src/ln/channel.rs93.02%9 Missing ⚠️
lightning/src/ln/functional_tests.rs94.11%2 Missing and 1 partial ⚠️
lightning/src/ln/channelmanager.rs98.56%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3792 +/- ##
==========================================
+ Coverage 89.91% 89.93% +0.02% 
==========================================
Files 160 160 Lines 129307 129579 +272 Branches 129307 129579 +272 ==========================================
+ Hits 116262 116539 +277 + Misses 10355 10352 -3 + Partials 2690 2688 -2 
☔ 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.
@carlaKC
carlaKC
requested a review
from TheBlueMattJune 5, 2025 16:15
@carlaKCcarlaKC
mentioned this pull request
Jun 6, 2025
 Merged

TheBlueMatt
TheBlueMatt
reviewed
Jun 6, 2025
View reviewed changes
@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.

Grrr, one issue sorry.
Comment threadlightning/src/ln/channel.rs
Outdated

 eligible_features.clear_anchor_zero_fee_commitments();
 eligible_features.clear_anchors_zero_fee_htlc_tx();
 assert!(!eligible_features.supports_anchor_zero_fee_commitments());
 assert!(!eligible_features.supports_anchors_nonzero_fee_htlc_tx());
@TheBlueMattTheBlueMattJun 6, 2025

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.

Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit? Generally, though, all the assertions here seem like they could be debug_assertions or elided entirely (asserting that we don't support something we just cleared probably belongs in a features test, and I believe already exists).
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Will remove the feature bit asserts 👍
Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit?
ofc, it should be on channel_type 🤦‍♀️
carlaKCand others
added 7 commits
June 6, 2025 11:14
@carlaKC
ln/refactor: use get_initial_channel_type for channel downgrade
3b1e691
Rather than duplicating our channel type preference ordering in
downgrade logic, make a modified version of the remote peer's supported
features and remove our current channel type from it to get the next
preferred channel type.
@carlaKC@TheBlueMatt
ln+util: add test option to enable negotiation of zero fee channels
ffddb20
To allow testing along the way in this PR, turn on negotiation of
zero fee channels.
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for channel type tests
e4465c4
@carlaKC@TheBlueMatt
ln: do not set or accept non-zero feerates in open_channel for v3
aab2d29
Sender: MUST set `feerate_per_kw` to zero
Receiver: MUST fail the channel if `feerate_per_kw` != 0
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for manual acceptance tests
67e394d
@carlaKC
ln: do not automatically accept zero fee commitment channels
41d8529
Like anchor channels, these channels require that the user reserves a
UTXO to bump the channel. If we automatically accept this channel type
and the user does not have such reserve available, they are at risk of
losing funds because they cannot fee bump the channel.
@TheBlueMatt@carlaKC
ln: set max_htlcs based on the channel type
23de01c
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
99c645e to
23de01cCompareJune 6, 2025 15:37
carlaKC
carlaKC
commented
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
 // We should never have negotiated `anchors_nonzero_fee_htlc_tx` because it can result in a
 // loss of funds.
 let channel_type = &funding.channel_transaction_parameters.channel_type_features;
 assert!(!channel_type.supports_anchors_nonzero_fee_htlc_tx());
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Moved this assert up because we should never negotiate a non-zero-htlc-anchor channel, and it's a risk of lost funds if we do.
Couldn't see a historical reason why we only checked it if the channel type was supports_anchors_zero_fee_htlc_tx - went back a few commits and couldn't find reasoning. cc @TheBlueMatt
@carlaKC
carlaKC
commented
Jun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed asserts + moved supports_anchors_nonzero_fee_htlc_tx assert, diff here.
tankyleo
tankyleo
reviewed
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
@TheBlueMatt
TheBlueMatt
merged commit 0430b1e
into
lightningdevkit:mainJun 6, 2025
@wpaulino
wpaulino
removed their request for review
June 6, 2025 21:06
@bucko13bucko13
mentioned this pull request
Jun 16, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino left review comments
@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@tankyleotankyleotankyleo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Channel Establishment for V3 Channels - #3792
Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Jun 6, 2025
Merged
Channel Establishment for V3 Channels#3792
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Conversation
@carlaKC
@carlaKCcarlaKC
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
This PR updates the channel establishment flow to allow and validate V3 channels (behind test flag).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 I see @wpaulino was un-assigned.

If you'd like another reviewer assignemnt, please click here.
@carlaKC
carlaKC
requested a review
from TheBlueMattMay 22, 2025 15:43
@carlaKCcarlaKC
mentioned this pull request
May 22, 2025

Closed

43 tasks
TheBlueMatt
TheBlueMatt
reviewed
May 22, 2025
View reviewed changes
@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.

Cool, basically all LGTM.
Comment threadlightning/src/ln/channelmanager.rs

	#[test]
	fn test_anchors_zero_fee_htlc_tx_fallback() {
	fn test_anchors_zero_fee_htlc_tx_downgrade() {
@TheBlueMattTheBlueMattMay 22, 2025

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.

Congrats, you touched it, now you get to move it out of channelmanager into some other test-specific file that isn't 15000 lines of code 😂
@carlaKCcarlaKCMay 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done this in a follow up in #3797 so that move + format can be reviewed separately.
Comment threadlightning/src/util/config.rs
Outdated


Comment on lines

+209
 to 
+212

	/// back to a `anchors_zero_fee_htlc` (if [`Self::negotiate_anchors_zero_fee_htlc_tx`]
	/// is set) or `static_remote_key` channel.
	///
	/// *Implies [`Self::negotiate_anchors_zero_fee_htlc_tx`].*
@TheBlueMattTheBlueMattMay 22, 2025

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.

These are in conflict - one says we'll fall back if its set, the other says that its implied (ie always set) if we set this flag.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

✅ Added second reviewer: @valentinewallace
@wpaulino
wpaulino
requested review from
wpaulino
and removed request for
valentinewallaceMay 22, 2025 18:17
wpaulino
wpaulino
reviewed
May 23, 2025
View reviewed changes
@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 after Matt's comments are addressed
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
3a36506 to
b9ec89cCompareMay 23, 2025 18:30
@carlaKCcarlaKC
mentioned this pull request
May 23, 2025
 Merged

@carlaKC
carlaKC
commented
May 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed conflicting docs statement + opened followup for test separation (felt wrong to do move+format in the same PR, happy to include if we want it in here).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 27, 2025
View reviewed changes
@tankyleotankyleo
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.

Sorry for the delay, here's a first pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channel.rs
@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 28, 2025
View reviewed changes
@tankyleotankyleo
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.

Another pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/util/config.rs
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
b9ec89c to
892d87aCompareMay 29, 2025 15:50
@carlaKC
carlaKC
commented
May 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Major change in push is using get_initial_channel_type in channel type downgrades to DRY up the code a bit.

Otherwise addressed nits + added some tests in fixups (full diff).
@carlaKC
carlaKC
requested a review
from tankyleoMay 29, 2025 15:53
tankyleo
tankyleo
reviewed
May 29, 2025
View reviewed changes
@tankyleotankyleo
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.

Thank you for the downgrade tests ! Just three nits at this point :)
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
892d87a to
e56e32aCompareMay 30, 2025 20:23
@carlaKC
carlaKC
commented
May 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Added test + fixed minor nit.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 2, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @TheBlueMatt@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.
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Two followups for this to do some test cleaning while we're here:
tankyleo
tankyleo
reviewed
Jun 4, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

@carlaKC
ln/refactor: add helper test function for channel type downgrade
588f490
Useful for the commits that follow where we add more downgrade tests.
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
2 times, most recently
from
e430212 to
99c645eCompareJune 4, 2025 20:54
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Rebased + addressed nit.
tankyleo
tankyleo
previously approved these changes
Jun 4, 2025
View reviewed changes
@codecov
codecovBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 95.78313% with 14 lines in your changes missing coverage. Please review.
Project coverage is 89.93%. Comparing base (7b62ea4) to head (99c645e).
Files with missing linesPatch %Lines
lightning/src/ln/channel.rs93.02%9 Missing ⚠️
lightning/src/ln/functional_tests.rs94.11%2 Missing and 1 partial ⚠️
lightning/src/ln/channelmanager.rs98.56%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3792 +/- ##
==========================================
+ Coverage 89.91% 89.93% +0.02% 
==========================================
Files 160 160 Lines 129307 129579 +272 Branches 129307 129579 +272 ==========================================
+ Hits 116262 116539 +277 + Misses 10355 10352 -3 + Partials 2690 2688 -2 
☔ 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.
@carlaKC
carlaKC
requested a review
from TheBlueMattJune 5, 2025 16:15
@carlaKCcarlaKC
mentioned this pull request
Jun 6, 2025
 Merged

TheBlueMatt
TheBlueMatt
reviewed
Jun 6, 2025
View reviewed changes
@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.

Grrr, one issue sorry.
Comment threadlightning/src/ln/channel.rs
Outdated

 eligible_features.clear_anchor_zero_fee_commitments();
 eligible_features.clear_anchors_zero_fee_htlc_tx();
 assert!(!eligible_features.supports_anchor_zero_fee_commitments());
 assert!(!eligible_features.supports_anchors_nonzero_fee_htlc_tx());
@TheBlueMattTheBlueMattJun 6, 2025

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.

Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit? Generally, though, all the assertions here seem like they could be debug_assertions or elided entirely (asserting that we don't support something we just cleared probably belongs in a features test, and I believe already exists).
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Will remove the feature bit asserts 👍
Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit?
ofc, it should be on channel_type 🤦‍♀️
carlaKCand others
added 7 commits
June 6, 2025 11:14
@carlaKC
ln/refactor: use get_initial_channel_type for channel downgrade
3b1e691
Rather than duplicating our channel type preference ordering in
downgrade logic, make a modified version of the remote peer's supported
features and remove our current channel type from it to get the next
preferred channel type.
@carlaKC@TheBlueMatt
ln+util: add test option to enable negotiation of zero fee channels
ffddb20
To allow testing along the way in this PR, turn on negotiation of
zero fee channels.
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for channel type tests
e4465c4
@carlaKC@TheBlueMatt
ln: do not set or accept non-zero feerates in open_channel for v3
aab2d29
Sender: MUST set `feerate_per_kw` to zero
Receiver: MUST fail the channel if `feerate_per_kw` != 0
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for manual acceptance tests
67e394d
@carlaKC
ln: do not automatically accept zero fee commitment channels
41d8529
Like anchor channels, these channels require that the user reserves a
UTXO to bump the channel. If we automatically accept this channel type
and the user does not have such reserve available, they are at risk of
losing funds because they cannot fee bump the channel.
@TheBlueMatt@carlaKC
ln: set max_htlcs based on the channel type
23de01c
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
99c645e to
23de01cCompareJune 6, 2025 15:37
carlaKC
carlaKC
commented
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
 // We should never have negotiated `anchors_nonzero_fee_htlc_tx` because it can result in a
 // loss of funds.
 let channel_type = &funding.channel_transaction_parameters.channel_type_features;
 assert!(!channel_type.supports_anchors_nonzero_fee_htlc_tx());
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Moved this assert up because we should never negotiate a non-zero-htlc-anchor channel, and it's a risk of lost funds if we do.
Couldn't see a historical reason why we only checked it if the channel type was supports_anchors_zero_fee_htlc_tx - went back a few commits and couldn't find reasoning. cc @TheBlueMatt
@carlaKC
carlaKC
commented
Jun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed asserts + moved supports_anchors_nonzero_fee_htlc_tx assert, diff here.
tankyleo
tankyleo
reviewed
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
@TheBlueMatt
TheBlueMatt
merged commit 0430b1e
into
lightningdevkit:mainJun 6, 2025
@wpaulino
wpaulino
removed their request for review
June 6, 2025 21:06
@bucko13bucko13
mentioned this pull request
Jun 16, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino left review comments
@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@tankyleotankyleotankyleo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Channel Establishment for V3 Channels - #3792
Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Jun 6, 2025
Merged
Channel Establishment for V3 Channels#3792
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Conversation
@carlaKC
@carlaKCcarlaKC
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
This PR updates the channel establishment flow to allow and validate V3 channels (behind test flag).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 I see @wpaulino was un-assigned.

If you'd like another reviewer assignemnt, please click here.
@carlaKC
carlaKC
requested a review
from TheBlueMattMay 22, 2025 15:43
@carlaKCcarlaKC
mentioned this pull request
May 22, 2025

Closed

43 tasks
TheBlueMatt
TheBlueMatt
reviewed
May 22, 2025
View reviewed changes
@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.

Cool, basically all LGTM.
Comment threadlightning/src/ln/channelmanager.rs

	#[test]
	fn test_anchors_zero_fee_htlc_tx_fallback() {
	fn test_anchors_zero_fee_htlc_tx_downgrade() {
@TheBlueMattTheBlueMattMay 22, 2025

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.

Congrats, you touched it, now you get to move it out of channelmanager into some other test-specific file that isn't 15000 lines of code 😂
@carlaKCcarlaKCMay 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done this in a follow up in #3797 so that move + format can be reviewed separately.
Comment threadlightning/src/util/config.rs
Outdated


Comment on lines

+209
 to 
+212

	/// back to a `anchors_zero_fee_htlc` (if [`Self::negotiate_anchors_zero_fee_htlc_tx`]
	/// is set) or `static_remote_key` channel.
	///
	/// *Implies [`Self::negotiate_anchors_zero_fee_htlc_tx`].*
@TheBlueMattTheBlueMattMay 22, 2025

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.

These are in conflict - one says we'll fall back if its set, the other says that its implied (ie always set) if we set this flag.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

✅ Added second reviewer: @valentinewallace
@wpaulino
wpaulino
requested review from
wpaulino
and removed request for
valentinewallaceMay 22, 2025 18:17
wpaulino
wpaulino
reviewed
May 23, 2025
View reviewed changes
@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 after Matt's comments are addressed
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
3a36506 to
b9ec89cCompareMay 23, 2025 18:30
@carlaKCcarlaKC
mentioned this pull request
May 23, 2025
 Merged

@carlaKC
carlaKC
commented
May 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed conflicting docs statement + opened followup for test separation (felt wrong to do move+format in the same PR, happy to include if we want it in here).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 27, 2025
View reviewed changes
@tankyleotankyleo
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.

Sorry for the delay, here's a first pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channel.rs
@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 28, 2025
View reviewed changes
@tankyleotankyleo
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.

Another pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/util/config.rs
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
b9ec89c to
892d87aCompareMay 29, 2025 15:50
@carlaKC
carlaKC
commented
May 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Major change in push is using get_initial_channel_type in channel type downgrades to DRY up the code a bit.

Otherwise addressed nits + added some tests in fixups (full diff).
@carlaKC
carlaKC
requested a review
from tankyleoMay 29, 2025 15:53
tankyleo
tankyleo
reviewed
May 29, 2025
View reviewed changes
@tankyleotankyleo
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.

Thank you for the downgrade tests ! Just three nits at this point :)
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
892d87a to
e56e32aCompareMay 30, 2025 20:23
@carlaKC
carlaKC
commented
May 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Added test + fixed minor nit.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 2, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @TheBlueMatt@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.
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Two followups for this to do some test cleaning while we're here:
tankyleo
tankyleo
reviewed
Jun 4, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

@carlaKC
ln/refactor: add helper test function for channel type downgrade
588f490
Useful for the commits that follow where we add more downgrade tests.
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
2 times, most recently
from
e430212 to
99c645eCompareJune 4, 2025 20:54
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Rebased + addressed nit.
tankyleo
tankyleo
previously approved these changes
Jun 4, 2025
View reviewed changes
@codecov
codecovBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 95.78313% with 14 lines in your changes missing coverage. Please review.
Project coverage is 89.93%. Comparing base (7b62ea4) to head (99c645e).
Files with missing linesPatch %Lines
lightning/src/ln/channel.rs93.02%9 Missing ⚠️
lightning/src/ln/functional_tests.rs94.11%2 Missing and 1 partial ⚠️
lightning/src/ln/channelmanager.rs98.56%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3792 +/- ##
==========================================
+ Coverage 89.91% 89.93% +0.02% 
==========================================
Files 160 160 Lines 129307 129579 +272 Branches 129307 129579 +272 ==========================================
+ Hits 116262 116539 +277 + Misses 10355 10352 -3 + Partials 2690 2688 -2 
☔ 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.
@carlaKC
carlaKC
requested a review
from TheBlueMattJune 5, 2025 16:15
@carlaKCcarlaKC
mentioned this pull request
Jun 6, 2025
 Merged

TheBlueMatt
TheBlueMatt
reviewed
Jun 6, 2025
View reviewed changes
@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.

Grrr, one issue sorry.
Comment threadlightning/src/ln/channel.rs
Outdated

 eligible_features.clear_anchor_zero_fee_commitments();
 eligible_features.clear_anchors_zero_fee_htlc_tx();
 assert!(!eligible_features.supports_anchor_zero_fee_commitments());
 assert!(!eligible_features.supports_anchors_nonzero_fee_htlc_tx());
@TheBlueMattTheBlueMattJun 6, 2025

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.

Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit? Generally, though, all the assertions here seem like they could be debug_assertions or elided entirely (asserting that we don't support something we just cleared probably belongs in a features test, and I believe already exists).
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Will remove the feature bit asserts 👍
Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit?
ofc, it should be on channel_type 🤦‍♀️
carlaKCand others
added 7 commits
June 6, 2025 11:14
@carlaKC
ln/refactor: use get_initial_channel_type for channel downgrade
3b1e691
Rather than duplicating our channel type preference ordering in
downgrade logic, make a modified version of the remote peer's supported
features and remove our current channel type from it to get the next
preferred channel type.
@carlaKC@TheBlueMatt
ln+util: add test option to enable negotiation of zero fee channels
ffddb20
To allow testing along the way in this PR, turn on negotiation of
zero fee channels.
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for channel type tests
e4465c4
@carlaKC@TheBlueMatt
ln: do not set or accept non-zero feerates in open_channel for v3
aab2d29
Sender: MUST set `feerate_per_kw` to zero
Receiver: MUST fail the channel if `feerate_per_kw` != 0
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for manual acceptance tests
67e394d
@carlaKC
ln: do not automatically accept zero fee commitment channels
41d8529
Like anchor channels, these channels require that the user reserves a
UTXO to bump the channel. If we automatically accept this channel type
and the user does not have such reserve available, they are at risk of
losing funds because they cannot fee bump the channel.
@TheBlueMatt@carlaKC
ln: set max_htlcs based on the channel type
23de01c
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
99c645e to
23de01cCompareJune 6, 2025 15:37
carlaKC
carlaKC
commented
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
 // We should never have negotiated `anchors_nonzero_fee_htlc_tx` because it can result in a
 // loss of funds.
 let channel_type = &funding.channel_transaction_parameters.channel_type_features;
 assert!(!channel_type.supports_anchors_nonzero_fee_htlc_tx());
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Moved this assert up because we should never negotiate a non-zero-htlc-anchor channel, and it's a risk of lost funds if we do.
Couldn't see a historical reason why we only checked it if the channel type was supports_anchors_zero_fee_htlc_tx - went back a few commits and couldn't find reasoning. cc @TheBlueMatt
@carlaKC
carlaKC
commented
Jun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed asserts + moved supports_anchors_nonzero_fee_htlc_tx assert, diff here.
tankyleo
tankyleo
reviewed
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
@TheBlueMatt
TheBlueMatt
merged commit 0430b1e
into
lightningdevkit:mainJun 6, 2025
@wpaulino
wpaulino
removed their request for review
June 6, 2025 21:06
@bucko13bucko13
mentioned this pull request
Jun 16, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino left review comments
@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@tankyleotankyleotankyleo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

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

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

Skip to content
Channel Establishment for V3 Channels - #3792
Merged
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Jun 6, 2025
Merged
Channel Establishment for V3 Channels#3792
TheBlueMatt merged 8 commits into
lightningdevkit:mainfrom 
carlaKC:3789-channelestablishment
Conversation
@carlaKC
@carlaKCcarlaKC
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
This PR updates the channel establishment flow to allow and validate V3 channels (behind test flag).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025•

edited

Loading

Copy link


Copy Markdown

👋 I see @wpaulino was un-assigned.

If you'd like another reviewer assignemnt, please click here.
@carlaKC
carlaKC
requested a review
from TheBlueMattMay 22, 2025 15:43
@carlaKCcarlaKC
mentioned this pull request
May 22, 2025

Closed

43 tasks
TheBlueMatt
TheBlueMatt
reviewed
May 22, 2025
View reviewed changes
@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.

Cool, basically all LGTM.
Comment threadlightning/src/ln/channelmanager.rs

	#[test]
	fn test_anchors_zero_fee_htlc_tx_fallback() {
	fn test_anchors_zero_fee_htlc_tx_downgrade() {
@TheBlueMattTheBlueMattMay 22, 2025

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.

Congrats, you touched it, now you get to move it out of channelmanager into some other test-specific file that isn't 15000 lines of code 😂
@carlaKCcarlaKCMay 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Done this in a follow up in #3797 so that move + format can be reviewed separately.
Comment threadlightning/src/util/config.rs
Outdated


Comment on lines

+209
 to 
+212

	/// back to a `anchors_zero_fee_htlc` (if [`Self::negotiate_anchors_zero_fee_htlc_tx`]
	/// is set) or `static_remote_key` channel.
	///
	/// *Implies [`Self::negotiate_anchors_zero_fee_htlc_tx`].*
@TheBlueMattTheBlueMattMay 22, 2025

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.

These are in conflict - one says we'll fall back if its set, the other says that its implied (ie always set) if we set this flag.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 22, 2025

Copy link


Copy Markdown

✅ Added second reviewer: @valentinewallace
@wpaulino
wpaulino
requested review from
wpaulino
and removed request for
valentinewallaceMay 22, 2025 18:17
wpaulino
wpaulino
reviewed
May 23, 2025
View reviewed changes
@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 after Matt's comments are addressed
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
3a36506 to
b9ec89cCompareMay 23, 2025 18:30
@carlaKCcarlaKC
mentioned this pull request
May 23, 2025
 Merged

@carlaKC
carlaKC
commented
May 23, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed conflicting docs statement + opened followup for test separation (felt wrong to do move+format in the same PR, happy to include if we want it in here).
@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 26, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 27, 2025
View reviewed changes
@tankyleotankyleo
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.

Sorry for the delay, here's a first pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channel.rs
@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 28, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @TheBlueMatt@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.
tankyleo
tankyleo
reviewed
May 28, 2025
View reviewed changes
@tankyleotankyleo
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.

Another pass :)
Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/util/config.rs
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
b9ec89c to
892d87aCompareMay 29, 2025 15:50
@carlaKC
carlaKC
commented
May 29, 2025

Copy link


Copy Markdown

ContributorAuthor
Major change in push is using get_initial_channel_type in channel type downgrades to DRY up the code a bit.

Otherwise addressed nits + added some tests in fixups (full diff).
@carlaKC
carlaKC
requested a review
from tankyleoMay 29, 2025 15:53
tankyleo
tankyleo
reviewed
May 29, 2025
View reviewed changes
@tankyleotankyleo
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.

Thank you for the downgrade tests ! Just three nits at this point :)
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
892d87a to
e56e32aCompareMay 30, 2025 20:23
@carlaKC
carlaKC
commented
May 30, 2025

Copy link


Copy Markdown

ContributorAuthor
Added test + fixed minor nit.
@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.

1 similar comment

@ldk-reviews-bot
ldk-reviews-bot
commented
May 31, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @TheBlueMatt@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.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 2, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @TheBlueMatt@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.
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Two followups for this to do some test cleaning while we're here:
tankyleo
tankyleo
reviewed
Jun 4, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

@carlaKC
ln/refactor: add helper test function for channel type downgrade
588f490
Useful for the commits that follow where we add more downgrade tests.
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
2 times, most recently
from
e430212 to
99c645eCompareJune 4, 2025 20:54
@carlaKC
carlaKC
commented
Jun 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Rebased + addressed nit.
tankyleo
tankyleo
previously approved these changes
Jun 4, 2025
View reviewed changes
@codecov
codecovBot
commented
Jun 4, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 95.78313% with 14 lines in your changes missing coverage. Please review.
Project coverage is 89.93%. Comparing base (7b62ea4) to head (99c645e).
Files with missing linesPatch %Lines
lightning/src/ln/channel.rs93.02%9 Missing ⚠️
lightning/src/ln/functional_tests.rs94.11%2 Missing and 1 partial ⚠️
lightning/src/ln/channelmanager.rs98.56%1 Missing and 1 partial ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3792 +/- ##
==========================================
+ Coverage 89.91% 89.93% +0.02% 
==========================================
Files 160 160 Lines 129307 129579 +272 Branches 129307 129579 +272 ==========================================
+ Hits 116262 116539 +277 + Misses 10355 10352 -3 + Partials 2690 2688 -2 
☔ 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.
@carlaKC
carlaKC
requested a review
from TheBlueMattJune 5, 2025 16:15
@carlaKCcarlaKC
mentioned this pull request
Jun 6, 2025
 Merged

TheBlueMatt
TheBlueMatt
reviewed
Jun 6, 2025
View reviewed changes
@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.

Grrr, one issue sorry.
Comment threadlightning/src/ln/channel.rs
Outdated

 eligible_features.clear_anchor_zero_fee_commitments();
 eligible_features.clear_anchors_zero_fee_htlc_tx();
 assert!(!eligible_features.supports_anchor_zero_fee_commitments());
 assert!(!eligible_features.supports_anchors_nonzero_fee_htlc_tx());
@TheBlueMattTheBlueMattJun 6, 2025

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.

Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit? Generally, though, all the assertions here seem like they could be debug_assertions or elided entirely (asserting that we don't support something we just cleared probably belongs in a features test, and I believe already exists).
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Will remove the feature bit asserts 👍
Isn't this trivially reachable if a peer sets the nonzero-fee-htlc-tx feature bit?
ofc, it should be on channel_type 🤦‍♀️
carlaKCand others
added 7 commits
June 6, 2025 11:14
@carlaKC
ln/refactor: use get_initial_channel_type for channel downgrade
3b1e691
Rather than duplicating our channel type preference ordering in
downgrade logic, make a modified version of the remote peer's supported
features and remove our current channel type from it to get the next
preferred channel type.
@carlaKC@TheBlueMatt
ln+util: add test option to enable negotiation of zero fee channels
ffddb20
To allow testing along the way in this PR, turn on negotiation of
zero fee channels.
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for channel type tests
e4465c4
@carlaKC@TheBlueMatt
ln: do not set or accept non-zero feerates in open_channel for v3
aab2d29
Sender: MUST set `feerate_per_kw` to zero
Receiver: MUST fail the channel if `feerate_per_kw` != 0
Co-authored-by: Matt Corallo <git@bluematt.me>
@carlaKC
ln/refactor: add helper function for manual acceptance tests
67e394d
@carlaKC
ln: do not automatically accept zero fee commitment channels
41d8529
Like anchor channels, these channels require that the user reserves a
UTXO to bump the channel. If we automatically accept this channel type
and the user does not have such reserve available, they are at risk of
losing funds because they cannot fee bump the channel.
@TheBlueMatt@carlaKC
ln: set max_htlcs based on the channel type
23de01c
@carlaKC
carlaKCforce-pushed
the
3789-channelestablishment
branch
from
99c645e to
23de01cCompareJune 6, 2025 15:37
carlaKC
carlaKC
commented
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
 // We should never have negotiated `anchors_nonzero_fee_htlc_tx` because it can result in a
 // loss of funds.
 let channel_type = &funding.channel_transaction_parameters.channel_type_features;
 assert!(!channel_type.supports_anchors_nonzero_fee_htlc_tx());
@carlaKCcarlaKCJun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

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

Moved this assert up because we should never negotiate a non-zero-htlc-anchor channel, and it's a risk of lost funds if we do.
Couldn't see a historical reason why we only checked it if the channel type was supports_anchors_zero_fee_htlc_tx - went back a few commits and couldn't find reasoning. cc @TheBlueMatt
@carlaKC
carlaKC
commented
Jun 6, 2025

Copy link


Copy Markdown

ContributorAuthor
Removed asserts + moved supports_anchors_nonzero_fee_htlc_tx assert, diff here.
tankyleo
tankyleo
reviewed
Jun 6, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
@TheBlueMatt
TheBlueMatt
merged commit 0430b1e
into
lightningdevkit:mainJun 6, 2025
@wpaulino
wpaulino
removed their request for review
June 6, 2025 21:06
@bucko13bucko13
mentioned this pull request
Jun 16, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@wpaulinowpaulinowpaulino left review comments
@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@tankyleotankyleotankyleo approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

5 participants

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