Reintroduce cfg(dual_funding) for handling of open_channel2 messages by dunxen · Pull Request #3485 · lightningdevkit/rust-lightning

dunxen · 2024-12-13T09:00:54Z

There is still some work to be done here (like #3423) and it probably makes sense to release this (around v0.2) with the ability to open V2 channels too. This would also make our functional tests for dual-funding more complete.

codecov · 2024-12-13T09:32:24Z

Codecov Report

Attention: Patch coverage is 61.90476% with 8 lines in your changes missing coverage. Please review.

Project coverage is 90.17%. Comparing base (6e85a0d) to head (76608f7).
Report is 30 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channel.rs	25.00%	3 Missing ⚠️
lightning/src/ln/channelmanager.rs	78.57%	3 Missing ⚠️
lightning/src/ln/peer_handler.rs	33.33%	2 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3485 +/- ##
==========================================
+ Coverage 89.71% 90.17% +0.45% 
==========================================
Files 130 129 -1 Lines 107625 114866 +7241 Branches 107625 114866 +7241 ==========================================
+ Hits 96553 103576 +7023 - Misses 8672 8998 +326 + Partials 2400 2292 -108

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

optout21 · 2024-12-14T15:54:40Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

TheBlueMatt

LGTM except we need to remove features.set_dual_fund_optional(); in provided_init_features too.

We will not support accepting V2 channels in the v0.1 release, but we do need to document the API change for push_msats -> channel_negotiation_type.

dunxen · 2024-12-16T04:08:51Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

So here I've been quite conservative and have only cfg flagged the parts (message handling) that are definitely just for dual-funding, and which splicing shouldn't be using. If that's not the case then would you mind introducing the any logic again?

TheBlueMatt

Thanks.

TheBlueMatt · 2024-12-16T17:45:14Z

 },
