[v0.20.x-branch] Backport #11032: contractcourt: retain deadline across contest resolution - #11033
Merged
Merged
Conversation
Forward the supplied incoming HTLC expiry from the outgoing contest resolver to its embedded timeout resolver. This keeps the deadline available when resolution transitions after the outgoing HTLC expires. (cherry picked from commit f776068)
Author
|
Please cherry-pick the changes locally and resolve any conflicts. git fetch origin backport-11032-to-v0.20.x-branch
git worktree add --checkout .worktree/backport-11032-to-v0.20.x-branch backport-11032-to-v0.20.x-branch
cd .worktree/backport-11032-to-v0.20.x-branch
git reset --hard HEAD^
git cherry-pick -x 5b4c5067dbd3aa0714b8550511b1e05f25220b83
git push --force-with-lease |
5 tasks
ziggie1984
force-pushed
the
backport-11032-to-v0.20.x-branch
branch
from
August 6, 2026 11:52
3f64ad0 to
f93ca95
Compare
ziggie1984
marked this pull request as ready for review
August 6, 2026 11:52
Author
🔴 PR Severity: CRITICAL
🔴 Critical (1 file)
🟢 Low (2 files)
AnalysisThe core change modifies To override, add a |
ziggie1984
approved these changes
Aug 6, 2026
ziggie1984
left a comment
Collaborator
There was a problem hiding this comment.
LGTM (release notes were the only merge conflict)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #11032
Change Description
Outgoing contest resolvers embed the timeout resolver they transition to once
the outgoing HTLC reaches its expiry. Forward the corresponding incoming HTLC
expiry to that embedded resolver so the existing deadline remains available
after the transition.
The added test exercises the contest-to-timeout transition and checks that the
supplied deadline is retained.
Steps to Test
Pull Request Checklist
Testing
Code Style and Documentation
0.21.2release notes.