From aee52294c7cdbb25cdc70267b6030e3a62e7fc38 Mon Sep 17 00:00:00 2001 From: positiveblue Date: Mon, 8 Aug 2022 10:11:06 -0700 Subject: [PATCH 1/2] feature: remove `ScidAliasOptional` dependency on `ExplicitChannelTypeOptional` The [spec](https://github.com/lightning/bolts/blob/master/09-features.md) does not specify a dependency between `ScidAliasOptional` (47) and `ExplicitChannelTypeOptional` (45). This bug lead to some connectivity issues with peers not setting the 45 feature bit while setting the 47. The issue [6802](https://github.com/lightningnetwork/lnd/issues/6802) is an example of this. --- feature/deps.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/feature/deps.go b/feature/deps.go index 542732eba..8e1d8ac09 100644 --- a/feature/deps.go +++ b/feature/deps.go @@ -72,9 +72,6 @@ var deps = depDesc{ lnwire.KeysendOptional: { lnwire.TLVOnionPayloadOptional: {}, }, - lnwire.ScidAliasOptional: { - lnwire.ExplicitChannelTypeOptional: {}, - }, lnwire.ZeroConfOptional: { lnwire.ScidAliasOptional: {}, }, From b8bf884bcd58765995f3e86351c38d6af1d710cb Mon Sep 17 00:00:00 2001 From: positiveblue Date: Mon, 8 Aug 2022 10:22:05 -0700 Subject: [PATCH 2/2] docs: Add release notes for feature bit fix (#6809) --- docs/release-notes/release-notes-0.15.1.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/release-notes/release-notes-0.15.1.md b/docs/release-notes/release-notes-0.15.1.md index b0e9cbc40..72bbae0ac 100644 --- a/docs/release-notes/release-notes-0.15.1.md +++ b/docs/release-notes/release-notes-0.15.1.md @@ -118,6 +118,9 @@ * [Bitcoind cookie file path can be specified with zmq options](https://github.com/lightningnetwork/lnd/pull/6736) +* [Remove `ScidAliasOptional` dependency on +`ExplicitChannelTypeOptional`](https://github.com/lightningnetwork/lnd/pull/6809) + ## Code Health ### Code cleanup, refactor, typo fixes @@ -143,6 +146,7 @@ * Elle Mouton * ErikEk * Eugene Siegel +* Jordi Montes * Matt Morehouse * Slyghtning * Oliver Gugger