[v0.20.x-branch] Backport #11035: lnwallet+lnwire: handle boundary cases - #11079
Merged
Conversation
Return both completion results when the reservation is no longer present. Add a focused regression test for the missing-reservation response. (cherry picked from commit 8bf173e)
Clamp zero-block range boundaries without treating them as valid empty ranges. Avoid emitting a zero-block prefix when the first queried block exceeds the reply chunk size, and cover both discovery paths. (cherry picked from commit b423c8b)
Author
|
Please cherry-pick the changes locally and resolve any conflicts. git fetch origin backport-11035-to-v0.20.x-branch
git worktree add --checkout .worktree/backport-11035-to-v0.20.x-branch backport-11035-to-v0.20.x-branch
cd .worktree/backport-11035-to-v0.20.x-branch
git reset --hard HEAD^
git cherry-pick -x 081adebca6d2726f232211f437e8e1f8806aeb18
git push --force-with-lease |
ziggie1984
force-pushed
the
backport-11035-to-v0.20.x-branch
branch
from
August 14, 2026 19:54
498f8ce to
cefb362
Compare
ziggie1984
marked this pull request as ready for review
August 14, 2026 19:57
ziggie1984
force-pushed
the
backport-11035-to-v0.20.x-branch
branch
from
August 14, 2026 20:00
cefb362 to
178be50
Compare
ziggie1984
approved these changes
Aug 14, 2026
ziggie1984
left a comment
ziggie1984
left a comment
Collaborator
There was a problem hiding this comment.
LGTM (merge conflict only because of missing 20.4 release notes in the last commit)
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
2 participants
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 #11035
Summary
prefixes.
Change Description
The wallet funding handler now returns both completion results when a pending
reservation is absent. Channel-range helpers retain their first height for
zero-block input, and the graph syncer skips a nonexistent prefix when the
first queried block exceeds one reply chunk.
Conflict Resolution
The release-notes commit on master writes to
docs/release-notes/release-notes-0.21.3.md, which does not exist onv0.20.x-branch. The automated cherry-pick therefore created that 0.21.3 filehere instead of conflicting. Resolved by dropping the 0.21.3 file and moving
the two Bug Fixes entries plus the contributor line into
docs/release-notes/release-notes-0.20.4.md, omitting the 0.21-onlydeprecation warnings that came along with the file.
The matching entries are added to master's copy of the 0.20.4 notes in #11081.
Verified with:
go test ./lnwallet ./lnwire ./discovery -count=1go test -race ./lnwallet -run '^TestHandleFundingCounterPartySigsMissingReservation -count=1go test -race ./discovery -run '^(TestGossipSyncerReplyChanRangeQueryBlockRange|TestGossipSyncerReplyChanRangeQueryDenseFirstBlock) -count=1