Release tx_signatures after async monitor update completes - #4472

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion
Mar 20, 2026
Merged

Release tx_signatures after async monitor update completes#4472
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion

Conversation

@wpaulino

Copy link
Copy Markdown
Contributor

In 83b2d3e, we reworked ChannelManager::funding_transaction_signed such that it would also for a user to cancel a splice up until they send commitment_signed. Previously, we would would only emit Event::FundingTransactionReadyForSigning when both nodes exchanged commitment_signed and the corresponding monitor update completed. With the event now being generated immediately after the nodes exchange tx_complete, we now need to handle the monitor update not having completed by the time we are ready to send tx_signatures. Unfortunately, we also did not have test coverage, allowing this to go unnoticed until being caught by the fuzzer due to a debug assertion. Doing so avoids a potential funds-loss scenario if the funding transaction confirms without the counterparty's signature for our commitment being durably persisted.

@wpaulinowpaulino added this to the 0.3 milestone Mar 9, 2026
@wpaulinowpaulino self-assigned this Mar 9, 2026
@ldk-reviews-bot

ldk-reviews-bot commented Mar 9, 2026

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.

@codecov

codecovBot commented Mar 9, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 80.95238% with 32 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.18%. Comparing base (066859b) to head (ea204f6).
⚠️ Report is 2767 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel.rs78.84%19 Missing and 3 partials ⚠️
lightning/src/ln/channelmanager.rs80.00%6 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4472 +/- ##
==========================================
+ Coverage 84.55% 86.18% +1.62% 
==========================================
Files 135 161 +26 Lines 76569 107532 +30963 Branches 76569 107532 +30963 ==========================================
+ Hits 64745 92679 +27934 - Misses 9783 12233 +2450 - Partials 2041 2620 +579 
FlagCoverage Δ
tests86.18% <80.95%> (?)

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.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @TheBlueMatt! 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.

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-claude-review-bot

ldk-claude-review-bot commented Mar 14, 2026

Copy link
Copy Markdown
Collaborator

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

✅ Added second reviewer: @tankyleo

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

Aside from what claude noted I didn't see any issues.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from c8c5dc0 to 86fa38cCompareMarch 16, 2026 18:07
@wpaulino
wpaulino requested review from jkczyz and removed request for tankyleoMarch 16, 2026 18:07
Comment threadlightning/src/ln/channel.rs Outdated
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from 86fa38c to ec60d8eCompareMarch 16, 2026 18:39
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase now.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from ec60d8e to f81bb39CompareMarch 17, 2026 17:07
@ldk-reviews-bot

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.

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

Looks good though consider these comments to encapsulate some logic in InteractiveTxSigningSession.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
In 83b2d3e, we reworked `ChannelManager::funding_transaction_signed`
such that it would also for a user to cancel a splice up until they send
`commitment_signed`. Previously, we would would only emit
`Event::FundingTransactionReadyForSigning` when both nodes exchanged
`commitment_signed` and the corresponding monitor update completed. With
the event now being generated immediately after the nodes exchange
`tx_complete`, we now need to handle the monitor update not having
completed by the time we are ready to send `tx_signatures`.
Unfortunately, we also did not have test coverage, allowing this to go
unnoticed until being caught by the fuzzer due to a debug assertion.
Doing so avoids a potential funds-loss scenario if the funding
transaction confirms without the counterparty's signature for our
commitment being durably persisted.
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from f81bb39 to ea204f6CompareMarch 19, 2026 17:45
@wpaulino
wpaulino requested a review from jkczyzMarch 19, 2026 17:45
Comment on lines +9088 to +9092
if self.is_awaiting_monitor_update() {
// Although the user may have already provided our `tx_signatures`, we must not send
// them if we're waiting for the monitor to durably persist the counterparty's signature
// for our initial commitment post-splice.
debug_assert!(self.context.monitor_pending_tx_signatures);

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.

Bug: debug_assert!(self.context.monitor_pending_tx_signatures) is too strict for V2 channel opens (non-splice).

monitor_pending_tx_signatures is only set to true in splice_initial_commitment_signed (line 8006), but NOT in initial_commitment_signed_v2 (line 7847). Both call monitor_updating_paused() which sets is_monitor_update_in_progress().

For V2 dual-funded channel opens where the initial watch_channel() returns InProgress, if the counterparty sends tx_signatures while the monitor persist is still pending:

  1. Debug builds: this debug_assert panics
  2. Release builds: correctly returns early (holding back tx_signatures), BUT when the monitor update completes, monitor_updating_restored at line 9308-9317 skips the tx_signatures release because monitor_pending_tx_signatures is false. The tx_signatures become stuck until the next reconnection.

Consider adding self.context.monitor_pending_tx_signatures = true; in initial_commitment_signed_v2 (after the monitor_updating_paused call at line 7885), consistent with splice_initial_commitment_signed at line 8006.

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.

Dual funding is not really supported yet, and we may even remove the incomplete work done thus far for the time being.

self.holder_tx_signatures
.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)

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.

We don't want to release our signatures until we receive their commitment_signed , so I assume this stronger check previously was handle at the call sites / by the nature of when this was called?

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.

Correct

.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)
|| self.has_received_tx_signatures()

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.

Does this imply we've received their commitment_signed? Should we have a stronger check / assertion here?

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.

Not at this level but it is enforced in Channel::tx_signatures

@jkczyzjkczyz mentioned this pull request Mar 19, 2026
50 tasks
@TheBlueMatt
TheBlueMatt merged commit 20e240d into lightningdevkit:mainMar 20, 2026
21 of 22 checks passed
@wpaulino
wpaulino deleted the release-tx-signatures-after-async-monitor-update-completion branch March 20, 2026 16:04
@wpaulinowpaulino mentioned this pull request Mar 30, 2026
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.

5 participants

@wpaulino@ldk-reviews-bot@ldk-claude-review-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

Release tx_signatures after async monitor update completes - #4472

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion
Mar 20, 2026
Merged

Release tx_signatures after async monitor update completes#4472
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion

Conversation

@wpaulino

Copy link
Copy Markdown
Contributor

In 83b2d3e, we reworked ChannelManager::funding_transaction_signed such that it would also for a user to cancel a splice up until they send commitment_signed. Previously, we would would only emit Event::FundingTransactionReadyForSigning when both nodes exchanged commitment_signed and the corresponding monitor update completed. With the event now being generated immediately after the nodes exchange tx_complete, we now need to handle the monitor update not having completed by the time we are ready to send tx_signatures. Unfortunately, we also did not have test coverage, allowing this to go unnoticed until being caught by the fuzzer due to a debug assertion. Doing so avoids a potential funds-loss scenario if the funding transaction confirms without the counterparty's signature for our commitment being durably persisted.

@wpaulinowpaulino added this to the 0.3 milestone Mar 9, 2026
@wpaulinowpaulino self-assigned this Mar 9, 2026
@ldk-reviews-bot

ldk-reviews-bot commented Mar 9, 2026

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.

@codecov

codecovBot commented Mar 9, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 80.95238% with 32 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.18%. Comparing base (066859b) to head (ea204f6).
⚠️ Report is 2767 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel.rs78.84%19 Missing and 3 partials ⚠️
lightning/src/ln/channelmanager.rs80.00%6 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4472 +/- ##
==========================================
+ Coverage 84.55% 86.18% +1.62% 
==========================================
Files 135 161 +26 Lines 76569 107532 +30963 Branches 76569 107532 +30963 ==========================================
+ Hits 64745 92679 +27934 - Misses 9783 12233 +2450 - Partials 2041 2620 +579 
FlagCoverage Δ
tests86.18% <80.95%> (?)

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.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @TheBlueMatt! 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.

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-claude-review-bot

ldk-claude-review-bot commented Mar 14, 2026

Copy link
Copy Markdown
Collaborator

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

✅ Added second reviewer: @tankyleo

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

Aside from what claude noted I didn't see any issues.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from c8c5dc0 to 86fa38cCompareMarch 16, 2026 18:07
@wpaulino
wpaulino requested review from jkczyz and removed request for tankyleoMarch 16, 2026 18:07
Comment threadlightning/src/ln/channel.rs Outdated
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from 86fa38c to ec60d8eCompareMarch 16, 2026 18:39
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase now.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from ec60d8e to f81bb39CompareMarch 17, 2026 17:07
@ldk-reviews-bot

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.

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

Looks good though consider these comments to encapsulate some logic in InteractiveTxSigningSession.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
In 83b2d3e, we reworked `ChannelManager::funding_transaction_signed`
such that it would also for a user to cancel a splice up until they send
`commitment_signed`. Previously, we would would only emit
`Event::FundingTransactionReadyForSigning` when both nodes exchanged
`commitment_signed` and the corresponding monitor update completed. With
the event now being generated immediately after the nodes exchange
`tx_complete`, we now need to handle the monitor update not having
completed by the time we are ready to send `tx_signatures`.
Unfortunately, we also did not have test coverage, allowing this to go
unnoticed until being caught by the fuzzer due to a debug assertion.
Doing so avoids a potential funds-loss scenario if the funding
transaction confirms without the counterparty's signature for our
commitment being durably persisted.
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from f81bb39 to ea204f6CompareMarch 19, 2026 17:45
@wpaulino
wpaulino requested a review from jkczyzMarch 19, 2026 17:45
Comment on lines +9088 to +9092
if self.is_awaiting_monitor_update() {
// Although the user may have already provided our `tx_signatures`, we must not send
// them if we're waiting for the monitor to durably persist the counterparty's signature
// for our initial commitment post-splice.
debug_assert!(self.context.monitor_pending_tx_signatures);

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.

Bug: debug_assert!(self.context.monitor_pending_tx_signatures) is too strict for V2 channel opens (non-splice).

monitor_pending_tx_signatures is only set to true in splice_initial_commitment_signed (line 8006), but NOT in initial_commitment_signed_v2 (line 7847). Both call monitor_updating_paused() which sets is_monitor_update_in_progress().

For V2 dual-funded channel opens where the initial watch_channel() returns InProgress, if the counterparty sends tx_signatures while the monitor persist is still pending:

  1. Debug builds: this debug_assert panics
  2. Release builds: correctly returns early (holding back tx_signatures), BUT when the monitor update completes, monitor_updating_restored at line 9308-9317 skips the tx_signatures release because monitor_pending_tx_signatures is false. The tx_signatures become stuck until the next reconnection.

Consider adding self.context.monitor_pending_tx_signatures = true; in initial_commitment_signed_v2 (after the monitor_updating_paused call at line 7885), consistent with splice_initial_commitment_signed at line 8006.

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.

Dual funding is not really supported yet, and we may even remove the incomplete work done thus far for the time being.

self.holder_tx_signatures
.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)

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.

We don't want to release our signatures until we receive their commitment_signed , so I assume this stronger check previously was handle at the call sites / by the nature of when this was called?

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.

Correct

.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)
|| self.has_received_tx_signatures()

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.

Does this imply we've received their commitment_signed? Should we have a stronger check / assertion here?

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.

Not at this level but it is enforced in Channel::tx_signatures

@jkczyzjkczyz mentioned this pull request Mar 19, 2026
50 tasks
@TheBlueMatt
TheBlueMatt merged commit 20e240d into lightningdevkit:mainMar 20, 2026
21 of 22 checks passed
@wpaulino
wpaulino deleted the release-tx-signatures-after-async-monitor-update-completion branch March 20, 2026 16:04
@wpaulinowpaulino mentioned this pull request Mar 30, 2026
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.

5 participants

@wpaulino@ldk-reviews-bot@ldk-claude-review-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

Release tx_signatures after async monitor update completes - #4472

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion
Mar 20, 2026
Merged

Release tx_signatures after async monitor update completes#4472
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion

Conversation

@wpaulino

Copy link
Copy Markdown
Contributor

In 83b2d3e, we reworked ChannelManager::funding_transaction_signed such that it would also for a user to cancel a splice up until they send commitment_signed. Previously, we would would only emit Event::FundingTransactionReadyForSigning when both nodes exchanged commitment_signed and the corresponding monitor update completed. With the event now being generated immediately after the nodes exchange tx_complete, we now need to handle the monitor update not having completed by the time we are ready to send tx_signatures. Unfortunately, we also did not have test coverage, allowing this to go unnoticed until being caught by the fuzzer due to a debug assertion. Doing so avoids a potential funds-loss scenario if the funding transaction confirms without the counterparty's signature for our commitment being durably persisted.

@wpaulinowpaulino added this to the 0.3 milestone Mar 9, 2026
@wpaulinowpaulino self-assigned this Mar 9, 2026
@ldk-reviews-bot

ldk-reviews-bot commented Mar 9, 2026

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.

@codecov

codecovBot commented Mar 9, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 80.95238% with 32 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.18%. Comparing base (066859b) to head (ea204f6).
⚠️ Report is 2767 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel.rs78.84%19 Missing and 3 partials ⚠️
lightning/src/ln/channelmanager.rs80.00%6 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4472 +/- ##
==========================================
+ Coverage 84.55% 86.18% +1.62% 
==========================================
Files 135 161 +26 Lines 76569 107532 +30963 Branches 76569 107532 +30963 ==========================================
+ Hits 64745 92679 +27934 - Misses 9783 12233 +2450 - Partials 2041 2620 +579 
FlagCoverage Δ
tests86.18% <80.95%> (?)

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.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @TheBlueMatt! 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.

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-claude-review-bot

ldk-claude-review-bot commented Mar 14, 2026

Copy link
Copy Markdown
Collaborator

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

✅ Added second reviewer: @tankyleo

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

Aside from what claude noted I didn't see any issues.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from c8c5dc0 to 86fa38cCompareMarch 16, 2026 18:07
@wpaulino
wpaulino requested review from jkczyz and removed request for tankyleoMarch 16, 2026 18:07
Comment threadlightning/src/ln/channel.rs Outdated
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from 86fa38c to ec60d8eCompareMarch 16, 2026 18:39
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase now.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from ec60d8e to f81bb39CompareMarch 17, 2026 17:07
@ldk-reviews-bot

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.

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

Looks good though consider these comments to encapsulate some logic in InteractiveTxSigningSession.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
In 83b2d3e, we reworked `ChannelManager::funding_transaction_signed`
such that it would also for a user to cancel a splice up until they send
`commitment_signed`. Previously, we would would only emit
`Event::FundingTransactionReadyForSigning` when both nodes exchanged
`commitment_signed` and the corresponding monitor update completed. With
the event now being generated immediately after the nodes exchange
`tx_complete`, we now need to handle the monitor update not having
completed by the time we are ready to send `tx_signatures`.
Unfortunately, we also did not have test coverage, allowing this to go
unnoticed until being caught by the fuzzer due to a debug assertion.
Doing so avoids a potential funds-loss scenario if the funding
transaction confirms without the counterparty's signature for our
commitment being durably persisted.
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from f81bb39 to ea204f6CompareMarch 19, 2026 17:45
@wpaulino
wpaulino requested a review from jkczyzMarch 19, 2026 17:45
Comment on lines +9088 to +9092
if self.is_awaiting_monitor_update() {
// Although the user may have already provided our `tx_signatures`, we must not send
// them if we're waiting for the monitor to durably persist the counterparty's signature
// for our initial commitment post-splice.
debug_assert!(self.context.monitor_pending_tx_signatures);

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.

Bug: debug_assert!(self.context.monitor_pending_tx_signatures) is too strict for V2 channel opens (non-splice).

monitor_pending_tx_signatures is only set to true in splice_initial_commitment_signed (line 8006), but NOT in initial_commitment_signed_v2 (line 7847). Both call monitor_updating_paused() which sets is_monitor_update_in_progress().

For V2 dual-funded channel opens where the initial watch_channel() returns InProgress, if the counterparty sends tx_signatures while the monitor persist is still pending:

  1. Debug builds: this debug_assert panics
  2. Release builds: correctly returns early (holding back tx_signatures), BUT when the monitor update completes, monitor_updating_restored at line 9308-9317 skips the tx_signatures release because monitor_pending_tx_signatures is false. The tx_signatures become stuck until the next reconnection.

Consider adding self.context.monitor_pending_tx_signatures = true; in initial_commitment_signed_v2 (after the monitor_updating_paused call at line 7885), consistent with splice_initial_commitment_signed at line 8006.

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.

Dual funding is not really supported yet, and we may even remove the incomplete work done thus far for the time being.

self.holder_tx_signatures
.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)

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.

We don't want to release our signatures until we receive their commitment_signed , so I assume this stronger check previously was handle at the call sites / by the nature of when this was called?

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.

Correct

.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)
|| self.has_received_tx_signatures()

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.

Does this imply we've received their commitment_signed? Should we have a stronger check / assertion here?

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.

Not at this level but it is enforced in Channel::tx_signatures

@jkczyzjkczyz mentioned this pull request Mar 19, 2026
50 tasks
@TheBlueMatt
TheBlueMatt merged commit 20e240d into lightningdevkit:mainMar 20, 2026
21 of 22 checks passed
@wpaulino
wpaulino deleted the release-tx-signatures-after-async-monitor-update-completion branch March 20, 2026 16:04
@wpaulinowpaulino mentioned this pull request Mar 30, 2026
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.

5 participants

@wpaulino@ldk-reviews-bot@ldk-claude-review-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

Release tx_signatures after async monitor update completes - #4472

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion
Mar 20, 2026
Merged

Release tx_signatures after async monitor update completes#4472
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion

Conversation

@wpaulino

Copy link
Copy Markdown
Contributor

In 83b2d3e, we reworked ChannelManager::funding_transaction_signed such that it would also for a user to cancel a splice up until they send commitment_signed. Previously, we would would only emit Event::FundingTransactionReadyForSigning when both nodes exchanged commitment_signed and the corresponding monitor update completed. With the event now being generated immediately after the nodes exchange tx_complete, we now need to handle the monitor update not having completed by the time we are ready to send tx_signatures. Unfortunately, we also did not have test coverage, allowing this to go unnoticed until being caught by the fuzzer due to a debug assertion. Doing so avoids a potential funds-loss scenario if the funding transaction confirms without the counterparty's signature for our commitment being durably persisted.

@wpaulinowpaulino added this to the 0.3 milestone Mar 9, 2026
@wpaulinowpaulino self-assigned this Mar 9, 2026
@ldk-reviews-bot

ldk-reviews-bot commented Mar 9, 2026

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.

@codecov

codecovBot commented Mar 9, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 80.95238% with 32 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.18%. Comparing base (066859b) to head (ea204f6).
⚠️ Report is 2767 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel.rs78.84%19 Missing and 3 partials ⚠️
lightning/src/ln/channelmanager.rs80.00%6 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4472 +/- ##
==========================================
+ Coverage 84.55% 86.18% +1.62% 
==========================================
Files 135 161 +26 Lines 76569 107532 +30963 Branches 76569 107532 +30963 ==========================================
+ Hits 64745 92679 +27934 - Misses 9783 12233 +2450 - Partials 2041 2620 +579 
FlagCoverage Δ
tests86.18% <80.95%> (?)

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.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @TheBlueMatt! 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.

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-claude-review-bot

ldk-claude-review-bot commented Mar 14, 2026

Copy link
Copy Markdown
Collaborator

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

✅ Added second reviewer: @tankyleo

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

Aside from what claude noted I didn't see any issues.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from c8c5dc0 to 86fa38cCompareMarch 16, 2026 18:07
@wpaulino
wpaulino requested review from jkczyz and removed request for tankyleoMarch 16, 2026 18:07
Comment threadlightning/src/ln/channel.rs Outdated
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from 86fa38c to ec60d8eCompareMarch 16, 2026 18:39
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase now.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from ec60d8e to f81bb39CompareMarch 17, 2026 17:07
@ldk-reviews-bot

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.

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

Looks good though consider these comments to encapsulate some logic in InteractiveTxSigningSession.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
In 83b2d3e, we reworked `ChannelManager::funding_transaction_signed`
such that it would also for a user to cancel a splice up until they send
`commitment_signed`. Previously, we would would only emit
`Event::FundingTransactionReadyForSigning` when both nodes exchanged
`commitment_signed` and the corresponding monitor update completed. With
the event now being generated immediately after the nodes exchange
`tx_complete`, we now need to handle the monitor update not having
completed by the time we are ready to send `tx_signatures`.
Unfortunately, we also did not have test coverage, allowing this to go
unnoticed until being caught by the fuzzer due to a debug assertion.
Doing so avoids a potential funds-loss scenario if the funding
transaction confirms without the counterparty's signature for our
commitment being durably persisted.
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from f81bb39 to ea204f6CompareMarch 19, 2026 17:45
@wpaulino
wpaulino requested a review from jkczyzMarch 19, 2026 17:45
Comment on lines +9088 to +9092
if self.is_awaiting_monitor_update() {
// Although the user may have already provided our `tx_signatures`, we must not send
// them if we're waiting for the monitor to durably persist the counterparty's signature
// for our initial commitment post-splice.
debug_assert!(self.context.monitor_pending_tx_signatures);

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.

Bug: debug_assert!(self.context.monitor_pending_tx_signatures) is too strict for V2 channel opens (non-splice).

monitor_pending_tx_signatures is only set to true in splice_initial_commitment_signed (line 8006), but NOT in initial_commitment_signed_v2 (line 7847). Both call monitor_updating_paused() which sets is_monitor_update_in_progress().

For V2 dual-funded channel opens where the initial watch_channel() returns InProgress, if the counterparty sends tx_signatures while the monitor persist is still pending:

  1. Debug builds: this debug_assert panics
  2. Release builds: correctly returns early (holding back tx_signatures), BUT when the monitor update completes, monitor_updating_restored at line 9308-9317 skips the tx_signatures release because monitor_pending_tx_signatures is false. The tx_signatures become stuck until the next reconnection.

Consider adding self.context.monitor_pending_tx_signatures = true; in initial_commitment_signed_v2 (after the monitor_updating_paused call at line 7885), consistent with splice_initial_commitment_signed at line 8006.

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.

Dual funding is not really supported yet, and we may even remove the incomplete work done thus far for the time being.

self.holder_tx_signatures
.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)

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.

We don't want to release our signatures until we receive their commitment_signed , so I assume this stronger check previously was handle at the call sites / by the nature of when this was called?

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.

Correct

.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)
|| self.has_received_tx_signatures()

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.

Does this imply we've received their commitment_signed? Should we have a stronger check / assertion here?

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.

Not at this level but it is enforced in Channel::tx_signatures

@jkczyzjkczyz mentioned this pull request Mar 19, 2026
50 tasks
@TheBlueMatt
TheBlueMatt merged commit 20e240d into lightningdevkit:mainMar 20, 2026
21 of 22 checks passed
@wpaulino
wpaulino deleted the release-tx-signatures-after-async-monitor-update-completion branch March 20, 2026 16:04
@wpaulinowpaulino mentioned this pull request Mar 30, 2026
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.

5 participants

@wpaulino@ldk-reviews-bot@ldk-claude-review-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

Release tx_signatures after async monitor update completes - #4472

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion
Mar 20, 2026
Merged

Release tx_signatures after async monitor update completes#4472
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion

Conversation

@wpaulino

Copy link
Copy Markdown
Contributor

