Add funding redeem script to ChannelDetails and ChannelPending event - #4234

Merged
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials
Nov 21, 2025
Merged

Add funding redeem script to ChannelDetails and ChannelPending event#4234
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials

Conversation

@benthecarman

@benthecarmanbenthecarman commented Nov 19, 2025

Copy link
Copy Markdown
Contributor

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.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 19, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @jkczyz 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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 4 times, most recently from b2f8584 to 1c29113CompareNovember 19, 2025 16:24

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

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
@ldk-reviews-bot

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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from 1c29113 to 436dc4bCompareNovember 19, 2025 16:42
@codecov

codecovBot commented Nov 19, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 69.04762% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.32%. Comparing base (6d9c676) to head (e3ebe7a).
⚠️ Report is 3 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel_state.rs46.66%8 Missing ⚠️
lightning/src/routing/router.rs50.00%4 Missing ⚠️
lightning/src/ln/channelmanager.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4234 +/- ##
==========================================
- Coverage 89.32% 89.32% -0.01% 
==========================================
Files 180 180 Lines 138641 138680 +39 Branches 138641 138680 +39 ==========================================
+ Hits 123844 123877 +33 - Misses 12174 12179 +5 - Partials 2623 2624 +1 
FlagCoverage Δ
fuzzing35.97% <46.66%> (+<0.01%)⬆️
tests88.69% <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.

jkczyz
jkczyz previously approved these changes Nov 19, 2025

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

As noted in lightningdevkit/ldk-node#677 (comment), we should include this in SplicePending, too, since subsequent splices will spend the new funding output. Feel free to do it in a follow-up if you prefer.

@benthecarman

Copy link
Copy Markdown
ContributorAuthor

Added to the SplicePending event

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines +6492 to +6494
new_funding_redeem_script: chan
.funding
.get_funding_redeemscript(),

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.

This will still be the old funding until the splice is promoted. You'll need to communicate it through SpliceFundingNegotiated.

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

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 2 times, most recently from e0c0b62 to 5b5c8d6CompareNovember 19, 2025 20:06
jkczyz
jkczyz previously approved these changes Nov 19, 2025
channel_type: Option<ChannelTypeFeatures>,
/// The witness script that can be used to spend the funding output for this channel.
///
/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.

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.

Sounds like this won't make 0.2 but feel free to petition @TheBlueMatt :)

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

I'll be honest I'm pretty annoyed we're talking about changing the 0.2 API almost two months after we intended to ship it, but if we land this today maybe we still include it in 0.2.

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +453 to +482
@@ -475,6 +479,17 @@ impl ChannelDetails {
self.short_channel_id.or(self.outbound_scid_alias)
}

/// Gets the funding output for this channel, if available.

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 need docs on when it changes wrt a splice. When a splice happens at what point in the splice do these switch over to the new values?

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.

Added, looked through the code and seems it happens after the commitment signed messages were exchanged.

Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +484 to +485
/// During a splice, the funding output will change and this value will be updated
/// after the `commitment_signed` messages have been exchanged.

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.

Hmmm... this should only change when the splice has been promoted (i.e., when the FundingScope from the pending splice is swapped in for the current FundingScope). That happens after splice_locked has been exchanged.

core::mem::swap(&mutself.funding, funding);

Maybe you were looking at channel establishment?

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.

Oh I see, i think what I was looking at when that FundedChannel was being created/updated here:

self.phase = ChannelPhase::Funded(funded_channel);

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.
@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from c5428d2 to e3ebe7aCompareNovember 20, 2025 16:35
@jkczyz
jkczyz merged commit f325458 into lightningdevkit:mainNov 21, 2025
26 checks passed
@benthecarman
benthecarman deleted the redeem-script-channel-pending-detials branch November 21, 2025 04:11
@benthecarmanbenthecarman mentioned this pull request Nov 21, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4239.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@benthecarman@ldk-reviews-bot@TheBlueMatt@jkczyz
, '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

Add funding redeem script to ChannelDetails and ChannelPending event - #4234

