Skip to content

Backport 4234 to 0.2#4239

Merged
TheBlueMatt merged 2 commits intolightningdevkit:0.2from
benthecarman:0.2-4234
Dec 2, 2025
Merged

Backport 4234 to 0.2#4239
TheBlueMatt merged 2 commits intolightningdevkit:0.2from
benthecarman:0.2-4234

Conversation

@benthecarman
Copy link
Contributor

@benthecarman benthecarman commented Nov 21, 2025

Backports #4234

@ldk-reviews-bot
Copy link

ldk-reviews-bot commented Nov 21, 2025 •
edited
Loading

I've assigned @wpaulino as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@codecov
Copy link

codecov bot commented Nov 21, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 69.04762% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 88.86%. Comparing base (a20e68d) to head (0075d5a).
⚠️ Report is 3 commits behind head on 0.2.

Files with missing lines Patch % Lines
lightning/src/ln/channel_state.rs 46.66% 8 Missing ⚠️
lightning/src/routing/router.rs 50.00% 4 Missing ⚠️
lightning/src/ln/channelmanager.rs 75.00% 1 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##              0.2    #4239      +/-   ##
==========================================
+ Coverage   88.85%   88.86%   +0.01%     
==========================================
  Files         180      180              
  Lines      138003   138042      +39     
  Branches   138003   138042      +39     
==========================================
+ Hits       122619   122675      +56     
+ Misses      12562    12551      -11     
+ Partials     2822     2816       -6
Flag Coverage Δ
fuzzing 21.44% <46.66%> (+0.59%) ⬆️
tests 88.71% <69.04%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

wpaulino
wpaulino approved these changes Nov 21, 2025
View reviewed changes
Copy link
Contributor

@wpaulino wpaulino left a comment

Choose a reason for hiding this comment

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

@TheBlueMatt up to you if you want to include it this late in the cycle

@ldk-reviews-bot
Copy link

ldk-reviews-bot commented Nov 21, 2025

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

tnull
tnull reviewed Nov 24, 2025
View reviewed changes
Copy link
Contributor

@tnull tnull left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Seems this needs a rebase.

Also, I want to note that this breaks SemVer rules as adding new fields to enum variants are considered major changes.

So not sure we can/should actually land this in a patch release?

@wpaulino
Copy link
Contributor

wpaulino commented Nov 24, 2025

This is not meant to go in a patch release as 0.2 does not have a final release yet.

@TheBlueMatt
Copy link
Collaborator

TheBlueMatt commented Dec 1, 2025

Please include the suffix we generally include in backported commits - add Backport of original-commit-sha to the end and note any conflicts which had to be resolved.

@benthecarman
Add funding redeem script to ChannelDetails and ChannelPending event
656e89e 
Original context and motivation comes from here: lightningdevkit/ldk-node#677 (comment)

When splicing-in, the default case is our channel utxo + our wallet utxos
being combined. This works great however, it can give our wallet issues
calculating fees after the fact because our wallet needs to know about
our channel's utxo. We currently have it's outpoint and satoshi value
available, but not its output script so we are unable to construct the
TxOut for the channel. This adds the redeem script to the
`ChannelDetails` and `ChannelPending` event which gives us enough
information to be able to construct it.

Backport of add202e
@benthecarman
Add funding redeem script to `SplicePending' event
0075d5a 
Backport of e3ebe7a
@benthecarman
Copy link
Contributor Author

benthecarman commented Dec 1, 2025 •
edited
Loading

Please include the suffix we generally include in backported commits - add Backport of original-commit-sha to the end and note any conflicts which had to be resolved.

rebased and done, there were no conflicts

@TheBlueMatt TheBlueMatt merged commit a16bec0 into lightningdevkit:0.2 Dec 2, 2025
25 checks passed
@TheBlueMatt TheBlueMatt mentioned this pull request Dec 2, 2025
Merged
@benthecarman benthecarman deleted the 0.2-4234 branch December 2, 2025 16:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tnull tnull tnull left review comments

@TheBlueMatt TheBlueMatt TheBlueMatt approved these changes

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

@benthecarman @ldk-reviews-bot @wpaulino @TheBlueMatt @tnull