In 83b2d3e, we reworked ChannelManager::funding_transaction_signed such that it would also for a user to cancel a splice up until they send commitment_signed. Previously, we would would only emit Event::FundingTransactionReadyForSigning when both nodes exchanged commitment_signed and the corresponding monitor update completed. With the event now being generated immediately after the nodes exchange tx_complete, we now need to handle the monitor update not having completed by the time we are ready to send tx_signatures. Unfortunately, we also did not have test coverage, allowing this to go unnoticed until being caught by the fuzzer due to a debug assertion. Doing so avoids a potential funds-loss scenario if the funding transaction confirms without the counterparty's signature for our commitment being durably persisted.

@wpaulinowpaulino added this to the 0.3 milestone Mar 9, 2026
@wpaulinowpaulino self-assigned this Mar 9, 2026
@ldk-reviews-bot

ldk-reviews-bot commented Mar 9, 2026

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.

@codecov

codecovBot commented Mar 9, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 80.95238% with 32 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.18%. Comparing base (066859b) to head (ea204f6).
⚠️ Report is 2767 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel.rs78.84%19 Missing and 3 partials ⚠️
lightning/src/ln/channelmanager.rs80.00%6 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4472 +/- ##
==========================================
+ Coverage 84.55% 86.18% +1.62% 
==========================================
Files 135 161 +26 Lines 76569 107532 +30963 Branches 76569 107532 +30963 ==========================================
+ Hits 64745 92679 +27934 - Misses 9783 12233 +2450 - Partials 2041 2620 +579 
FlagCoverage Δ
tests86.18% <80.95%> (?)

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.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @TheBlueMatt! 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.

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-claude-review-bot

ldk-claude-review-bot commented Mar 14, 2026

Copy link
Copy Markdown
Collaborator

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

✅ Added second reviewer: @tankyleo

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

Aside from what claude noted I didn't see any issues.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from c8c5dc0 to 86fa38cCompareMarch 16, 2026 18:07
@wpaulino
wpaulino requested review from jkczyz and removed request for tankyleoMarch 16, 2026 18:07
Comment threadlightning/src/ln/channel.rs Outdated
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from 86fa38c to ec60d8eCompareMarch 16, 2026 18:39
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase now.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from ec60d8e to f81bb39CompareMarch 17, 2026 17:07
@ldk-reviews-bot

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.

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

Looks good though consider these comments to encapsulate some logic in InteractiveTxSigningSession.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
In 83b2d3e, we reworked `ChannelManager::funding_transaction_signed`
such that it would also for a user to cancel a splice up until they send
`commitment_signed`. Previously, we would would only emit
`Event::FundingTransactionReadyForSigning` when both nodes exchanged
`commitment_signed` and the corresponding monitor update completed. With
the event now being generated immediately after the nodes exchange
`tx_complete`, we now need to handle the monitor update not having
completed by the time we are ready to send `tx_signatures`.
Unfortunately, we also did not have test coverage, allowing this to go
unnoticed until being caught by the fuzzer due to a debug assertion.
Doing so avoids a potential funds-loss scenario if the funding
transaction confirms without the counterparty's signature for our
commitment being durably persisted.
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from f81bb39 to ea204f6CompareMarch 19, 2026 17:45
@wpaulino
wpaulino requested a review from jkczyzMarch 19, 2026 17:45
Comment on lines +9088 to +9092
if self.is_awaiting_monitor_update() {
// Although the user may have already provided our `tx_signatures`, we must not send
// them if we're waiting for the monitor to durably persist the counterparty's signature
// for our initial commitment post-splice.
debug_assert!(self.context.monitor_pending_tx_signatures);

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.

Bug: debug_assert!(self.context.monitor_pending_tx_signatures) is too strict for V2 channel opens (non-splice).

monitor_pending_tx_signatures is only set to true in splice_initial_commitment_signed (line 8006), but NOT in initial_commitment_signed_v2 (line 7847). Both call monitor_updating_paused() which sets is_monitor_update_in_progress().

For V2 dual-funded channel opens where the initial watch_channel() returns InProgress, if the counterparty sends tx_signatures while the monitor persist is still pending:

  1. Debug builds: this debug_assert panics
  2. Release builds: correctly returns early (holding back tx_signatures), BUT when the monitor update completes, monitor_updating_restored at line 9308-9317 skips the tx_signatures release because monitor_pending_tx_signatures is false. The tx_signatures become stuck until the next reconnection.

Consider adding self.context.monitor_pending_tx_signatures = true; in initial_commitment_signed_v2 (after the monitor_updating_paused call at line 7885), consistent with splice_initial_commitment_signed at line 8006.

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.

Dual funding is not really supported yet, and we may even remove the incomplete work done thus far for the time being.

self.holder_tx_signatures
.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)

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.

We don't want to release our signatures until we receive their commitment_signed , so I assume this stronger check previously was handle at the call sites / by the nature of when this was called?

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.

Correct

.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)
|| self.has_received_tx_signatures()

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.

Does this imply we've received their commitment_signed? Should we have a stronger check / assertion here?

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.

Not at this level but it is enforced in Channel::tx_signatures

@jkczyzjkczyz mentioned this pull request Mar 19, 2026
50 tasks
@TheBlueMatt
TheBlueMatt merged commit 20e240d into lightningdevkit:mainMar 20, 2026
21 of 22 checks passed
@wpaulino
wpaulino deleted the release-tx-signatures-after-async-monitor-update-completion branch March 20, 2026 16:04
@wpaulinowpaulino mentioned this pull request Mar 30, 2026
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.

5 participants

@wpaulino@ldk-reviews-bot@ldk-claude-review-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

Release tx_signatures after async monitor update completes - #4472

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion
Mar 20, 2026
Merged

Release tx_signatures after async monitor update completes#4472
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion

Conversation

@wpaulino

Copy link
Copy Markdown
Contributor