Merged
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials
Nov 21, 2025
Merged

Add funding redeem script to ChannelDetails and ChannelPending event#4234
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials

Conversation

@benthecarman

@benthecarmanbenthecarman commented Nov 19, 2025

Copy link
Copy Markdown
Contributor

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.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 19, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @jkczyz 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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 4 times, most recently from b2f8584 to 1c29113CompareNovember 19, 2025 16:24

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

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
@ldk-reviews-bot

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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from 1c29113 to 436dc4bCompareNovember 19, 2025 16:42
@codecov

codecovBot commented Nov 19, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 69.04762% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.32%. Comparing base (6d9c676) to head (e3ebe7a).
⚠️ Report is 3 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel_state.rs46.66%8 Missing ⚠️
lightning/src/routing/router.rs50.00%4 Missing ⚠️
lightning/src/ln/channelmanager.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4234 +/- ##
==========================================
- Coverage 89.32% 89.32% -0.01% 
==========================================
Files 180 180 Lines 138641 138680 +39 Branches 138641 138680 +39 ==========================================
+ Hits 123844 123877 +33 - Misses 12174 12179 +5 - Partials 2623 2624 +1 
FlagCoverage Δ
fuzzing35.97% <46.66%> (+<0.01%)⬆️
tests88.69% <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.

jkczyz
jkczyz previously approved these changes Nov 19, 2025

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

As noted in lightningdevkit/ldk-node#677 (comment), we should include this in SplicePending, too, since subsequent splices will spend the new funding output. Feel free to do it in a follow-up if you prefer.

@benthecarman

Copy link
Copy Markdown
ContributorAuthor

Added to the SplicePending event

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines +6492 to +6494
new_funding_redeem_script: chan
.funding
.get_funding_redeemscript(),

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.

This will still be the old funding until the splice is promoted. You'll need to communicate it through SpliceFundingNegotiated.

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

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 2 times, most recently from e0c0b62 to 5b5c8d6CompareNovember 19, 2025 20:06
jkczyz
jkczyz previously approved these changes Nov 19, 2025
channel_type: Option<ChannelTypeFeatures>,
/// The witness script that can be used to spend the funding output for this channel.
///
/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.

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.

Sounds like this won't make 0.2 but feel free to petition @TheBlueMatt :)

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

I'll be honest I'm pretty annoyed we're talking about changing the 0.2 API almost two months after we intended to ship it, but if we land this today maybe we still include it in 0.2.

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +453 to +482
@@ -475,6 +479,17 @@ impl ChannelDetails {
self.short_channel_id.or(self.outbound_scid_alias)
}

/// Gets the funding output for this channel, if available.

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 need docs on when it changes wrt a splice. When a splice happens at what point in the splice do these switch over to the new values?

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.

Added, looked through the code and seems it happens after the commitment signed messages were exchanged.

Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +484 to +485
/// During a splice, the funding output will change and this value will be updated
/// after the `commitment_signed` messages have been exchanged.

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.

Hmmm... this should only change when the splice has been promoted (i.e., when the FundingScope from the pending splice is swapped in for the current FundingScope). That happens after splice_locked has been exchanged.

core::mem::swap(&mutself.funding, funding);

Maybe you were looking at channel establishment?

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.

Oh I see, i think what I was looking at when that FundedChannel was being created/updated here:

self.phase = ChannelPhase::Funded(funded_channel);

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.
@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from c5428d2 to e3ebe7aCompareNovember 20, 2025 16:35
@jkczyz
jkczyz merged commit f325458 into lightningdevkit:mainNov 21, 2025
26 checks passed
@benthecarman
benthecarman deleted the redeem-script-channel-pending-detials branch November 21, 2025 04:11
@benthecarmanbenthecarman mentioned this pull request Nov 21, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4239.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@benthecarman@ldk-reviews-bot@TheBlueMatt@jkczyz
, '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

Add funding redeem script to ChannelDetails and ChannelPending event - #4234

Merged
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials
Nov 21, 2025
Merged