- wire::Message::OpenChannelV2(msg) => {
- self.message_handler.chan_handler.handle_open_channel_v2(their_node_id, &msg);
+ wire::Message::OpenChannelV2(_msg) => {


Ha, this doesn't seem required :)

Oh yup. Ended up removing the cfg flag in the branch...

dunxen · 2024-12-13T09:00:54Z

There is still some work to be done here (like #3423) and it probably makes sense to release this (around v0.2) with the ability to open V2 channels too. This would also make our functional tests for dual-funding more complete.

codecov · 2024-12-13T09:32:24Z

Codecov Report

Attention: Patch coverage is 61.90476% with 8 lines in your changes missing coverage. Please review.

Project coverage is 90.17%. Comparing base (6e85a0d) to head (76608f7).
Report is 30 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channel.rs	25.00%	3 Missing ⚠️
lightning/src/ln/channelmanager.rs	78.57%	3 Missing ⚠️
lightning/src/ln/peer_handler.rs	33.33%	2 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3485 +/- ##
==========================================
+ Coverage 89.71% 90.17% +0.45% 
==========================================
Files 130 129 -1 Lines 107625 114866 +7241 Branches 107625 114866 +7241 ==========================================
+ Hits 96553 103576 +7023 - Misses 8672 8998 +326 + Partials 2400 2292 -108

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

optout21 · 2024-12-14T15:54:40Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

TheBlueMatt

LGTM except we need to remove features.set_dual_fund_optional(); in provided_init_features too.

We will not support accepting V2 channels in the v0.1 release, but we do need to document the API change for push_msats -> channel_negotiation_type.

dunxen · 2024-12-16T04:08:51Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

So here I've been quite conservative and have only cfg flagged the parts (message handling) that are definitely just for dual-funding, and which splicing shouldn't be using. If that's not the case then would you mind introducing the any logic again?

TheBlueMatt

Thanks.

TheBlueMatt · 2024-12-16T17:45:14Z

 },
- wire::Message::OpenChannelV2(msg) => {
- self.message_handler.chan_handler.handle_open_channel_v2(their_node_id, &msg);
+ wire::Message::OpenChannelV2(_msg) => {


Ha, this doesn't seem required :)

Oh yup. Ended up removing the cfg flag in the branch...

dunxen · 2024-12-13T09:00:54Z

There is still some work to be done here (like #3423) and it probably makes sense to release this (around v0.2) with the ability to open V2 channels too. This would also make our functional tests for dual-funding more complete.

codecov · 2024-12-13T09:32:24Z

Codecov Report

Attention: Patch coverage is 61.90476% with 8 lines in your changes missing coverage. Please review.

Project coverage is 90.17%. Comparing base (6e85a0d) to head (76608f7).
Report is 30 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channel.rs	25.00%	3 Missing ⚠️
lightning/src/ln/channelmanager.rs	78.57%	3 Missing ⚠️
lightning/src/ln/peer_handler.rs	33.33%	2 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3485 +/- ##
==========================================
+ Coverage 89.71% 90.17% +0.45% 
==========================================
Files 130 129 -1 Lines 107625 114866 +7241 Branches 107625 114866 +7241 ==========================================
+ Hits 96553 103576 +7023 - Misses 8672 8998 +326 + Partials 2400 2292 -108

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

optout21 · 2024-12-14T15:54:40Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

TheBlueMatt

LGTM except we need to remove features.set_dual_fund_optional(); in provided_init_features too.

We will not support accepting V2 channels in the v0.1 release, but we do need to document the API change for push_msats -> channel_negotiation_type.

dunxen · 2024-12-16T04:08:51Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

So here I've been quite conservative and have only cfg flagged the parts (message handling) that are definitely just for dual-funding, and which splicing shouldn't be using. If that's not the case then would you mind introducing the any logic again?

TheBlueMatt

Thanks.

TheBlueMatt · 2024-12-16T17:45:14Z

 },
- wire::Message::OpenChannelV2(msg) => {
- self.message_handler.chan_handler.handle_open_channel_v2(their_node_id, &msg);
+ wire::Message::OpenChannelV2(_msg) => {


Ha, this doesn't seem required :)

Oh yup. Ended up removing the cfg flag in the branch...

dunxen · 2024-12-13T09:00:54Z

There is still some work to be done here (like #3423) and it probably makes sense to release this (around v0.2) with the ability to open V2 channels too. This would also make our functional tests for dual-funding more complete.

codecov · 2024-12-13T09:32:24Z

Codecov Report

Attention: Patch coverage is 61.90476% with 8 lines in your changes missing coverage. Please review.

Project coverage is 90.17%. Comparing base (6e85a0d) to head (76608f7).
Report is 30 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channel.rs	25.00%	3 Missing ⚠️
lightning/src/ln/channelmanager.rs	78.57%	3 Missing ⚠️
lightning/src/ln/peer_handler.rs	33.33%	2 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3485 +/- ##
==========================================
+ Coverage 89.71% 90.17% +0.45% 
==========================================
Files 130 129 -1 Lines 107625 114866 +7241 Branches 107625 114866 +7241 ==========================================
+ Hits 96553 103576 +7023 - Misses 8672 8998 +326 + Partials 2400 2292 -108

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

optout21 · 2024-12-14T15:54:40Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

TheBlueMatt

LGTM except we need to remove features.set_dual_fund_optional(); in provided_init_features too.

We will not support accepting V2 channels in the v0.1 release, but we do need to document the API change for push_msats -> channel_negotiation_type.

dunxen · 2024-12-16T04:08:51Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

So here I've been quite conservative and have only cfg flagged the parts (message handling) that are definitely just for dual-funding, and which splicing shouldn't be using. If that's not the case then would you mind introducing the any logic again?

TheBlueMatt

Thanks.

TheBlueMatt · 2024-12-16T17:45:14Z

 },
- wire::Message::OpenChannelV2(msg) => {
- self.message_handler.chan_handler.handle_open_channel_v2(their_node_id, &msg);
+ wire::Message::OpenChannelV2(_msg) => {


Ha, this doesn't seem required :)

Oh yup. Ended up removing the cfg flag in the branch...

dunxen · 2024-12-13T09:00:54Z

There is still some work to be done here (like #3423) and it probably makes sense to release this (around v0.2) with the ability to open V2 channels too. This would also make our functional tests for dual-funding more complete.

codecov · 2024-12-13T09:32:24Z

Codecov Report

Attention: Patch coverage is 61.90476% with 8 lines in your changes missing coverage. Please review.

Project coverage is 90.17%. Comparing base (6e85a0d) to head (76608f7).
Report is 30 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channel.rs	25.00%	3 Missing ⚠️
lightning/src/ln/channelmanager.rs	78.57%	3 Missing ⚠️
lightning/src/ln/peer_handler.rs	33.33%	2 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3485 +/- ##
==========================================
+ Coverage 89.71% 90.17% +0.45% 
==========================================
Files 130 129 -1 Lines 107625 114866 +7241 Branches 107625 114866 +7241 ==========================================
+ Hits 96553 103576 +7023 - Misses 8672 8998 +326 + Partials 2400 2292 -108

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

optout21 · 2024-12-14T15:54:40Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

TheBlueMatt

LGTM except we need to remove features.set_dual_fund_optional(); in provided_init_features too.

We will not support accepting V2 channels in the v0.1 release, but we do need to document the API change for push_msats -> channel_negotiation_type.

dunxen · 2024-12-16T04:08:51Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

So here I've been quite conservative and have only cfg flagged the parts (message handling) that are definitely just for dual-funding, and which splicing shouldn't be using. If that's not the case then would you mind introducing the any logic again?

TheBlueMatt

Thanks.

TheBlueMatt · 2024-12-16T17:45:14Z

 },
- wire::Message::OpenChannelV2(msg) => {
- self.message_handler.chan_handler.handle_open_channel_v2(their_node_id, &msg);
+ wire::Message::OpenChannelV2(_msg) => {


Ha, this doesn't seem required :)

Oh yup. Ended up removing the cfg flag in the branch...

dunxen · 2024-12-13T09:00:54Z

There is still some work to be done here (like #3423) and it probably makes sense to release this (around v0.2) with the ability to open V2 channels too. This would also make our functional tests for dual-funding more complete.

codecov · 2024-12-13T09:32:24Z

Codecov Report

Attention: Patch coverage is 61.90476% with 8 lines in your changes missing coverage. Please review.

Project coverage is 90.17%. Comparing base (6e85a0d) to head (76608f7).
Report is 30 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channel.rs	25.00%	3 Missing ⚠️
lightning/src/ln/channelmanager.rs	78.57%	3 Missing ⚠️
lightning/src/ln/peer_handler.rs	33.33%	2 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3485 +/- ##
==========================================
+ Coverage 89.71% 90.17% +0.45% 
==========================================
Files 130 129 -1 Lines 107625 114866 +7241 Branches 107625 114866 +7241 ==========================================
+ Hits 96553 103576 +7023 - Misses 8672 8998 +326 + Partials 2400 2292 -108

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

optout21 · 2024-12-14T15:54:40Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

TheBlueMatt

LGTM except we need to remove features.set_dual_fund_optional(); in provided_init_features too.

We will not support accepting V2 channels in the v0.1 release, but we do need to document the API change for push_msats -> channel_negotiation_type.

dunxen · 2024-12-16T04:08:51Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

So here I've been quite conservative and have only cfg flagged the parts (message handling) that are definitely just for dual-funding, and which splicing shouldn't be using. If that's not the case then would you mind introducing the any logic again?

TheBlueMatt

Thanks.

TheBlueMatt · 2024-12-16T17:45:14Z

 },
- wire::Message::OpenChannelV2(msg) => {
- self.message_handler.chan_handler.handle_open_channel_v2(their_node_id, &msg);
+ wire::Message::OpenChannelV2(_msg) => {


Ha, this doesn't seem required :)

Oh yup. Ended up removing the cfg flag in the branch...

dunxen · 2024-12-13T09:00:54Z

There is still some work to be done here (like #3423) and it probably makes sense to release this (around v0.2) with the ability to open V2 channels too. This would also make our functional tests for dual-funding more complete.

codecov · 2024-12-13T09:32:24Z

Codecov Report

Attention: Patch coverage is 61.90476% with 8 lines in your changes missing coverage. Please review.

Project coverage is 90.17%. Comparing base (6e85a0d) to head (76608f7).
Report is 30 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channel.rs	25.00%	3 Missing ⚠️
lightning/src/ln/channelmanager.rs	78.57%	3 Missing ⚠️
lightning/src/ln/peer_handler.rs	33.33%	2 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3485 +/- ##
==========================================
+ Coverage 89.71% 90.17% +0.45% 
==========================================
Files 130 129 -1 Lines 107625 114866 +7241 Branches 107625 114866 +7241 ==========================================
+ Hits 96553 103576 +7023 - Misses 8672 8998 +326 + Partials 2400 2292 -108

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

optout21 · 2024-12-14T15:54:40Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

TheBlueMatt

LGTM except we need to remove features.set_dual_fund_optional(); in provided_init_features too.

We will not support accepting V2 channels in the v0.1 release, but we do need to document the API change for push_msats -> channel_negotiation_type.

dunxen · 2024-12-16T04:08:51Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

So here I've been quite conservative and have only cfg flagged the parts (message handling) that are definitely just for dual-funding, and which splicing shouldn't be using. If that's not the case then would you mind introducing the any logic again?

TheBlueMatt

Thanks.

TheBlueMatt · 2024-12-16T17:45:14Z

 },
- wire::Message::OpenChannelV2(msg) => {
- self.message_handler.chan_handler.handle_open_channel_v2(their_node_id, &msg);
+ wire::Message::OpenChannelV2(_msg) => {


Ha, this doesn't seem required :)

Oh yup. Ended up removing the cfg flag in the branch...

dunxen · 2024-12-13T09:00:54Z

There is still some work to be done here (like #3423) and it probably makes sense to release this (around v0.2) with the ability to open V2 channels too. This would also make our functional tests for dual-funding more complete.

codecov · 2024-12-13T09:32:24Z

Codecov Report

Attention: Patch coverage is 61.90476% with 8 lines in your changes missing coverage. Please review.

Project coverage is 90.17%. Comparing base (6e85a0d) to head (76608f7).
Report is 30 commits behind head on main.

Files with missing lines	Patch %	Lines
lightning/src/ln/channel.rs	25.00%	3 Missing ⚠️
lightning/src/ln/channelmanager.rs	78.57%	3 Missing ⚠️
lightning/src/ln/peer_handler.rs	33.33%	2 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #3485 +/- ##
==========================================
+ Coverage 89.71% 90.17% +0.45% 
==========================================
Files 130 129 -1 Lines 107625 114866 +7241 Branches 107625 114866 +7241 ==========================================
+ Hits 96553 103576 +7023 - Misses 8672 8998 +326 + Partials 2400 2292 -108

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

optout21 · 2024-12-14T15:54:40Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

TheBlueMatt

LGTM except we need to remove features.set_dual_fund_optional(); in provided_init_features too.

We will not support accepting V2 channels in the v0.1 release, but we do need to document the API change for push_msats -> channel_negotiation_type.

dunxen · 2024-12-16T04:08:51Z

Note: previously splicing branches used cfg(any(dual_funding, splicing)) for the dual funding code; if at that time dual_funding flag still exist, this will have to be done in #3444 .

So here I've been quite conservative and have only cfg flagged the parts (message handling) that are definitely just for dual-funding, and which splicing shouldn't be using. If that's not the case then would you mind introducing the any logic again?

TheBlueMatt

Thanks.

TheBlueMatt · 2024-12-16T17:45:14Z

 },
- wire::Message::OpenChannelV2(msg) => {
- self.message_handler.chan_handler.handle_open_channel_v2(their_node_id, &msg);
+ wire::Message::OpenChannelV2(_msg) => {


Ha, this doesn't seem required :)

Oh yup. Ended up removing the cfg flag in the branch...

dunxen added this to the 0.1 milestone Dec 13, 2024

dunxen marked this pull request as draft December 13, 2024 09:14

dunxen force-pushed the 2024-12-cfgflagdualfunding branch from 490b2ac to d67c00aCompare December 13, 2024 09:23

dunxen force-pushed the 2024-12-cfgflagdualfunding branch from d67c00a to e774784Compare December 13, 2024 09:56

dunxen marked this pull request as ready for review December 13, 2024 10:01

dunxen force-pushed the 2024-12-cfgflagdualfunding branch from e774784 to e8cf37eCompare December 13, 2024 17:39

jkczyz self-requested a review December 13, 2024 17:45

TheBlueMatt reviewed Dec 13, 2024
View reviewed changes

Comment threadlightning/src/ln/msgs.rs Outdated

TheBlueMatt reviewed Dec 13, 2024
View reviewed changes

Comment threadpending_changelog/3137-accept-dual-funding-without-contributing.txt

dunxen force-pushed the 2024-12-cfgflagdualfunding branch from e8cf37e to e5f6e4eCompare December 14, 2024 06:32

TheBlueMatt reviewed Dec 16, 2024
View reviewed changes

dunxen added 2 commits December 16, 2024 06:06

Reintroduce cfg(dual_funding) for handling of open_channel2 messages
6f8328e

Modify release notes for PR 3137
76608f7
We will not support accepting V2 channels in the v0.1 release, but we do need to document the API change for push_msats -> channel_negotiation_type.

dunxen force-pushed the 2024-12-cfgflagdualfunding branch from e5f6e4e to 76608f7Compare December 16, 2024 04:08

TheBlueMatt linked an issue Dec 16, 2024 that may be closed by this pull request
(Temporary) Disable v2 opens #3451
Closed

TheBlueMatt approved these changes Dec 16, 2024
View reviewed changes

TheBlueMatt merged commit f53a09d into lightningdevkit:mainDec 16, 2024

dunxen mentioned this pull request Jan 9, 2025
Refactor ChannelPhase variants from ChannelManager#3513
Merged

dunxen deleted the 2024-12-cfgflagdualfunding branch January 20, 2025 08:32