Enhance FixOldChannelBackup cmd#215
Merged
guggero merged 1 commit intolightninglabs:masterfrom Nov 6, 2025
Merged
Conversation
ziggie1984
force-pushed
the
update-fixoldchannel-cmd
branch
from
5c18b24 to
9941365
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR enhances the fixoldbackup command to display funding multisig P2WSH witness program hashes when fixing old channel backups affected by lnd issue #3881. It introduces a new PubKeyForDescriptor helper method and defines a named error for better error handling.
Key changes:
- Added
ErrNoPublicKeyProvidedas a named error constant for improved error handling - Implemented
PubKeyForDescriptormethod to derive public keys from key descriptors - Enhanced backup fixing logic to compute and log funding multisig P2WSH hashes before fixing invalid channels
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| lnd/hdkeychain.go | Added ErrNoPublicKeyProvided error constant, refactored CheckDescriptor to use it, and added new PubKeyForDescriptor helper method |
| cmd/chantools/fixoldbackup.go | Enhanced channel backup fixing to handle ErrNoPublicKeyProvided, compute and log funding multisig P2WSH hashes, and improved log formatting |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
cmd/chantools/fixoldbackup.go
Outdated
|
|
||
| msHash, err := input.WitnessScriptHash(msScript) | ||
| if err != nil { | ||
| return fmt.Errorf("could not compute"+ |
There was a problem hiding this comment.
Missing space after 'compute' in error message.
Suggested change
| return fmt.Errorf("could not compute"+ | |
| return fmt.Errorf("could not compute "+ |
In case we have a channel.backup file which as partly valid channels we skip over them.
ziggie1984
force-pushed
the
update-fixoldchannel-cmd
branch
from
9941365 to
1923257
Compare
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.
In case we have a channel.backup file which as partly valid
channels we skip over them.
We also print out the funding script so we can verify some of the derivation paths regarding this channel are correct.