Add funding redeem script to ChannelDetails and ChannelPending event#4234
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials

Conversation

@benthecarman

@benthecarmanbenthecarman commented Nov 19, 2025

Copy link
Copy Markdown
Contributor

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.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 19, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @jkczyz 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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 4 times, most recently from b2f8584 to 1c29113CompareNovember 19, 2025 16:24

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

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
@ldk-reviews-bot

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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from 1c29113 to 436dc4bCompareNovember 19, 2025 16:42
@codecov

codecovBot commented Nov 19, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 69.04762% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.32%. Comparing base (6d9c676) to head (e3ebe7a).
⚠️ Report is 3 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel_state.rs46.66%8 Missing ⚠️
lightning/src/routing/router.rs50.00%4 Missing ⚠️
lightning/src/ln/channelmanager.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4234 +/- ##
==========================================
- Coverage 89.32% 89.32% -0.01% 
==========================================
Files 180 180 Lines 138641 138680 +39 Branches 138641 138680 +39 ==========================================
+ Hits 123844 123877 +33 - Misses 12174 12179 +5 - Partials 2623 2624 +1 
FlagCoverage Δ
fuzzing35.97% <46.66%> (+<0.01%)⬆️
tests88.69% <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.

jkczyz
jkczyz previously approved these changes Nov 19, 2025

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

As noted in lightningdevkit/ldk-node#677 (comment), we should include this in SplicePending, too, since subsequent splices will spend the new funding output. Feel free to do it in a follow-up if you prefer.

@benthecarman

Copy link
Copy Markdown
ContributorAuthor

Added to the SplicePending event

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines +6492 to +6494
new_funding_redeem_script: chan
.funding
.get_funding_redeemscript(),

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.

This will still be the old funding until the splice is promoted. You'll need to communicate it through SpliceFundingNegotiated.

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

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 2 times, most recently from e0c0b62 to 5b5c8d6CompareNovember 19, 2025 20:06
jkczyz
jkczyz previously approved these changes Nov 19, 2025
channel_type: Option<ChannelTypeFeatures>,
/// The witness script that can be used to spend the funding output for this channel.
///
/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.

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.

Sounds like this won't make 0.2 but feel free to petition @TheBlueMatt :)

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

I'll be honest I'm pretty annoyed we're talking about changing the 0.2 API almost two months after we intended to ship it, but if we land this today maybe we still include it in 0.2.

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +453 to +482
@@ -475,6 +479,17 @@ impl ChannelDetails {
self.short_channel_id.or(self.outbound_scid_alias)
}

/// Gets the funding output for this channel, if available.

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 need docs on when it changes wrt a splice. When a splice happens at what point in the splice do these switch over to the new values?

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.

Added, looked through the code and seems it happens after the commitment signed messages were exchanged.

Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +484 to +485
/// During a splice, the funding output will change and this value will be updated
/// after the `commitment_signed` messages have been exchanged.

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.

Hmmm... this should only change when the splice has been promoted (i.e., when the FundingScope from the pending splice is swapped in for the current FundingScope). That happens after splice_locked has been exchanged.

core::mem::swap(&mutself.funding, funding);

Maybe you were looking at channel establishment?

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.

Oh I see, i think what I was looking at when that FundedChannel was being created/updated here:

self.phase = ChannelPhase::Funded(funded_channel);

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.
@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from c5428d2 to e3ebe7aCompareNovember 20, 2025 16:35
@jkczyz
jkczyz merged commit f325458 into lightningdevkit:mainNov 21, 2025
26 checks passed
@benthecarman
benthecarman deleted the redeem-script-channel-pending-detials branch November 21, 2025 04:11
@benthecarmanbenthecarman mentioned this pull request Nov 21, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4239.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@benthecarman@ldk-reviews-bot@TheBlueMatt@jkczyz
, '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

Add funding redeem script to ChannelDetails and ChannelPending event - #4234

Merged
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials
Nov 21, 2025
Merged

Add funding redeem script to ChannelDetails and ChannelPending event#4234
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials

Conversation

@benthecarman

@benthecarmanbenthecarman commented Nov 19, 2025

Copy link
Copy Markdown
Contributor

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.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 19, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @jkczyz 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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 4 times, most recently from b2f8584 to 1c29113CompareNovember 19, 2025 16:24

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

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
@ldk-reviews-bot

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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from 1c29113 to 436dc4bCompareNovember 19, 2025 16:42
@codecov

codecovBot commented Nov 19, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 69.04762% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.32%. Comparing base (6d9c676) to head (e3ebe7a).
⚠️ Report is 3 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel_state.rs46.66%8 Missing ⚠️
lightning/src/routing/router.rs50.00%4 Missing ⚠️
lightning/src/ln/channelmanager.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4234 +/- ##
==========================================
- Coverage 89.32% 89.32% -0.01% 
==========================================
Files 180 180 Lines 138641 138680 +39 Branches 138641 138680 +39 ==========================================
+ Hits 123844 123877 +33 - Misses 12174 12179 +5 - Partials 2623 2624 +1 
FlagCoverage Δ
fuzzing35.97% <46.66%> (+<0.01%)⬆️
tests88.69% <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.

jkczyz
jkczyz previously approved these changes Nov 19, 2025

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

As noted in lightningdevkit/ldk-node#677 (comment), we should include this in SplicePending, too, since subsequent splices will spend the new funding output. Feel free to do it in a follow-up if you prefer.

@benthecarman

Copy link
Copy Markdown
ContributorAuthor

Added to the SplicePending event

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines +6492 to +6494
new_funding_redeem_script: chan
.funding
.get_funding_redeemscript(),

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.

This will still be the old funding until the splice is promoted. You'll need to communicate it through SpliceFundingNegotiated.

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

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 2 times, most recently from e0c0b62 to 5b5c8d6CompareNovember 19, 2025 20:06
jkczyz
jkczyz previously approved these changes Nov 19, 2025
channel_type: Option<ChannelTypeFeatures>,
/// The witness script that can be used to spend the funding output for this channel.
///
/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.

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.

Sounds like this won't make 0.2 but feel free to petition @TheBlueMatt :)

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

I'll be honest I'm pretty annoyed we're talking about changing the 0.2 API almost two months after we intended to ship it, but if we land this today maybe we still include it in 0.2.

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +453 to +482
@@ -475,6 +479,17 @@ impl ChannelDetails {
self.short_channel_id.or(self.outbound_scid_alias)
}

/// Gets the funding output for this channel, if available.

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 need docs on when it changes wrt a splice. When a splice happens at what point in the splice do these switch over to the new values?

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.

Added, looked through the code and seems it happens after the commitment signed messages were exchanged.

Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +484 to +485
/// During a splice, the funding output will change and this value will be updated
/// after the `commitment_signed` messages have been exchanged.

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.

Hmmm... this should only change when the splice has been promoted (i.e., when the FundingScope from the pending splice is swapped in for the current FundingScope). That happens after splice_locked has been exchanged.

core::mem::swap(&mutself.funding, funding);

Maybe you were looking at channel establishment?

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.

Oh I see, i think what I was looking at when that FundedChannel was being created/updated here:

self.phase = ChannelPhase::Funded(funded_channel);

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.
@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from c5428d2 to e3ebe7aCompareNovember 20, 2025 16:35
@jkczyz
jkczyz merged commit f325458 into lightningdevkit:mainNov 21, 2025
26 checks passed
@benthecarman
benthecarman deleted the redeem-script-channel-pending-detials branch November 21, 2025 04:11
@benthecarmanbenthecarman mentioned this pull request Nov 21, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4239.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@benthecarman@ldk-reviews-bot@TheBlueMatt@jkczyz
, '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

Add funding redeem script to ChannelDetails and ChannelPending event - #4234

Merged
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials
Nov 21, 2025
Merged

Add funding redeem script to ChannelDetails and ChannelPending event#4234
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials

Conversation

@benthecarman

@benthecarmanbenthecarman commented Nov 19, 2025

Copy link
Copy Markdown
Contributor

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.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 19, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @jkczyz 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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 4 times, most recently from b2f8584 to 1c29113CompareNovember 19, 2025 16:24

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

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
@ldk-reviews-bot

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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from 1c29113 to 436dc4bCompareNovember 19, 2025 16:42
@codecov

codecovBot commented Nov 19, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 69.04762% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.32%. Comparing base (6d9c676) to head (e3ebe7a).
⚠️ Report is 3 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel_state.rs46.66%8 Missing ⚠️
lightning/src/routing/router.rs50.00%4 Missing ⚠️
lightning/src/ln/channelmanager.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4234 +/- ##
==========================================
- Coverage 89.32% 89.32% -0.01% 
==========================================
Files 180 180 Lines 138641 138680 +39 Branches 138641 138680 +39 ==========================================
+ Hits 123844 123877 +33 - Misses 12174 12179 +5 - Partials 2623 2624 +1 
FlagCoverage Δ
fuzzing35.97% <46.66%> (+<0.01%)⬆️
tests88.69% <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.

jkczyz
jkczyz previously approved these changes Nov 19, 2025

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

As noted in lightningdevkit/ldk-node#677 (comment), we should include this in SplicePending, too, since subsequent splices will spend the new funding output. Feel free to do it in a follow-up if you prefer.

@benthecarman

Copy link
Copy Markdown
ContributorAuthor

Added to the SplicePending event

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines +6492 to +6494
new_funding_redeem_script: chan
.funding
.get_funding_redeemscript(),

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.

This will still be the old funding until the splice is promoted. You'll need to communicate it through SpliceFundingNegotiated.

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

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 2 times, most recently from e0c0b62 to 5b5c8d6CompareNovember 19, 2025 20:06
jkczyz
jkczyz previously approved these changes Nov 19, 2025
channel_type: Option<ChannelTypeFeatures>,
/// The witness script that can be used to spend the funding output for this channel.
///
/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.

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.

Sounds like this won't make 0.2 but feel free to petition @TheBlueMatt :)

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

I'll be honest I'm pretty annoyed we're talking about changing the 0.2 API almost two months after we intended to ship it, but if we land this today maybe we still include it in 0.2.

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +453 to +482
@@ -475,6 +479,17 @@ impl ChannelDetails {
self.short_channel_id.or(self.outbound_scid_alias)
}

/// Gets the funding output for this channel, if available.

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 need docs on when it changes wrt a splice. When a splice happens at what point in the splice do these switch over to the new values?

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.

Added, looked through the code and seems it happens after the commitment signed messages were exchanged.

Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +484 to +485
/// During a splice, the funding output will change and this value will be updated
/// after the `commitment_signed` messages have been exchanged.

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.

Hmmm... this should only change when the splice has been promoted (i.e., when the FundingScope from the pending splice is swapped in for the current FundingScope). That happens after splice_locked has been exchanged.

core::mem::swap(&mutself.funding, funding);

Maybe you were looking at channel establishment?

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.

Oh I see, i think what I was looking at when that FundedChannel was being created/updated here:

self.phase = ChannelPhase::Funded(funded_channel);

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.
@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from c5428d2 to e3ebe7aCompareNovember 20, 2025 16:35
@jkczyz
jkczyz merged commit f325458 into lightningdevkit:mainNov 21, 2025
26 checks passed
@benthecarman
benthecarman deleted the redeem-script-channel-pending-detials branch November 21, 2025 04:11
@benthecarmanbenthecarman mentioned this pull request Nov 21, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4239.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@benthecarman@ldk-reviews-bot@TheBlueMatt@jkczyz
, '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

Add funding redeem script to ChannelDetails and ChannelPending event - #4234

Merged
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials
Nov 21, 2025
Merged

Add funding redeem script to ChannelDetails and ChannelPending event#4234
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials

Conversation

@benthecarman

@benthecarmanbenthecarman commented Nov 19, 2025

Copy link
Copy Markdown
Contributor

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.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 19, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @jkczyz 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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 4 times, most recently from b2f8584 to 1c29113CompareNovember 19, 2025 16:24

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

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
@ldk-reviews-bot

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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from 1c29113 to 436dc4bCompareNovember 19, 2025 16:42
@codecov

codecovBot commented Nov 19, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 69.04762% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.32%. Comparing base (6d9c676) to head (e3ebe7a).
⚠️ Report is 3 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel_state.rs46.66%8 Missing ⚠️
lightning/src/routing/router.rs50.00%4 Missing ⚠️
lightning/src/ln/channelmanager.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4234 +/- ##
==========================================
- Coverage 89.32% 89.32% -0.01% 
==========================================
Files 180 180 Lines 138641 138680 +39 Branches 138641 138680 +39 ==========================================
+ Hits 123844 123877 +33 - Misses 12174 12179 +5 - Partials 2623 2624 +1 
FlagCoverage Δ
fuzzing35.97% <46.66%> (+<0.01%)⬆️
tests88.69% <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.

jkczyz
jkczyz previously approved these changes Nov 19, 2025

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

As noted in lightningdevkit/ldk-node#677 (comment), we should include this in SplicePending, too, since subsequent splices will spend the new funding output. Feel free to do it in a follow-up if you prefer.

@benthecarman

Copy link
Copy Markdown
ContributorAuthor

Added to the SplicePending event

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines +6492 to +6494
new_funding_redeem_script: chan
.funding
.get_funding_redeemscript(),

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.

This will still be the old funding until the splice is promoted. You'll need to communicate it through SpliceFundingNegotiated.

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

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 2 times, most recently from e0c0b62 to 5b5c8d6CompareNovember 19, 2025 20:06
jkczyz
jkczyz previously approved these changes Nov 19, 2025
channel_type: Option<ChannelTypeFeatures>,
/// The witness script that can be used to spend the funding output for this channel.
///
/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.

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.

Sounds like this won't make 0.2 but feel free to petition @TheBlueMatt :)

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

I'll be honest I'm pretty annoyed we're talking about changing the 0.2 API almost two months after we intended to ship it, but if we land this today maybe we still include it in 0.2.

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +453 to +482
@@ -475,6 +479,17 @@ impl ChannelDetails {
self.short_channel_id.or(self.outbound_scid_alias)
}

/// Gets the funding output for this channel, if available.

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 need docs on when it changes wrt a splice. When a splice happens at what point in the splice do these switch over to the new values?

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.

Added, looked through the code and seems it happens after the commitment signed messages were exchanged.

Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +484 to +485
/// During a splice, the funding output will change and this value will be updated
/// after the `commitment_signed` messages have been exchanged.

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.

Hmmm... this should only change when the splice has been promoted (i.e., when the FundingScope from the pending splice is swapped in for the current FundingScope). That happens after splice_locked has been exchanged.

core::mem::swap(&mutself.funding, funding);

Maybe you were looking at channel establishment?

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.

Oh I see, i think what I was looking at when that FundedChannel was being created/updated here:

self.phase = ChannelPhase::Funded(funded_channel);

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.
@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from c5428d2 to e3ebe7aCompareNovember 20, 2025 16:35
@jkczyz
jkczyz merged commit f325458 into lightningdevkit:mainNov 21, 2025
26 checks passed
@benthecarman
benthecarman deleted the redeem-script-channel-pending-detials branch November 21, 2025 04:11
@benthecarmanbenthecarman mentioned this pull request Nov 21, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4239.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@benthecarman@ldk-reviews-bot@TheBlueMatt@jkczyz
, '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

Add funding redeem script to ChannelDetails and ChannelPending event - #4234

Merged
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials
Nov 21, 2025
Merged

Add funding redeem script to ChannelDetails and ChannelPending event#4234
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials

Conversation

@benthecarman

@benthecarmanbenthecarman commented Nov 19, 2025

