Merge lnd-20-0 into master with conflict resolution #258
Conversation
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
Add `XFindBaseLocalChanAlias`
port CloseInstant update and NumberOfPendingHtlcs to lnd-20 branch
SubscribeSingleInvoice: provide full invoice (lnd-20-0 port)
Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.2.0 to 1.2.8. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.2.8/CHANGELOG.md) - [Commits](opencontainers/runc@v1.2.0...v1.2.8) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-version: 1.2.8 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
SatPerByte is deprecated.
Port "SendCoins: use SatPerVbyte" and "bump runc to 1.2.8" to lnd-20-0
Updated LND dependency to v0.20.0-beta by running: go get github.com/lightningnetwork/[email protected] go mod tidy Also updated Go version in the lint Dockerfile to match go.mod.
While v0.18.5-beta likely still works, raising the minimum version reduces the need to handle deprecated fields, even if they're technically still supported.
go.mod: bump LND to v0.20.0-beta
Keep the lnd-20-0 history intact and avoid rewriting commits that already have tags and external references.
Contributor
Author
|
I've noticed we still use |
starius
approved these changes
Nov 13, 2025
Contributor
starius
left a comment
starius
left a comment
There was a problem hiding this comment.
LGTM! The total diff looks good!
I noticed that some commits are already present in master:
- lndclient: handle CloseInstant update
- lndclient: NumberOfPendingHtlcs method for close update
- merge commit of two commits above: 30e0f9f
- SubscribeSingleInvoice: provide full invoice and its merge commit
- build(deps): bump github.com/opencontainers/runc from 1.2.0 to 1.2.8 and its merge commit
- SendCoins: use SatPerVbyte instead of SatPerByte and its merge commit
We can keep them if that is the process.
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.
LND version on
lndclientbranchlnd-20-0is out of RC. I believe we can now merge thelnd-20-0branch intomaster.This PR brings the lnd-20-0 changes into master.
Conflicts with master were resolved via a merge commit on
lnd-20-0__with-merge-resolverather than rebasing, so we avoid rewriting history on the originallnd-20-0branch and keep existing tags and references valid.Pull Request Checklist
in
lnd_services.goare updated.Updatemacaroon_recipes.goif your PR adds a new method that is calleddifferently than the RPC method it invokes.