In 83b2d3e, we reworked ChannelManager::funding_transaction_signed such that it would also for a user to cancel a splice up until they send commitment_signed. Previously, we would would only emit Event::FundingTransactionReadyForSigning when both nodes exchanged commitment_signed and the corresponding monitor update completed. With the event now being generated immediately after the nodes exchange tx_complete, we now need to handle the monitor update not having completed by the time we are ready to send tx_signatures. Unfortunately, we also did not have test coverage, allowing this to go unnoticed until being caught by the fuzzer due to a debug assertion. Doing so avoids a potential funds-loss scenario if the funding transaction confirms without the counterparty's signature for our commitment being durably persisted.

@wpaulinowpaulino added this to the 0.3 milestone Mar 9, 2026
@wpaulinowpaulino self-assigned this Mar 9, 2026
@ldk-reviews-bot

ldk-reviews-bot commented Mar 9, 2026

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.

@codecov

codecovBot commented Mar 9, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 80.95238% with 32 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.18%. Comparing base (066859b) to head (ea204f6).
⚠️ Report is 2767 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel.rs78.84%19 Missing and 3 partials ⚠️
lightning/src/ln/channelmanager.rs80.00%6 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4472 +/- ##
==========================================
+ Coverage 84.55% 86.18% +1.62% 
==========================================
Files 135 161 +26 Lines 76569 107532 +30963 Branches 76569 107532 +30963 ==========================================
+ Hits 64745 92679 +27934 - Misses 9783 12233 +2450 - Partials 2041 2620 +579 
FlagCoverage Δ
tests86.18% <80.95%> (?)

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.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @TheBlueMatt! 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.

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-claude-review-bot

ldk-claude-review-bot commented Mar 14, 2026

Copy link
Copy Markdown
Collaborator

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

✅ Added second reviewer: @tankyleo

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

Aside from what claude noted I didn't see any issues.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from c8c5dc0 to 86fa38cCompareMarch 16, 2026 18:07
@wpaulino
wpaulino requested review from jkczyz and removed request for tankyleoMarch 16, 2026 18:07
Comment threadlightning/src/ln/channel.rs Outdated
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from 86fa38c to ec60d8eCompareMarch 16, 2026 18:39
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase now.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from ec60d8e to f81bb39CompareMarch 17, 2026 17:07
@ldk-reviews-bot

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.

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

Looks good though consider these comments to encapsulate some logic in InteractiveTxSigningSession.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
In 83b2d3e, we reworked `ChannelManager::funding_transaction_signed`
such that it would also for a user to cancel a splice up until they send
`commitment_signed`. Previously, we would would only emit
`Event::FundingTransactionReadyForSigning` when both nodes exchanged
`commitment_signed` and the corresponding monitor update completed. With
the event now being generated immediately after the nodes exchange
`tx_complete`, we now need to handle the monitor update not having
completed by the time we are ready to send `tx_signatures`.
Unfortunately, we also did not have test coverage, allowing this to go
unnoticed until being caught by the fuzzer due to a debug assertion.
Doing so avoids a potential funds-loss scenario if the funding
transaction confirms without the counterparty's signature for our
commitment being durably persisted.
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from f81bb39 to ea204f6CompareMarch 19, 2026 17:45
@wpaulino
wpaulino requested a review from jkczyzMarch 19, 2026 17:45
Comment on lines +9088 to +9092
if self.is_awaiting_monitor_update() {
// Although the user may have already provided our `tx_signatures`, we must not send
// them if we're waiting for the monitor to durably persist the counterparty's signature
// for our initial commitment post-splice.
debug_assert!(self.context.monitor_pending_tx_signatures);

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.

Bug: debug_assert!(self.context.monitor_pending_tx_signatures) is too strict for V2 channel opens (non-splice).

monitor_pending_tx_signatures is only set to true in splice_initial_commitment_signed (line 8006), but NOT in initial_commitment_signed_v2 (line 7847). Both call monitor_updating_paused() which sets is_monitor_update_in_progress().

For V2 dual-funded channel opens where the initial watch_channel() returns InProgress, if the counterparty sends tx_signatures while the monitor persist is still pending:

  1. Debug builds: this debug_assert panics
  2. Release builds: correctly returns early (holding back tx_signatures), BUT when the monitor update completes, monitor_updating_restored at line 9308-9317 skips the tx_signatures release because monitor_pending_tx_signatures is false. The tx_signatures become stuck until the next reconnection.

Consider adding self.context.monitor_pending_tx_signatures = true; in initial_commitment_signed_v2 (after the monitor_updating_paused call at line 7885), consistent with splice_initial_commitment_signed at line 8006.

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.

Dual funding is not really supported yet, and we may even remove the incomplete work done thus far for the time being.

self.holder_tx_signatures
.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)

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.

We don't want to release our signatures until we receive their commitment_signed , so I assume this stronger check previously was handle at the call sites / by the nature of when this was called?

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.

Correct

.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)
|| self.has_received_tx_signatures()

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.

Does this imply we've received their commitment_signed? Should we have a stronger check / assertion here?

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.

Not at this level but it is enforced in Channel::tx_signatures

@jkczyzjkczyz mentioned this pull request Mar 19, 2026
50 tasks
@TheBlueMatt
TheBlueMatt merged commit 20e240d into lightningdevkit:mainMar 20, 2026
21 of 22 checks passed
@wpaulino
wpaulino deleted the release-tx-signatures-after-async-monitor-update-completion branch March 20, 2026 16:04
@wpaulinowpaulino mentioned this pull request Mar 30, 2026
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.

5 participants

@wpaulino@ldk-reviews-bot@ldk-claude-review-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

Release tx_signatures after async monitor update completes - #4472

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion
Mar 20, 2026
Merged

Release tx_signatures after async monitor update completes#4472
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion

Conversation

@wpaulino

Copy link
Copy Markdown
Contributor

In 83b2d3e, we reworked ChannelManager::funding_transaction_signed such that it would also for a user to cancel a splice up until they send commitment_signed. Previously, we would would only emit Event::FundingTransactionReadyForSigning when both nodes exchanged commitment_signed and the corresponding monitor update completed. With the event now being generated immediately after the nodes exchange tx_complete, we now need to handle the monitor update not having completed by the time we are ready to send tx_signatures. Unfortunately, we also did not have test coverage, allowing this to go unnoticed until being caught by the fuzzer due to a debug assertion. Doing so avoids a potential funds-loss scenario if the funding transaction confirms without the counterparty's signature for our commitment being durably persisted.

@wpaulinowpaulino added this to the 0.3 milestone Mar 9, 2026
@wpaulinowpaulino self-assigned this Mar 9, 2026
@ldk-reviews-bot

ldk-reviews-bot commented Mar 9, 2026

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.

@codecov

codecovBot commented Mar 9, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 80.95238% with 32 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.18%. Comparing base (066859b) to head (ea204f6).
⚠️ Report is 2767 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel.rs78.84%19 Missing and 3 partials ⚠️
lightning/src/ln/channelmanager.rs80.00%6 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4472 +/- ##
==========================================
+ Coverage 84.55% 86.18% +1.62% 
==========================================
Files 135 161 +26 Lines 76569 107532 +30963 Branches 76569 107532 +30963 ==========================================
+ Hits 64745 92679 +27934 - Misses 9783 12233 +2450 - Partials 2041 2620 +579 
FlagCoverage Δ
tests86.18% <80.95%> (?)

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.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @TheBlueMatt! 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.

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-claude-review-bot

ldk-claude-review-bot commented Mar 14, 2026

Copy link
Copy Markdown
Collaborator

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

✅ Added second reviewer: @tankyleo

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

Aside from what claude noted I didn't see any issues.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from c8c5dc0 to 86fa38cCompareMarch 16, 2026 18:07
@wpaulino
wpaulino requested review from jkczyz and removed request for tankyleoMarch 16, 2026 18:07
Comment threadlightning/src/ln/channel.rs Outdated
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from 86fa38c to ec60d8eCompareMarch 16, 2026 18:39
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase now.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from ec60d8e to f81bb39CompareMarch 17, 2026 17:07
@ldk-reviews-bot

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.

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

Looks good though consider these comments to encapsulate some logic in InteractiveTxSigningSession.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
In 83b2d3e, we reworked `ChannelManager::funding_transaction_signed`
such that it would also for a user to cancel a splice up until they send
`commitment_signed`. Previously, we would would only emit
`Event::FundingTransactionReadyForSigning` when both nodes exchanged
`commitment_signed` and the corresponding monitor update completed. With
the event now being generated immediately after the nodes exchange
`tx_complete`, we now need to handle the monitor update not having
completed by the time we are ready to send `tx_signatures`.
Unfortunately, we also did not have test coverage, allowing this to go
unnoticed until being caught by the fuzzer due to a debug assertion.
Doing so avoids a potential funds-loss scenario if the funding
transaction confirms without the counterparty's signature for our
commitment being durably persisted.
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from f81bb39 to ea204f6CompareMarch 19, 2026 17:45
@wpaulino
wpaulino requested a review from jkczyzMarch 19, 2026 17:45
Comment on lines +9088 to +9092
if self.is_awaiting_monitor_update() {
// Although the user may have already provided our `tx_signatures`, we must not send
// them if we're waiting for the monitor to durably persist the counterparty's signature
// for our initial commitment post-splice.
debug_assert!(self.context.monitor_pending_tx_signatures);

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.

Bug: debug_assert!(self.context.monitor_pending_tx_signatures) is too strict for V2 channel opens (non-splice).

monitor_pending_tx_signatures is only set to true in splice_initial_commitment_signed (line 8006), but NOT in initial_commitment_signed_v2 (line 7847). Both call monitor_updating_paused() which sets is_monitor_update_in_progress().

For V2 dual-funded channel opens where the initial watch_channel() returns InProgress, if the counterparty sends tx_signatures while the monitor persist is still pending:

  1. Debug builds: this debug_assert panics
  2. Release builds: correctly returns early (holding back tx_signatures), BUT when the monitor update completes, monitor_updating_restored at line 9308-9317 skips the tx_signatures release because monitor_pending_tx_signatures is false. The tx_signatures become stuck until the next reconnection.

Consider adding self.context.monitor_pending_tx_signatures = true; in initial_commitment_signed_v2 (after the monitor_updating_paused call at line 7885), consistent with splice_initial_commitment_signed at line 8006.

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.

Dual funding is not really supported yet, and we may even remove the incomplete work done thus far for the time being.

self.holder_tx_signatures
.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)

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.

We don't want to release our signatures until we receive their commitment_signed , so I assume this stronger check previously was handle at the call sites / by the nature of when this was called?

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.

Correct

.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)
|| self.has_received_tx_signatures()

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.

Does this imply we've received their commitment_signed? Should we have a stronger check / assertion here?

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.

Not at this level but it is enforced in Channel::tx_signatures

@jkczyzjkczyz mentioned this pull request Mar 19, 2026
50 tasks
@TheBlueMatt
TheBlueMatt merged commit 20e240d into lightningdevkit:mainMar 20, 2026
21 of 22 checks passed
@wpaulino
wpaulino deleted the release-tx-signatures-after-async-monitor-update-completion branch March 20, 2026 16:04
@wpaulinowpaulino mentioned this pull request Mar 30, 2026
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.

5 participants

@wpaulino@ldk-reviews-bot@ldk-claude-review-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

Release tx_signatures after async monitor update completes - #4472

Merged
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion
Mar 20, 2026
Merged

Release tx_signatures after async monitor update completes#4472
TheBlueMatt merged 1 commit into
lightningdevkit:mainfrom
wpaulino:release-tx-signatures-after-async-monitor-update-completion

Conversation

@wpaulino

Copy link
Copy Markdown
Contributor

In 83b2d3e, we reworked ChannelManager::funding_transaction_signed such that it would also for a user to cancel a splice up until they send commitment_signed. Previously, we would would only emit Event::FundingTransactionReadyForSigning when both nodes exchanged commitment_signed and the corresponding monitor update completed. With the event now being generated immediately after the nodes exchange tx_complete, we now need to handle the monitor update not having completed by the time we are ready to send tx_signatures. Unfortunately, we also did not have test coverage, allowing this to go unnoticed until being caught by the fuzzer due to a debug assertion. Doing so avoids a potential funds-loss scenario if the funding transaction confirms without the counterparty's signature for our commitment being durably persisted.

@wpaulinowpaulino added this to the 0.3 milestone Mar 9, 2026
@wpaulinowpaulino self-assigned this Mar 9, 2026
@ldk-reviews-bot

ldk-reviews-bot commented Mar 9, 2026

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.

@codecov

codecovBot commented Mar 9, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 80.95238% with 32 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.18%. Comparing base (066859b) to head (ea204f6).
⚠️ Report is 2767 commits behind head on main.

Files with missing linesPatch %Lines
lightning/src/ln/channel.rs78.84%19 Missing and 3 partials ⚠️
lightning/src/ln/channelmanager.rs80.00%6 Missing and 4 partials ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4472 +/- ##
==========================================
+ Coverage 84.55% 86.18% +1.62% 
==========================================
Files 135 161 +26 Lines 76569 107532 +30963 Branches 76569 107532 +30963 ==========================================
+ Hits 64745 92679 +27934 - Misses 9783 12233 +2450 - Partials 2041 2620 +579 
FlagCoverage Δ
tests86.18% <80.95%> (?)

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.

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 1st Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

🔔 2nd Reminder

Hey @TheBlueMatt! 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.

Comment threadlightning/src/ln/channel.rs
Comment threadlightning/src/ln/channel.rs Outdated
@ldk-claude-review-bot

ldk-claude-review-bot commented Mar 14, 2026

Copy link
Copy Markdown
Collaborator

@ldk-reviews-bot

Copy link
Copy Markdown

🔔 3rd Reminder

Hey @TheBlueMatt! 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

Copy link
Copy Markdown

✅ Added second reviewer: @tankyleo

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

Aside from what claude noted I didn't see any issues.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from c8c5dc0 to 86fa38cCompareMarch 16, 2026 18:07
@wpaulino
wpaulino requested review from jkczyz and removed request for tankyleoMarch 16, 2026 18:07
Comment threadlightning/src/ln/channel.rs Outdated
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from 86fa38c to ec60d8eCompareMarch 16, 2026 18:39
@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Needs rebase now.

@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from ec60d8e to f81bb39CompareMarch 17, 2026 17:07
@ldk-reviews-bot

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.

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

Looks good though consider these comments to encapsulate some logic in InteractiveTxSigningSession.

Comment threadlightning/src/ln/channel.rs Outdated
Comment threadlightning/src/ln/channel.rs Outdated
In 83b2d3e, we reworked `ChannelManager::funding_transaction_signed`
such that it would also for a user to cancel a splice up until they send
`commitment_signed`. Previously, we would would only emit
`Event::FundingTransactionReadyForSigning` when both nodes exchanged
`commitment_signed` and the corresponding monitor update completed. With
the event now being generated immediately after the nodes exchange
`tx_complete`, we now need to handle the monitor update not having
completed by the time we are ready to send `tx_signatures`.
Unfortunately, we also did not have test coverage, allowing this to go
unnoticed until being caught by the fuzzer due to a debug assertion.
Doing so avoids a potential funds-loss scenario if the funding
transaction confirms without the counterparty's signature for our
commitment being durably persisted.
@wpaulino
wpaulinoforce-pushed the release-tx-signatures-after-async-monitor-update-completion branch from f81bb39 to ea204f6CompareMarch 19, 2026 17:45
@wpaulino
wpaulino requested a review from jkczyzMarch 19, 2026 17:45
Comment on lines +9088 to +9092
if self.is_awaiting_monitor_update() {
// Although the user may have already provided our `tx_signatures`, we must not send
// them if we're waiting for the monitor to durably persist the counterparty's signature
// for our initial commitment post-splice.
debug_assert!(self.context.monitor_pending_tx_signatures);

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.

Bug: debug_assert!(self.context.monitor_pending_tx_signatures) is too strict for V2 channel opens (non-splice).

monitor_pending_tx_signatures is only set to true in splice_initial_commitment_signed (line 8006), but NOT in initial_commitment_signed_v2 (line 7847). Both call monitor_updating_paused() which sets is_monitor_update_in_progress().

For V2 dual-funded channel opens where the initial watch_channel() returns InProgress, if the counterparty sends tx_signatures while the monitor persist is still pending:

  1. Debug builds: this debug_assert panics
  2. Release builds: correctly returns early (holding back tx_signatures), BUT when the monitor update completes, monitor_updating_restored at line 9308-9317 skips the tx_signatures release because monitor_pending_tx_signatures is false. The tx_signatures become stuck until the next reconnection.

Consider adding self.context.monitor_pending_tx_signatures = true; in initial_commitment_signed_v2 (after the monitor_updating_paused call at line 7885), consistent with splice_initial_commitment_signed at line 8006.

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.

Dual funding is not really supported yet, and we may even remove the incomplete work done thus far for the time being.

self.holder_tx_signatures
.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)

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.

We don't want to release our signatures until we receive their commitment_signed , so I assume this stronger check previously was handle at the call sites / by the nature of when this was called?

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.

Correct

.as_ref()
.filter(|_| {
(self.has_received_commitment_signed && self.holder_sends_tx_signatures_first)
|| self.has_received_tx_signatures()

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.

Does this imply we've received their commitment_signed? Should we have a stronger check / assertion here?

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.

Not at this level but it is enforced in Channel::tx_signatures

@jkczyzjkczyz mentioned this pull request Mar 19, 2026
50 tasks
@TheBlueMatt
TheBlueMatt merged commit 20e240d into lightningdevkit:mainMar 20, 2026
21 of 22 checks passed
@wpaulino
wpaulino deleted the release-tx-signatures-after-async-monitor-update-completion branch March 20, 2026 16:04
@wpaulinowpaulino mentioned this pull request Mar 30, 2026
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.

5 participants

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