Copy link
Copy Markdown
Contributor

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.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 19, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @jkczyz 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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 4 times, most recently from b2f8584 to 1c29113CompareNovember 19, 2025 16:24

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

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
@ldk-reviews-bot

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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from 1c29113 to 436dc4bCompareNovember 19, 2025 16:42
@codecov

codecovBot commented Nov 19, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 69.04762% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.32%. Comparing base (6d9c676) to head (e3ebe7a).
⚠️ Report is 3 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel_state.rs46.66%8 Missing ⚠️
lightning/src/routing/router.rs50.00%4 Missing ⚠️
lightning/src/ln/channelmanager.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4234 +/- ##
==========================================
- Coverage 89.32% 89.32% -0.01% 
==========================================
Files 180 180 Lines 138641 138680 +39 Branches 138641 138680 +39 ==========================================
+ Hits 123844 123877 +33 - Misses 12174 12179 +5 - Partials 2623 2624 +1 
FlagCoverage Δ
fuzzing35.97% <46.66%> (+<0.01%)⬆️
tests88.69% <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.

jkczyz
jkczyz previously approved these changes Nov 19, 2025

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

As noted in lightningdevkit/ldk-node#677 (comment), we should include this in SplicePending, too, since subsequent splices will spend the new funding output. Feel free to do it in a follow-up if you prefer.

@benthecarman

Copy link
Copy Markdown
ContributorAuthor

Added to the SplicePending event

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines +6492 to +6494
new_funding_redeem_script: chan
.funding
.get_funding_redeemscript(),

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.

This will still be the old funding until the splice is promoted. You'll need to communicate it through SpliceFundingNegotiated.

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

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 2 times, most recently from e0c0b62 to 5b5c8d6CompareNovember 19, 2025 20:06
jkczyz
jkczyz previously approved these changes Nov 19, 2025
channel_type: Option<ChannelTypeFeatures>,
/// The witness script that can be used to spend the funding output for this channel.
///
/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.

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.

Sounds like this won't make 0.2 but feel free to petition @TheBlueMatt :)

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

I'll be honest I'm pretty annoyed we're talking about changing the 0.2 API almost two months after we intended to ship it, but if we land this today maybe we still include it in 0.2.

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +453 to +482
@@ -475,6 +479,17 @@ impl ChannelDetails {
self.short_channel_id.or(self.outbound_scid_alias)
}

/// Gets the funding output for this channel, if available.

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 need docs on when it changes wrt a splice. When a splice happens at what point in the splice do these switch over to the new values?

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.

Added, looked through the code and seems it happens after the commitment signed messages were exchanged.

Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +484 to +485
/// During a splice, the funding output will change and this value will be updated
/// after the `commitment_signed` messages have been exchanged.

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.

Hmmm... this should only change when the splice has been promoted (i.e., when the FundingScope from the pending splice is swapped in for the current FundingScope). That happens after splice_locked has been exchanged.

core::mem::swap(&mutself.funding, funding);

Maybe you were looking at channel establishment?

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.

Oh I see, i think what I was looking at when that FundedChannel was being created/updated here:

self.phase = ChannelPhase::Funded(funded_channel);

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.
@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from c5428d2 to e3ebe7aCompareNovember 20, 2025 16:35
@jkczyz
jkczyz merged commit f325458 into lightningdevkit:mainNov 21, 2025
26 checks passed
@benthecarman
benthecarman deleted the redeem-script-channel-pending-detials branch November 21, 2025 04:11
@benthecarmanbenthecarman mentioned this pull request Nov 21, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4239.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@benthecarman@ldk-reviews-bot@TheBlueMatt@jkczyz
, '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

Add funding redeem script to ChannelDetails and ChannelPending event - #4234

Merged
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials
Nov 21, 2025
Merged

Add funding redeem script to ChannelDetails and ChannelPending event#4234
jkczyz merged 2 commits into
lightningdevkit:mainfrom
benthecarman:redeem-script-channel-pending-detials

Conversation

@benthecarman

@benthecarmanbenthecarman commented Nov 19, 2025

Copy link
Copy Markdown
Contributor

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.

@ldk-reviews-bot

