Skip to content

[v0.21.x-branch] Backport #10804: lnwallet: expose negotiated configs in aux chan state - #11160

Merged
ziggie1984 merged 1 commit into
v0.21.x-branchfrom
backport-10804-to-v0.21.x-branch
Sep 2, 2026
Merged

ziggie1984 merged 1 commit into
v0.21.x-branchfrom
backport-10804-to-v0.21.x-branch

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 2, 2026

Copy link
Copy Markdown

Backport of #10804


Description

Pass a populated aux channel state into aux funding so initial custom channel blobs include the negotiated local/remote configs.

This fixes height-0 aux channel state without adding force-close resolution plumbing in lnd.

@github-actions github-actions Bot added this to the v0.21.4 milestone Sep 2, 2026
@github-actions

github-actions Bot commented Sep 2, 2026

Copy link
Copy Markdown
Author

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin backport-10804-to-v0.21.x-branch
git worktree add --checkout .worktree/backport-10804-to-v0.21.x-branch backport-10804-to-v0.21.x-branch
cd .worktree/backport-10804-to-v0.21.x-branch
git reset --hard HEAD^
git cherry-pick -x 98abfba173967223d738677bdce85bd9541026cb
git push --force-with-lease

@ziggie1984
ziggie1984 force-pushed the backport-10804-to-v0.21.x-branch branch from a7e0eeb to 5e6bdeb Compare September 2, 2026 19:27
@ziggie1984
ziggie1984 marked this pull request as ready for review September 2, 2026 19:27

@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 only diff in the backport were the v2 version of several modules:

  • github.com/btcsuite/btcd/btcutil/v2
  • github.com/btcsuite/btcd/psbt/v2

which do not exist on the 21.x branch and were therefore changed.

@github-actions github-actions Bot added the severity-critical Requires expert review - security/consensus critical label Sep 2, 2026
@github-actions

github-actions Bot commented Sep 2, 2026

Copy link
Copy Markdown
Author

🔴 PR Severity: CRITICAL

PR diff | 4 files | 316 lines changed

🔴 Critical (2 files)
  • funding/manager.go - Channel funding workflow coordination (funding/*)
  • lnwallet/reservation.go - Channel reservation/funding logic used during commitment setup (lnwallet/*)
🟢 Low (2 files)
  • funding/manager_test.go - Test-only changes
  • lnwallet/reservation_test.go - Test-only changes (new file)

Analysis

This PR modifies funding/manager.go and lnwallet/reservation.go, both of which fall under the CRITICAL tier (channel funding workflow coordination and wallet reservation/commitment logic). The remaining two files are test-only additions/changes and don't affect the classification. Excluding tests, the change is small (2 files, ~60 lines), so no severity bump applies — the CRITICAL rating comes solely from the packages touched, not from size. Recommend review by someone familiar with the channel funding reservation flow.


To override, add a severity-override-{critical,high,medium,low} label.

@ziggie1984
ziggie1984 merged commit ae1d57a into v0.21.x-branch Sep 2, 2026
39 of 40 checks passed
@ziggie1984
ziggie1984 deleted the backport-10804-to-v0.21.x-branch branch September 2, 2026 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

no-changelog severity-critical Requires expert review - security/consensus critical

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants