Skip to content

Introduce RenegotiatedFundingLocked monitor update variant - #3894

Merged
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom
wpaulino:renegotiated-funding-locked-monitor-update
Jul 22, 2025
Merged

Introduce RenegotiatedFundingLocked monitor update variant#3894
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom
wpaulino:renegotiated-funding-locked-monitor-update

Conversation

@wpaulino

@wpaulinowpaulino commented Jun 26, 2025

Copy link
Copy Markdown
Contributor

This is a new ChannelMonitorUpdateStep variant intended to be used whenever a new funding transaction that was negotiated and applied via the RenegotiatedFunding update reaches its intended confirmation depth and both sides of the channel exchange channel_ready/splice_locked. This commit primarily focuses on its use for splices, but future work will expand where needed to support RBFs for a dual funded channel.

This monitor update ensures that the monitor can safely drop all prior commitment data since it is now considered invalid/unnecessary. Once the update is applied, only state for the new funding transaction is tracked going forward, until the monitor receives another RenegotiatedFunding update.

@ldk-reviews-bot

ldk-reviews-bot commented Jun 26, 2025•
edited
Loading

Copy link
Copy Markdown

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

@wpaulino
wpaulino requested a review from jkczyzJune 26, 2025 17:07
@wpaulinowpaulino mentioned this pull request Jun 26, 2025
Closed
7 tasks
@ldk-reviews-bot

ldk-reviews-bot commented Jun 30, 2025

Copy link
Copy Markdown

🔔 1st Reminder

Hey @jkczyz! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Jul 2, 2025

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @jkczyz! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Jul 5, 2025

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @jkczyz! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Jul 7, 2025

Copy link
Copy Markdown

🔔 4th Reminder

Hey @jkczyz! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Jul 9, 2025

Copy link
Copy Markdown

🔔 5th Reminder

Hey @jkczyz! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

jkczyz
jkczyz reviewed Jul 9, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/chain/channelmonitor.rs Outdated
@ldk-reviews-bot

ldk-reviews-bot commented Jul 9, 2025

Copy link
Copy Markdown

👋 The first review has been submitted!

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

@wpaulino
wpaulinoforce-pushed the renegotiated-funding-locked-monitor-update branch 2 times, most recently from 00e8bb3 to c1ead6aCompareJuly 9, 2025 23:25
@wpaulino
wpaulino requested a review from jkczyzJuly 9, 2025 23:26
@codecov

codecovBot commented Jul 10, 2025•
edited
Loading

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 65.44118% with 47 lines in your changes missing coverage. Please review.

Project coverage is 88.99%. Comparing base (c48e0a8) to head (22d5428).
Report is 194 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/chain/channelmonitor.rs14.28%24 Missing ⚠️
lightning/src/ln/channelmanager.rs65.62%20 Missing and 2 partials ⚠️
lightning/src/chain/onchaintx.rs83.33%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3894 +/- ##
==========================================
- Coverage 89.65% 88.99% -0.67% 
==========================================
Files 164 167 +3 Lines 134658 121836 -12822 Branches 134658 121836 -12822 ==========================================
- Hits 120734 108432 -12302 + Misses 11246 10988 -258 + Partials 2678 2416 -262
FlagCoverage Δ
fuzzing22.71% <30.14%> (?)
tests88.82% <65.44%> (?)

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 reviewed Jul 10, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
@wpaulino
wpaulinoforce-pushed the renegotiated-funding-locked-monitor-update branch from c1ead6a to a6d4b1eCompareJuly 14, 2025 18:33
jkczyz
jkczyz previously approved these changes Jul 14, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
TheBlueMatt
TheBlueMatt reviewed Jul 15, 2025
View reviewed changes

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Note that rustfmt/MSRV are failing.

Comment threadlightning/src/chain/channelmonitor.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channelmanager.rs Outdated
coderabbitai[bot]
coderabbitaiBot previously approved these changes Jul 16, 2025
View reviewed changes
@wpaulino
wpaulino dismissed stale reviews from coderabbitai[bot] and jkczyz via 3bdf268July 16, 2025 00:31
@wpaulino
wpaulinoforce-pushed the renegotiated-funding-locked-monitor-update branch from a6d4b1e to 3bdf268CompareJuly 16, 2025 00:31
@wpaulinowpaulino mentioned this pull request Jul 17, 2025
Merged
@wpaulino
wpaulinoforce-pushed the renegotiated-funding-locked-monitor-update branch from 3bdf268 to 6c43f5dCompareJuly 17, 2025 17:35
@ldk-reviews-bot

ldk-reviews-bot commented Jul 21, 2025

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

@ldk-reviews-bot

ldk-reviews-bot commented Jul 21, 2025

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.
Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.

TheBlueMatt
TheBlueMatt reviewed Jul 21, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
Comment threadlightning/src/ln/channelmanager.rs
@wpaulino
wpaulinoforce-pushed the renegotiated-funding-locked-monitor-update branch from 6c43f5d to aa625f0CompareJuly 21, 2025 23:25
TheBlueMatt
TheBlueMatt reviewed Jul 21, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs Outdated
Comment threadlightning/src/ln/channelmanager.rs Outdated
@wpaulino
Introduce RenegotiatedFundingLocked monitor update variant
07c2eb5
This is a new `ChannelMonitorUpdateStep` variant intended to be used
whenever a new funding transaction that was negotiated and applied via
the `RenegotiatedFunding` update reaches its intended confirmation depth
and both sides of the channel exchange `channel_ready`/`splice_locked`.
This commit primarily focuses on its use for splices, but future work
will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior
commitment data since it is now considered invalid/unnecessary. Once the
update is applied, only state for the new funding transaction is tracked
going forward, until the monitor receives another `RenegotiatedFunding`
update.
@wpaulino
Rename ChannelMonitor::first_confirmed_funding_txo
22d5428
It's only intended to be set during initialization and used to check if
the channel is v1 or v2. We rename it to `first_negotiated_funding_txo`
to better reflect its purpose.
@wpaulino
wpaulinoforce-pushed the renegotiated-funding-locked-monitor-update branch from aa625f0 to 22d5428CompareJuly 22, 2025 01:35
TheBlueMatt
TheBlueMatt approved these changes Jul 22, 2025
View reviewed changes

@TheBlueMattTheBlueMatt left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

The only real changes since @jkczyz's ACK were monitor update application fixes, which I plan to lean up in a followup by fixing the internal API. Gonna land this to keep things moving but a post-merge second glance if you think its work it would be fine to @jkczyz

Comment threadlightning/src/ln/channelmanager.rs
@TheBlueMatt
TheBlueMatt merged commit 4e4f128 into lightningdevkit:mainJul 22, 2025
27 of 28 checks passed
@TheBlueMattTheBlueMatt mentioned this pull request Jul 22, 2025
Merged
@wpaulino
wpaulino deleted the renegotiated-funding-locked-monitor-update branch July 22, 2025 23:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@jkczyzjkczyzAwaiting requested review from jkczyz

Assignees

@wpaulinowpaulino

Labels

None yet

Projects

Weekly Goals
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@ldk-reviews-bot@TheBlueMatt@jkczyz
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Introduce RenegotiatedFundingLocked monitor update variant by wpaulino · Pull Request #3894 · lightningdevkit/rust-lightning · GitHub
Skip to content
Introduce RenegotiatedFundingLocked monitor update variant - #3894
Merged
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Jul 22, 2025
Merged
Introduce RenegotiatedFundingLocked monitor update variant#3894
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Conversation
@wpaulino
@wpaulinowpaulino
commented
Jun 26, 2025

Copy link


Copy Markdown

Contributor
This is a new ChannelMonitorUpdateStep variant intended to be used whenever a new funding transaction that was negotiated and applied via the RenegotiatedFunding update reaches its intended confirmation depth and both sides of the channel exchange channel_ready/splice_locked. This commit primarily focuses on its use for splices, but future work will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior commitment data since it is now considered invalid/unnecessary. Once the update is applied, only state for the new funding transaction is tracked going forward, until the monitor receives another RenegotiatedFunding update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 26, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @TheBlueMatt 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.
@wpaulino
wpaulino
requested a review
from jkczyzJune 26, 2025 17:07
@wpaulinowpaulino
mentioned this pull request
Jun 26, 2025

Closed

7 tasks
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 30, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 2, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 5, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 7, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
jkczyz
jkczyz
reviewed
Jul 9, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

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

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/chain/channelmonitor.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
2 times, most recently
from
00e8bb3 to
c1ead6aCompareJuly 9, 2025 23:25
@wpaulino
wpaulino
requested a review
from jkczyzJuly 9, 2025 23:26
@codecov
codecovBot
commented
Jul 10, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 65.44118% with 47 lines in your changes missing coverage. Please review.
Project coverage is 88.99%. Comparing base (c48e0a8) to head (22d5428).

Report is 194 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/chain/channelmonitor.rs14.28%24 Missing ⚠️
lightning/src/ln/channelmanager.rs65.62%20 Missing and 2 partials ⚠️
lightning/src/chain/onchaintx.rs83.33%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3894 +/- ##
==========================================
- Coverage 89.65% 88.99% -0.67% 
==========================================
Files 164 167 +3 Lines 134658 121836 -12822 Branches 134658 121836 -12822 ==========================================
- Hits 120734 108432 -12302 + Misses 11246 10988 -258 + Partials 2678 2416 -262 
FlagCoverage Δ
fuzzing22.71% <30.14%> (?)
tests88.82% <65.44%> (?)
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
reviewed
Jul 10, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

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

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
c1ead6a to
a6d4b1eCompareJuly 14, 2025 18:33
jkczyz
jkczyz
previously approved these changes
Jul 14, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
TheBlueMatt
TheBlueMatt
reviewed
Jul 15, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Note that rustfmt/MSRV are failing.
Comment threadlightning/src/chain/channelmonitor.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

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

coderabbitai[bot]
coderabbitaiBot
previously approved these changes
Jul 16, 2025
View reviewed changes
@wpaulino
wpaulino
dismissed stale reviews from coderabbitai[bot] and jkczyz
via
3bdf268July 16, 2025 00:31
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
a6d4b1e to
3bdf268CompareJuly 16, 2025 00:31
@wpaulinowpaulino
mentioned this pull request
Jul 17, 2025
 Merged

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
3bdf268 to
6c43f5dCompareJuly 17, 2025 17:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
Comment threadlightning/src/ln/channelmanager.rs
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
6c43f5d to
aa625f0CompareJuly 21, 2025 23:25
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@wpaulino
Introduce RenegotiatedFundingLocked monitor update variant
07c2eb5
This is a new `ChannelMonitorUpdateStep` variant intended to be used
whenever a new funding transaction that was negotiated and applied via
the `RenegotiatedFunding` update reaches its intended confirmation depth
and both sides of the channel exchange `channel_ready`/`splice_locked`.
This commit primarily focuses on its use for splices, but future work
will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior
commitment data since it is now considered invalid/unnecessary. Once the
update is applied, only state for the new funding transaction is tracked
going forward, until the monitor receives another `RenegotiatedFunding`
update.
@wpaulino
Rename ChannelMonitor::first_confirmed_funding_txo
22d5428
It's only intended to be set during initialization and used to check if
the channel is v1 or v2. We rename it to `first_negotiated_funding_txo`
to better reflect its purpose.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
aa625f0 to
22d5428CompareJuly 22, 2025 01:35
TheBlueMatt
TheBlueMatt
approved these changes
Jul 22, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

The only real changes since @jkczyz's ACK were monitor update application fixes, which I plan to lean up in a followup by fixing the internal API. Gonna land this to keep things moving but a post-merge second glance if you think its work it would be fine to @jkczyz
Comment threadlightning/src/ln/channelmanager.rs
@TheBlueMatt
TheBlueMatt
merged commit 4e4f128
into
lightningdevkit:mainJul 22, 2025

27 of 28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@wpaulino
wpaulino
deleted the

renegotiated-funding-locked-monitor-update

branch
July 22, 2025 23:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@jkczyzjkczyzAwaiting requested review from jkczyz

Assignees

@wpaulinowpaulino

Labels


None yet


Projects

Weekly Goals

Status: Done


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@ldk-reviews-bot@TheBlueMatt@jkczyz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Introduce RenegotiatedFundingLocked monitor update variant by wpaulino · Pull Request #3894 · lightningdevkit/rust-lightning · GitHub
Skip to content
Introduce RenegotiatedFundingLocked monitor update variant - #3894
Merged
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Jul 22, 2025
Merged
Introduce RenegotiatedFundingLocked monitor update variant#3894
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Conversation
@wpaulino
@wpaulinowpaulino
commented
Jun 26, 2025

Copy link


Copy Markdown

Contributor
This is a new ChannelMonitorUpdateStep variant intended to be used whenever a new funding transaction that was negotiated and applied via the RenegotiatedFunding update reaches its intended confirmation depth and both sides of the channel exchange channel_ready/splice_locked. This commit primarily focuses on its use for splices, but future work will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior commitment data since it is now considered invalid/unnecessary. Once the update is applied, only state for the new funding transaction is tracked going forward, until the monitor receives another RenegotiatedFunding update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 26, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @TheBlueMatt 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.
@wpaulino
wpaulino
requested a review
from jkczyzJune 26, 2025 17:07
@wpaulinowpaulino
mentioned this pull request
Jun 26, 2025

Closed

7 tasks
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 30, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 2, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 5, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 7, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
jkczyz
jkczyz
reviewed
Jul 9, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

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

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/chain/channelmonitor.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
2 times, most recently
from
00e8bb3 to
c1ead6aCompareJuly 9, 2025 23:25
@wpaulino
wpaulino
requested a review
from jkczyzJuly 9, 2025 23:26
@codecov
codecovBot
commented
Jul 10, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 65.44118% with 47 lines in your changes missing coverage. Please review.
Project coverage is 88.99%. Comparing base (c48e0a8) to head (22d5428).

Report is 194 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/chain/channelmonitor.rs14.28%24 Missing ⚠️
lightning/src/ln/channelmanager.rs65.62%20 Missing and 2 partials ⚠️
lightning/src/chain/onchaintx.rs83.33%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3894 +/- ##
==========================================
- Coverage 89.65% 88.99% -0.67% 
==========================================
Files 164 167 +3 Lines 134658 121836 -12822 Branches 134658 121836 -12822 ==========================================
- Hits 120734 108432 -12302 + Misses 11246 10988 -258 + Partials 2678 2416 -262 
FlagCoverage Δ
fuzzing22.71% <30.14%> (?)
tests88.82% <65.44%> (?)
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
reviewed
Jul 10, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

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

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
c1ead6a to
a6d4b1eCompareJuly 14, 2025 18:33
jkczyz
jkczyz
previously approved these changes
Jul 14, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
TheBlueMatt
TheBlueMatt
reviewed
Jul 15, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Note that rustfmt/MSRV are failing.
Comment threadlightning/src/chain/channelmonitor.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

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

coderabbitai[bot]
coderabbitaiBot
previously approved these changes
Jul 16, 2025
View reviewed changes
@wpaulino
wpaulino
dismissed stale reviews from coderabbitai[bot] and jkczyz
via
3bdf268July 16, 2025 00:31
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
a6d4b1e to
3bdf268CompareJuly 16, 2025 00:31
@wpaulinowpaulino
mentioned this pull request
Jul 17, 2025
 Merged

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
3bdf268 to
6c43f5dCompareJuly 17, 2025 17:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
Comment threadlightning/src/ln/channelmanager.rs
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
6c43f5d to
aa625f0CompareJuly 21, 2025 23:25
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@wpaulino
Introduce RenegotiatedFundingLocked monitor update variant
07c2eb5
This is a new `ChannelMonitorUpdateStep` variant intended to be used
whenever a new funding transaction that was negotiated and applied via
the `RenegotiatedFunding` update reaches its intended confirmation depth
and both sides of the channel exchange `channel_ready`/`splice_locked`.
This commit primarily focuses on its use for splices, but future work
will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior
commitment data since it is now considered invalid/unnecessary. Once the
update is applied, only state for the new funding transaction is tracked
going forward, until the monitor receives another `RenegotiatedFunding`
update.
@wpaulino
Rename ChannelMonitor::first_confirmed_funding_txo
22d5428
It's only intended to be set during initialization and used to check if
the channel is v1 or v2. We rename it to `first_negotiated_funding_txo`
to better reflect its purpose.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
aa625f0 to
22d5428CompareJuly 22, 2025 01:35
TheBlueMatt
TheBlueMatt
approved these changes
Jul 22, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

The only real changes since @jkczyz's ACK were monitor update application fixes, which I plan to lean up in a followup by fixing the internal API. Gonna land this to keep things moving but a post-merge second glance if you think its work it would be fine to @jkczyz
Comment threadlightning/src/ln/channelmanager.rs
@TheBlueMatt
TheBlueMatt
merged commit 4e4f128
into
lightningdevkit:mainJul 22, 2025

27 of 28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@wpaulino
wpaulino
deleted the

renegotiated-funding-locked-monitor-update

branch
July 22, 2025 23:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@jkczyzjkczyzAwaiting requested review from jkczyz

Assignees

@wpaulinowpaulino

Labels


None yet


Projects

Weekly Goals

Status: Done


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@ldk-reviews-bot@TheBlueMatt@jkczyz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Introduce RenegotiatedFundingLocked monitor update variant by wpaulino · Pull Request #3894 · lightningdevkit/rust-lightning · GitHub
Skip to content
Introduce RenegotiatedFundingLocked monitor update variant - #3894
Merged
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Jul 22, 2025
Merged
Introduce RenegotiatedFundingLocked monitor update variant#3894
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Conversation
@wpaulino
@wpaulinowpaulino
commented
Jun 26, 2025

Copy link


Copy Markdown

Contributor
This is a new ChannelMonitorUpdateStep variant intended to be used whenever a new funding transaction that was negotiated and applied via the RenegotiatedFunding update reaches its intended confirmation depth and both sides of the channel exchange channel_ready/splice_locked. This commit primarily focuses on its use for splices, but future work will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior commitment data since it is now considered invalid/unnecessary. Once the update is applied, only state for the new funding transaction is tracked going forward, until the monitor receives another RenegotiatedFunding update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 26, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @TheBlueMatt 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.
@wpaulino
wpaulino
requested a review
from jkczyzJune 26, 2025 17:07
@wpaulinowpaulino
mentioned this pull request
Jun 26, 2025

Closed

7 tasks
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 30, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 2, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 5, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 7, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
jkczyz
jkczyz
reviewed
Jul 9, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

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

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/chain/channelmonitor.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
2 times, most recently
from
00e8bb3 to
c1ead6aCompareJuly 9, 2025 23:25
@wpaulino
wpaulino
requested a review
from jkczyzJuly 9, 2025 23:26
@codecov
codecovBot
commented
Jul 10, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 65.44118% with 47 lines in your changes missing coverage. Please review.
Project coverage is 88.99%. Comparing base (c48e0a8) to head (22d5428).

Report is 194 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/chain/channelmonitor.rs14.28%24 Missing ⚠️
lightning/src/ln/channelmanager.rs65.62%20 Missing and 2 partials ⚠️
lightning/src/chain/onchaintx.rs83.33%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3894 +/- ##
==========================================
- Coverage 89.65% 88.99% -0.67% 
==========================================
Files 164 167 +3 Lines 134658 121836 -12822 Branches 134658 121836 -12822 ==========================================
- Hits 120734 108432 -12302 + Misses 11246 10988 -258 + Partials 2678 2416 -262 
FlagCoverage Δ
fuzzing22.71% <30.14%> (?)
tests88.82% <65.44%> (?)
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
reviewed
Jul 10, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

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

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
c1ead6a to
a6d4b1eCompareJuly 14, 2025 18:33
jkczyz
jkczyz
previously approved these changes
Jul 14, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
TheBlueMatt
TheBlueMatt
reviewed
Jul 15, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Note that rustfmt/MSRV are failing.
Comment threadlightning/src/chain/channelmonitor.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

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

coderabbitai[bot]
coderabbitaiBot
previously approved these changes
Jul 16, 2025
View reviewed changes
@wpaulino
wpaulino
dismissed stale reviews from coderabbitai[bot] and jkczyz
via
3bdf268July 16, 2025 00:31
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
a6d4b1e to
3bdf268CompareJuly 16, 2025 00:31
@wpaulinowpaulino
mentioned this pull request
Jul 17, 2025
 Merged

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
3bdf268 to
6c43f5dCompareJuly 17, 2025 17:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
Comment threadlightning/src/ln/channelmanager.rs
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
6c43f5d to
aa625f0CompareJuly 21, 2025 23:25
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@wpaulino
Introduce RenegotiatedFundingLocked monitor update variant
07c2eb5
This is a new `ChannelMonitorUpdateStep` variant intended to be used
whenever a new funding transaction that was negotiated and applied via
the `RenegotiatedFunding` update reaches its intended confirmation depth
and both sides of the channel exchange `channel_ready`/`splice_locked`.
This commit primarily focuses on its use for splices, but future work
will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior
commitment data since it is now considered invalid/unnecessary. Once the
update is applied, only state for the new funding transaction is tracked
going forward, until the monitor receives another `RenegotiatedFunding`
update.
@wpaulino
Rename ChannelMonitor::first_confirmed_funding_txo
22d5428
It's only intended to be set during initialization and used to check if
the channel is v1 or v2. We rename it to `first_negotiated_funding_txo`
to better reflect its purpose.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
aa625f0 to
22d5428CompareJuly 22, 2025 01:35
TheBlueMatt
TheBlueMatt
approved these changes
Jul 22, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

The only real changes since @jkczyz's ACK were monitor update application fixes, which I plan to lean up in a followup by fixing the internal API. Gonna land this to keep things moving but a post-merge second glance if you think its work it would be fine to @jkczyz
Comment threadlightning/src/ln/channelmanager.rs
@TheBlueMatt
TheBlueMatt
merged commit 4e4f128
into
lightningdevkit:mainJul 22, 2025

27 of 28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@wpaulino
wpaulino
deleted the

renegotiated-funding-locked-monitor-update

branch
July 22, 2025 23:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@jkczyzjkczyzAwaiting requested review from jkczyz

Assignees

@wpaulinowpaulino

Labels


None yet


Projects

Weekly Goals

Status: Done


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@ldk-reviews-bot@TheBlueMatt@jkczyz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Introduce RenegotiatedFundingLocked monitor update variant by wpaulino · Pull Request #3894 · lightningdevkit/rust-lightning · GitHub
Skip to content
Introduce RenegotiatedFundingLocked monitor update variant - #3894
Merged
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Jul 22, 2025
Merged
Introduce RenegotiatedFundingLocked monitor update variant#3894
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Conversation
@wpaulino
@wpaulinowpaulino
commented
Jun 26, 2025

Copy link


Copy Markdown

Contributor
This is a new ChannelMonitorUpdateStep variant intended to be used whenever a new funding transaction that was negotiated and applied via the RenegotiatedFunding update reaches its intended confirmation depth and both sides of the channel exchange channel_ready/splice_locked. This commit primarily focuses on its use for splices, but future work will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior commitment data since it is now considered invalid/unnecessary. Once the update is applied, only state for the new funding transaction is tracked going forward, until the monitor receives another RenegotiatedFunding update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 26, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @TheBlueMatt 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.
@wpaulino
wpaulino
requested a review
from jkczyzJune 26, 2025 17:07
@wpaulinowpaulino
mentioned this pull request
Jun 26, 2025

Closed

7 tasks
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 30, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 2, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 5, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 7, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
jkczyz
jkczyz
reviewed
Jul 9, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

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

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/chain/channelmonitor.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
2 times, most recently
from
00e8bb3 to
c1ead6aCompareJuly 9, 2025 23:25
@wpaulino
wpaulino
requested a review
from jkczyzJuly 9, 2025 23:26
@codecov
codecovBot
commented
Jul 10, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 65.44118% with 47 lines in your changes missing coverage. Please review.
Project coverage is 88.99%. Comparing base (c48e0a8) to head (22d5428).

Report is 194 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/chain/channelmonitor.rs14.28%24 Missing ⚠️
lightning/src/ln/channelmanager.rs65.62%20 Missing and 2 partials ⚠️
lightning/src/chain/onchaintx.rs83.33%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3894 +/- ##
==========================================
- Coverage 89.65% 88.99% -0.67% 
==========================================
Files 164 167 +3 Lines 134658 121836 -12822 Branches 134658 121836 -12822 ==========================================
- Hits 120734 108432 -12302 + Misses 11246 10988 -258 + Partials 2678 2416 -262 
FlagCoverage Δ
fuzzing22.71% <30.14%> (?)
tests88.82% <65.44%> (?)
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
reviewed
Jul 10, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

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

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
c1ead6a to
a6d4b1eCompareJuly 14, 2025 18:33
jkczyz
jkczyz
previously approved these changes
Jul 14, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
TheBlueMatt
TheBlueMatt
reviewed
Jul 15, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Note that rustfmt/MSRV are failing.
Comment threadlightning/src/chain/channelmonitor.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

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

coderabbitai[bot]
coderabbitaiBot
previously approved these changes
Jul 16, 2025
View reviewed changes
@wpaulino
wpaulino
dismissed stale reviews from coderabbitai[bot] and jkczyz
via
3bdf268July 16, 2025 00:31
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
a6d4b1e to
3bdf268CompareJuly 16, 2025 00:31
@wpaulinowpaulino
mentioned this pull request
Jul 17, 2025
 Merged

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
3bdf268 to
6c43f5dCompareJuly 17, 2025 17:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
Comment threadlightning/src/ln/channelmanager.rs
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
6c43f5d to
aa625f0CompareJuly 21, 2025 23:25
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@wpaulino
Introduce RenegotiatedFundingLocked monitor update variant
07c2eb5
This is a new `ChannelMonitorUpdateStep` variant intended to be used
whenever a new funding transaction that was negotiated and applied via
the `RenegotiatedFunding` update reaches its intended confirmation depth
and both sides of the channel exchange `channel_ready`/`splice_locked`.
This commit primarily focuses on its use for splices, but future work
will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior
commitment data since it is now considered invalid/unnecessary. Once the
update is applied, only state for the new funding transaction is tracked
going forward, until the monitor receives another `RenegotiatedFunding`
update.
@wpaulino
Rename ChannelMonitor::first_confirmed_funding_txo
22d5428
It's only intended to be set during initialization and used to check if
the channel is v1 or v2. We rename it to `first_negotiated_funding_txo`
to better reflect its purpose.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
aa625f0 to
22d5428CompareJuly 22, 2025 01:35
TheBlueMatt
TheBlueMatt
approved these changes
Jul 22, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

The only real changes since @jkczyz's ACK were monitor update application fixes, which I plan to lean up in a followup by fixing the internal API. Gonna land this to keep things moving but a post-merge second glance if you think its work it would be fine to @jkczyz
Comment threadlightning/src/ln/channelmanager.rs
@TheBlueMatt
TheBlueMatt
merged commit 4e4f128
into
lightningdevkit:mainJul 22, 2025

27 of 28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@wpaulino
wpaulino
deleted the

renegotiated-funding-locked-monitor-update

branch
July 22, 2025 23:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@jkczyzjkczyzAwaiting requested review from jkczyz

Assignees

@wpaulinowpaulino

Labels


None yet


Projects

Weekly Goals

Status: Done


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@ldk-reviews-bot@TheBlueMatt@jkczyz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Introduce RenegotiatedFundingLocked monitor update variant by wpaulino · Pull Request #3894 · lightningdevkit/rust-lightning · GitHub
Skip to content
Introduce RenegotiatedFundingLocked monitor update variant - #3894
Merged
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Jul 22, 2025
Merged
Introduce RenegotiatedFundingLocked monitor update variant#3894
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Conversation
@wpaulino
@wpaulinowpaulino
commented
Jun 26, 2025

Copy link


Copy Markdown

Contributor
This is a new ChannelMonitorUpdateStep variant intended to be used whenever a new funding transaction that was negotiated and applied via the RenegotiatedFunding update reaches its intended confirmation depth and both sides of the channel exchange channel_ready/splice_locked. This commit primarily focuses on its use for splices, but future work will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior commitment data since it is now considered invalid/unnecessary. Once the update is applied, only state for the new funding transaction is tracked going forward, until the monitor receives another RenegotiatedFunding update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 26, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @TheBlueMatt 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.
@wpaulino
wpaulino
requested a review
from jkczyzJune 26, 2025 17:07
@wpaulinowpaulino
mentioned this pull request
Jun 26, 2025

Closed

7 tasks
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 30, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 2, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 5, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 7, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
jkczyz
jkczyz
reviewed
Jul 9, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

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

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/chain/channelmonitor.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
2 times, most recently
from
00e8bb3 to
c1ead6aCompareJuly 9, 2025 23:25
@wpaulino
wpaulino
requested a review
from jkczyzJuly 9, 2025 23:26
@codecov
codecovBot
commented
Jul 10, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 65.44118% with 47 lines in your changes missing coverage. Please review.
Project coverage is 88.99%. Comparing base (c48e0a8) to head (22d5428).

Report is 194 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/chain/channelmonitor.rs14.28%24 Missing ⚠️
lightning/src/ln/channelmanager.rs65.62%20 Missing and 2 partials ⚠️
lightning/src/chain/onchaintx.rs83.33%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3894 +/- ##
==========================================
- Coverage 89.65% 88.99% -0.67% 
==========================================
Files 164 167 +3 Lines 134658 121836 -12822 Branches 134658 121836 -12822 ==========================================
- Hits 120734 108432 -12302 + Misses 11246 10988 -258 + Partials 2678 2416 -262 
FlagCoverage Δ
fuzzing22.71% <30.14%> (?)
tests88.82% <65.44%> (?)
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
reviewed
Jul 10, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

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

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
c1ead6a to
a6d4b1eCompareJuly 14, 2025 18:33
jkczyz
jkczyz
previously approved these changes
Jul 14, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
TheBlueMatt
TheBlueMatt
reviewed
Jul 15, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Note that rustfmt/MSRV are failing.
Comment threadlightning/src/chain/channelmonitor.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

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

coderabbitai[bot]
coderabbitaiBot
previously approved these changes
Jul 16, 2025
View reviewed changes
@wpaulino
wpaulino
dismissed stale reviews from coderabbitai[bot] and jkczyz
via
3bdf268July 16, 2025 00:31
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
a6d4b1e to
3bdf268CompareJuly 16, 2025 00:31
@wpaulinowpaulino
mentioned this pull request
Jul 17, 2025
 Merged

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
3bdf268 to
6c43f5dCompareJuly 17, 2025 17:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
Comment threadlightning/src/ln/channelmanager.rs
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
6c43f5d to
aa625f0CompareJuly 21, 2025 23:25
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@wpaulino
Introduce RenegotiatedFundingLocked monitor update variant
07c2eb5
This is a new `ChannelMonitorUpdateStep` variant intended to be used
whenever a new funding transaction that was negotiated and applied via
the `RenegotiatedFunding` update reaches its intended confirmation depth
and both sides of the channel exchange `channel_ready`/`splice_locked`.
This commit primarily focuses on its use for splices, but future work
will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior
commitment data since it is now considered invalid/unnecessary. Once the
update is applied, only state for the new funding transaction is tracked
going forward, until the monitor receives another `RenegotiatedFunding`
update.
@wpaulino
Rename ChannelMonitor::first_confirmed_funding_txo
22d5428
It's only intended to be set during initialization and used to check if
the channel is v1 or v2. We rename it to `first_negotiated_funding_txo`
to better reflect its purpose.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
aa625f0 to
22d5428CompareJuly 22, 2025 01:35
TheBlueMatt
TheBlueMatt
approved these changes
Jul 22, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

The only real changes since @jkczyz's ACK were monitor update application fixes, which I plan to lean up in a followup by fixing the internal API. Gonna land this to keep things moving but a post-merge second glance if you think its work it would be fine to @jkczyz
Comment threadlightning/src/ln/channelmanager.rs
@TheBlueMatt
TheBlueMatt
merged commit 4e4f128
into
lightningdevkit:mainJul 22, 2025

27 of 28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@wpaulino
wpaulino
deleted the

renegotiated-funding-locked-monitor-update

branch
July 22, 2025 23:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@jkczyzjkczyzAwaiting requested review from jkczyz

Assignees

@wpaulinowpaulino

Labels


None yet


Projects

Weekly Goals

Status: Done


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@ldk-reviews-bot@TheBlueMatt@jkczyz

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Introduce RenegotiatedFundingLocked monitor update variant by wpaulino · Pull Request #3894 · lightningdevkit/rust-lightning · GitHub
Skip to content
Introduce RenegotiatedFundingLocked monitor update variant - #3894
Merged
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Jul 22, 2025
Merged
Introduce RenegotiatedFundingLocked monitor update variant#3894
TheBlueMatt merged 2 commits into
lightningdevkit:mainfrom 
wpaulino:renegotiated-funding-locked-monitor-update
Conversation
@wpaulino
@wpaulinowpaulino
commented
Jun 26, 2025

Copy link


Copy Markdown

Contributor
This is a new ChannelMonitorUpdateStep variant intended to be used whenever a new funding transaction that was negotiated and applied via the RenegotiatedFunding update reaches its intended confirmation depth and both sides of the channel exchange channel_ready/splice_locked. This commit primarily focuses on its use for splices, but future work will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior commitment data since it is now considered invalid/unnecessary. Once the update is applied, only state for the new funding transaction is tracked going forward, until the monitor receives another RenegotiatedFunding update.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 26, 2025•

edited

Loading

Copy link


Copy Markdown

👋 Thanks for assigning @TheBlueMatt 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.
@wpaulino
wpaulino
requested a review
from jkczyzJune 26, 2025 17:07
@wpaulinowpaulino
mentioned this pull request
Jun 26, 2025

Closed

7 tasks
@ldk-reviews-bot
ldk-reviews-bot
commented
Jun 30, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 2, 2025

Copy link


Copy Markdown

🔔 2nd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 5, 2025

Copy link


Copy Markdown

🔔 3rd Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 7, 2025

Copy link


Copy Markdown

🔔 4th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

🔔 5th Reminder
Hey @jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
jkczyz
jkczyz
reviewed
Jul 9, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

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

Comment threadlightning/src/ln/channel.rs
Outdated

Comment threadlightning/src/chain/channelmonitor.rs
Outdated

@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 9, 2025

Copy link


Copy Markdown

👋 The first review has been submitted!
Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
2 times, most recently
from
00e8bb3 to
c1ead6aCompareJuly 9, 2025 23:25
@wpaulino
wpaulino
requested a review
from jkczyzJuly 9, 2025 23:26
@codecov
codecovBot
commented
Jul 10, 2025•

edited

Loading

Copy link


Copy Markdown

Codecov Report
Attention: Patch coverage is 65.44118% with 47 lines in your changes missing coverage. Please review.
Project coverage is 88.99%. Comparing base (c48e0a8) to head (22d5428).

Report is 194 commits behind head on main.
Files with missing linesPatch %Lines
lightning/src/chain/channelmonitor.rs14.28%24 Missing ⚠️
lightning/src/ln/channelmanager.rs65.62%20 Missing and 2 partials ⚠️
lightning/src/chain/onchaintx.rs83.33%1 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #3894 +/- ##
==========================================
- Coverage 89.65% 88.99% -0.67% 
==========================================
Files 164 167 +3 Lines 134658 121836 -12822 Branches 134658 121836 -12822 ==========================================
- Hits 120734 108432 -12302 + Misses 11246 10988 -258 + Partials 2678 2416 -262 
FlagCoverage Δ
fuzzing22.71% <30.14%> (?)
tests88.82% <65.44%> (?)
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
reviewed
Jul 10, 2025
View reviewed changes
Comment threadlightning/src/ln/channel.rs
Outdated

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

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
c1ead6a to
a6d4b1eCompareJuly 14, 2025 18:33
jkczyz
jkczyz
previously approved these changes
Jul 14, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
TheBlueMatt
TheBlueMatt
reviewed
Jul 15, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

Note that rustfmt/MSRV are failing.
Comment threadlightning/src/chain/channelmonitor.rs
Outdated

Comment threadlightning/src/ln/channel.rs
Outdated

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

coderabbitai[bot]
coderabbitaiBot
previously approved these changes
Jul 16, 2025
View reviewed changes
@wpaulino
wpaulino
dismissed stale reviews from coderabbitai[bot] and jkczyz
via
3bdf268July 16, 2025 00:31
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
a6d4b1e to
3bdf268CompareJuly 16, 2025 00:31
@wpaulinowpaulino
mentioned this pull request
Jul 17, 2025
 Merged

@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
3bdf268 to
6c43f5dCompareJuly 17, 2025 17:35
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
@ldk-reviews-bot
ldk-reviews-bot
commented
Jul 21, 2025

Copy link


Copy Markdown

🔔 1st Reminder
Hey @TheBlueMatt@jkczyz! This PR has been waiting for your review.

Please take a look when you have a chance. If you're unable to review, please let us know so we can find another reviewer.
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs
Comment threadlightning/src/ln/channelmanager.rs
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
6c43f5d to
aa625f0CompareJuly 21, 2025 23:25
TheBlueMatt
TheBlueMatt
reviewed
Jul 21, 2025
View reviewed changes
Comment threadlightning/src/ln/channelmanager.rs
Outdated

Comment threadlightning/src/ln/channelmanager.rs
Outdated

@wpaulino
Introduce RenegotiatedFundingLocked monitor update variant
07c2eb5
This is a new `ChannelMonitorUpdateStep` variant intended to be used
whenever a new funding transaction that was negotiated and applied via
the `RenegotiatedFunding` update reaches its intended confirmation depth
and both sides of the channel exchange `channel_ready`/`splice_locked`.
This commit primarily focuses on its use for splices, but future work
will expand where needed to support RBFs for a dual funded channel.
This monitor update ensures that the monitor can safely drop all prior
commitment data since it is now considered invalid/unnecessary. Once the
update is applied, only state for the new funding transaction is tracked
going forward, until the monitor receives another `RenegotiatedFunding`
update.
@wpaulino
Rename ChannelMonitor::first_confirmed_funding_txo
22d5428
It's only intended to be set during initialization and used to check if
the channel is v1 or v2. We rename it to `first_negotiated_funding_txo`
to better reflect its purpose.
@wpaulino
wpaulinoforce-pushed
the
renegotiated-funding-locked-monitor-update
branch
from
aa625f0 to
22d5428CompareJuly 22, 2025 01:35
TheBlueMatt
TheBlueMatt
approved these changes
Jul 22, 2025
View reviewed changes
@TheBlueMattTheBlueMatt
left a comment


Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

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

The only real changes since @jkczyz's ACK were monitor update application fixes, which I plan to lean up in a followup by fixing the internal API. Gonna land this to keep things moving but a post-merge second glance if you think its work it would be fine to @jkczyz
Comment threadlightning/src/ln/channelmanager.rs
@TheBlueMatt
TheBlueMatt
merged commit 4e4f128
into
lightningdevkit:mainJul 22, 2025

27 of 28 checks passed

@TheBlueMattTheBlueMatt
mentioned this pull request
Jul 22, 2025
 Merged

@wpaulino
wpaulino
deleted the

renegotiated-funding-locked-monitor-update

branch
July 22, 2025 23:14
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@TheBlueMattTheBlueMattTheBlueMatt approved these changes
@coderabbitaicoderabbitai[bot]coderabbitai[bot] left review comments
@jkczyzjkczyzAwaiting requested review from jkczyz

Assignees

@wpaulinowpaulino

Labels


None yet


Projects

Weekly Goals

Status: Done


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

4 participants

@wpaulino@ldk-reviews-bot@TheBlueMatt@jkczyz