Skip to content

[v0.21.x-branch] Backport #11032: contractcourt: retain deadline across contest resolution - #11034

Merged
ziggie1984 merged 2 commits into
v0.21.x-branchfrom
backport-11032-to-v0.21.x-branch
Aug 6, 2026
Merged

[v0.21.x-branch] Backport #11032: contractcourt: retain deadline across contest resolution#11034
ziggie1984 merged 2 commits into
v0.21.x-branchfrom
backport-11032-to-v0.21.x-branch

Conversation

@github-actions

@github-actions github-actions Bot commented Aug 6, 2026

Copy link
Copy Markdown

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

go test ./contractcourt \
  -run 'TestHtlcOutgoingResolver(SupplementDeadline|Timeout|RemoteClaim) \
  -count=1

Pull Request Checklist

Testing

  • Your PR passes all CI checks.
  • Tests covering the changed behavior are included.

Code Style and Documentation

  • The change follows the code documentation and line-length guidelines.
  • Commits follow the ideal Git commit structure.
  • A change description is included in the 0.21.2 release notes.

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)
(cherry picked from commit 5b4c506)

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

LGTM (no merge conflicts)

@ziggie1984
ziggie1984 merged commit 77f060e into v0.21.x-branch Aug 6, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant