[Splicing] Partial, handle splice_init & splice_ack messages #3407

optout21 · 2024-11-13T14:49:22Z

Handle splice_init & splice_ack messages, without performing splicing. splice_init does not error, but splice_ack returns an error (and neither side continues with splicing).
One next piece for splicing #3298 .
This can come before #3137 .

lightning/src/ln/channelmanager.rs

lightning/src/ln/channel.rs

codecov · 2024-11-18T10:47:48Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.25%. Comparing base (0216d7d) to head (cd3c40b).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3407      +/-   ##
==========================================
+ Coverage   89.19%   89.25%   +0.05%     
==========================================
  Files         152      152              
  Lines      118830   118841      +11     
  Branches   118830   118841      +11     
==========================================
+ Hits       105993   106066      +73     
+ Misses      10252    10201      -51     
+ Partials     2585     2574      -11

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

lightning/src/ln/channel.rs

lightning/src/ln/channelmanager.rs

lightning/src/ln/channel.rs

lightning/src/ln/channelmanager.rs

lightning/src/ln/channel.rs

lightning/src/ln/channelmanager.rs

optout21 · 2024-11-20T12:02:58Z

I have reorganized code, moved most single-channel checks and handling logic into Channel struct from ChannelManager.

lightning/src/ln/channel.rs

optout21 · 2024-11-20T21:41:50Z

Rebased (post #3137) and squashed

lightning/src/ln/channel.rs

lightning/src/ln/channelmanager.rs

lightning/src/ln/channel.rs

lightning/src/ln/channelmanager.rs

lightning/src/ln/channel.rs

optout21 · 2024-12-05T17:42:44Z

Rebased and squashed
~~TODO: Fix linting issue~~

lightning/src/ln/channel.rs

lightning/src/ln/channelmanager.rs

optout21 · 2025-03-04T21:08:01Z

Review comments from @wpaulino addressed.

jkczyz

Mostly minor comments and nits, but note that one introduced test is broken.

lightning/src/ln/channelmanager.rs

lightning/src/ln/channel.rs

lightning/src/ln/functional_tests_splice.rs

lightning/src/ln/channel.rs

jkczyz

LGTM. @wpaulino Good to squash the fixups?

optout21 · 2025-03-05T21:05:42Z

Squashed into a single commit, prepared for merging.

jkczyz

Still waiting on CI to start... :(

optout21 · 2025-03-06T08:37:26Z

Somehow CI got mixed up, showing failures for earlier commit... I'm not sure how to re-trigger.

Commit ID is different. I know the issue being reported (conflict caused by #3016) but fixed previously.

optout21 · 2025-03-06T08:38:33Z

Did a commit amend & force push, let's see CI's response...

optout21 · 2025-03-06T12:56:21Z

For some reason (which I don't understand), when in the CI this PR branch is merged onto current main, a bunch of previous rebase merges get reverted, and compilation fails. Even though the PR branch was rebased to recent and has no conflicts. I have recreated the commit completely anew, hopefully this helps.

jkczyz · 2025-03-06T16:41:01Z

For some reason (which I don't understand), when in the CI this PR branch is merged onto current main, a bunch of previous rebase merges get reverted, and compilation fails. Even though the PR branch was rebased to recent and has no conflicts. I have recreated the commit completely anew, hopefully this helps.

Github shows that your branch is 33 commits behind. If I rebase your PR on upstream main, I can reproduce the CI failure with RUSTFLAGS="--cfg=splicing" cargo +1.63.0 check -p lightning. Seems you need to account for #3594.

Handle the initial splice negotiation, without continuing to transaction negotiation: - `splice_channel()` for initiating splicing - handling of `splice_init` and `splice_ack` messages, with checks - `splice_ack` always fails (use case still imcomplete) - A test to go through the use case (`test_v1_splice_in`)

jkczyz · 2025-03-06T19:04:25Z

Github shows that your branch is 33 commits behind. If I rebase your PR on upstream main, I can reproduce the CI failure with RUSTFLAGS="--cfg=splicing" cargo +1.63.0 check -p lightning. Seems you need to account for #3594.

Rebased and fixed the compilation error locally. CI running now.

optout21 requested a review from jkczyz November 13, 2024 14:52

jkczyz reviewed Nov 13, 2024

View reviewed changes

optout21 force-pushed the splice-init branch from 3a3ff71 to b85a9d7 Compare November 13, 2024 21:18

optout21 mentioned this pull request Nov 13, 2024

Dual-funded channels and Splicing Project Tracking #1621

Open

6 tasks

optout21 commented Nov 14, 2024

View reviewed changes

lightning/src/ln/channel.rs Outdated Show resolved Hide resolved

optout21 force-pushed the splice-init branch from 6ac5f01 to e274887 Compare November 18, 2024 10:39

optout21 changed the title ~~[Draft, Splicing] Partly handle splice_init & splice_ack messages~~ [Splicing] Partly handle splice_init & splice_ack messages Nov 18, 2024

optout21 force-pushed the splice-init branch 2 times, most recently from 19f8ab8 to 4ee3735 Compare November 18, 2024 11:02

optout21 marked this pull request as ready for review November 18, 2024 11:03

optout21 requested a review from jkczyz November 18, 2024 11:44

jkczyz reviewed Nov 19, 2024

View reviewed changes

optout21 force-pushed the splice-init branch from fd61390 to 6ee1aee Compare November 19, 2024 15:04

jkczyz reviewed Nov 19, 2024

View reviewed changes

optout21 force-pushed the splice-init branch from bb3b4de to 8e5e331 Compare November 20, 2024 19:37

jkczyz reviewed Nov 20, 2024

View reviewed changes

lightning/src/ln/channel.rs Outdated Show resolved Hide resolved

optout21 force-pushed the splice-init branch from 9bbdf58 to b1ba24b Compare November 20, 2024 21:39

optout21 requested a review from jkczyz November 21, 2024 10:34

jkczyz reviewed Nov 22, 2024

View reviewed changes

lightning/src/ln/channel.rs Outdated Show resolved Hide resolved

lightning/src/ln/channelmanager.rs Outdated Show resolved Hide resolved

lightning/src/ln/channelmanager.rs Outdated Show resolved Hide resolved

lightning/src/ln/channelmanager.rs Outdated Show resolved Hide resolved

optout21 force-pushed the splice-init branch from fb4968c to 9ffe4b1 Compare November 26, 2024 12:32

optout21 requested a review from jkczyz November 26, 2024 12:32

jkczyz reviewed Nov 27, 2024

View reviewed changes

lightning/src/ln/channel.rs Outdated Show resolved Hide resolved

lightning/src/ln/channelmanager.rs Outdated Show resolved Hide resolved

lightning/src/ln/channel.rs Outdated Show resolved Hide resolved

optout21 changed the title ~~[Splicing] Partly handle splice_init & splice_ack messages~~ [Splicing] Partlial, handle splice_init & splice_ack messages Dec 5, 2024

optout21 force-pushed the splice-init branch from a505ba8 to 6a2f344 Compare December 5, 2024 09:24

optout21 mentioned this pull request Dec 5, 2024

[Draft][Splicing] Partial, perform interactive transaction negotiation for new funding #3444

Draft

optout21 force-pushed the splice-init branch from 6a2f344 to c92be83 Compare December 5, 2024 17:41

wpaulino reviewed Mar 4, 2025

View reviewed changes

optout21 requested a review from wpaulino March 4, 2025 21:08

jkczyz reviewed Mar 4, 2025

View reviewed changes

optout21 force-pushed the splice-init branch 2 times, most recently from 9e9045c to b7c2d45 Compare March 4, 2025 22:54

optout21 requested a review from jkczyz March 4, 2025 22:58

optout21 force-pushed the splice-init branch from b7c2d45 to 637111c Compare March 4, 2025 23:11

jkczyz reviewed Mar 5, 2025

View reviewed changes

optout21 force-pushed the splice-init branch from 637111c to dc85194 Compare March 5, 2025 21:04

wpaulino previously approved these changes Mar 5, 2025

View reviewed changes

jkczyz previously approved these changes Mar 5, 2025

View reviewed changes

optout21 force-pushed the splice-init branch from dc85194 to d485e84 Compare March 6, 2025 08:38

optout21 force-pushed the splice-init branch from d485e84 to b0fd371 Compare March 6, 2025 12:53

dunxen self-requested a review March 6, 2025 15:17

jkczyz dismissed stale reviews from wpaulino and themself via dc3ab7b March 6, 2025 19:00

jkczyz force-pushed the splice-init branch from b0fd371 to dc3ab7b Compare March 6, 2025 19:00

jkczyz requested a review from wpaulino March 6, 2025 19:02

jkczyz approved these changes Mar 6, 2025

View reviewed changes

wpaulino approved these changes Mar 7, 2025

View reviewed changes

jkczyz merged commit 4c43a5b into lightningdevkit:main Mar 7, 2025
25 of 27 checks passed

optout21 mentioned this pull request Mar 8, 2025

Dual funding extension, needed also for splicing: begin_interactive_funding_tx_construction #3443

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Splicing] Partial, handle splice_init & splice_ack messages #3407

[Splicing] Partial, handle splice_init & splice_ack messages #3407

optout21 commented Nov 13, 2024 •

edited

Loading

codecov bot commented Nov 18, 2024 •

edited

Loading

optout21 commented Nov 20, 2024

optout21 commented Nov 20, 2024

optout21 commented Dec 5, 2024 •

edited

Loading

optout21 commented Mar 4, 2025

jkczyz left a comment

jkczyz left a comment

optout21 commented Mar 5, 2025

jkczyz left a comment

optout21 commented Mar 6, 2025 •

edited

Loading

optout21 commented Mar 6, 2025

optout21 commented Mar 6, 2025

jkczyz commented Mar 6, 2025

jkczyz commented Mar 6, 2025

[Splicing] Partial, handle splice_init & splice_ack messages #3407

[Splicing] Partial, handle splice_init & splice_ack messages #3407

Conversation

optout21 commented Nov 13, 2024 • edited Loading

codecov bot commented Nov 18, 2024 • edited Loading

Codecov Report

optout21 commented Nov 20, 2024

optout21 commented Nov 20, 2024

optout21 commented Dec 5, 2024 • edited Loading

optout21 commented Mar 4, 2025

jkczyz left a comment

Choose a reason for hiding this comment

jkczyz left a comment

Choose a reason for hiding this comment

optout21 commented Mar 5, 2025

jkczyz left a comment

Choose a reason for hiding this comment

optout21 commented Mar 6, 2025 • edited Loading

optout21 commented Mar 6, 2025

optout21 commented Mar 6, 2025

jkczyz commented Mar 6, 2025

jkczyz commented Mar 6, 2025

optout21 commented Nov 13, 2024 •

edited

Loading

codecov bot commented Nov 18, 2024 •

edited

Loading

optout21 commented Dec 5, 2024 •

edited

Loading

optout21 commented Mar 6, 2025 •

edited

Loading