ldk-reviews-bot commented Nov 19, 2025

Copy link
Copy Markdown

👋 Thanks for assigning @jkczyz 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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 4 times, most recently from b2f8584 to 1c29113CompareNovember 19, 2025 16:24

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

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
@ldk-reviews-bot

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.

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from 1c29113 to 436dc4bCompareNovember 19, 2025 16:42
@codecov

codecovBot commented Nov 19, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 69.04762% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 89.32%. Comparing base (6d9c676) to head (e3ebe7a).
⚠️ Report is 3 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel_state.rs46.66%8 Missing ⚠️
lightning/src/routing/router.rs50.00%4 Missing ⚠️
lightning/src/ln/channelmanager.rs75.00%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4234 +/- ##
==========================================
- Coverage 89.32% 89.32% -0.01% 
==========================================
Files 180 180 Lines 138641 138680 +39 Branches 138641 138680 +39 ==========================================
+ Hits 123844 123877 +33 - Misses 12174 12179 +5 - Partials 2623 2624 +1 
FlagCoverage Δ
fuzzing35.97% <46.66%> (+<0.01%)⬆️
tests88.69% <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.

jkczyz
jkczyz previously approved these changes Nov 19, 2025

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

As noted in lightningdevkit/ldk-node#677 (comment), we should include this in SplicePending, too, since subsequent splices will spend the new funding output. Feel free to do it in a follow-up if you prefer.

@benthecarman

Copy link
Copy Markdown
ContributorAuthor

Added to the SplicePending event

Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment on lines +6492 to +6494
new_funding_redeem_script: chan
.funding
.get_funding_redeemscript(),

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.

This will still be the old funding until the splice is promoted. You'll need to communicate it through SpliceFundingNegotiated.

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

@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch 2 times, most recently from e0c0b62 to 5b5c8d6CompareNovember 19, 2025 20:06
jkczyz
jkczyz previously approved these changes Nov 19, 2025
channel_type: Option<ChannelTypeFeatures>,
/// The witness script that can be used to spend the funding output for this channel.
///
/// This field will be `None` for objects serialized with LDK versions prior to 0.2.0.

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.

Sounds like this won't make 0.2 but feel free to petition @TheBlueMatt :)

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

I'll be honest I'm pretty annoyed we're talking about changing the 0.2 API almost two months after we intended to ship it, but if we land this today maybe we still include it in 0.2.

Comment threadlightning/src/events/mod.rs Outdated
Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +453 to +482
@@ -475,6 +479,17 @@ impl ChannelDetails {
self.short_channel_id.or(self.outbound_scid_alias)
}

/// Gets the funding output for this channel, if available.

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 need docs on when it changes wrt a splice. When a splice happens at what point in the splice do these switch over to the new values?

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.

Added, looked through the code and seems it happens after the commitment signed messages were exchanged.

Comment threadlightning/src/ln/channel_state.rs Outdated
Comment on lines +484 to +485
/// During a splice, the funding output will change and this value will be updated
/// after the `commitment_signed` messages have been exchanged.

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.

Hmmm... this should only change when the splice has been promoted (i.e., when the FundingScope from the pending splice is swapped in for the current FundingScope). That happens after splice_locked has been exchanged.

core::mem::swap(&mutself.funding, funding);

Maybe you were looking at channel establishment?

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.

Oh I see, i think what I was looking at when that FundedChannel was being created/updated here:

self.phase = ChannelPhase::Funded(funded_channel);

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.
@benthecarman
benthecarmanforce-pushed the redeem-script-channel-pending-detials branch from c5428d2 to e3ebe7aCompareNovember 20, 2025 16:35
@jkczyz
jkczyz merged commit f325458 into lightningdevkit:mainNov 21, 2025
26 checks passed
@benthecarman
benthecarman deleted the redeem-script-channel-pending-detials branch November 21, 2025 04:11
@benthecarmanbenthecarman mentioned this pull request Nov 21, 2025
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Backported in #4239.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@benthecarman@ldk-reviews-bot@TheBlueMatt@jkczyz