From e074a8fab3acbb8d6a6802822799d31f6dcdf789 Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Wed, 20 Nov 2024 09:45:01 +0100 Subject: [PATCH 1/2] chanacceptor: add custom channel commitment type --- chanacceptor/rpcacceptor.go | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/chanacceptor/rpcacceptor.go b/chanacceptor/rpcacceptor.go index 779ba6f286..6ec7878954 100644 --- a/chanacceptor/rpcacceptor.go +++ b/chanacceptor/rpcacceptor.go @@ -356,6 +356,30 @@ func (r *RPCAcceptor) sendAcceptRequests(errChan chan error, ): commitmentType = lnrpc.CommitmentType_SIMPLE_TAPROOT + case channelFeatures.OnlyContains( + lnwire.SimpleTaprootOverlayChansRequired, + lnwire.ZeroConfRequired, + lnwire.ScidAliasRequired, + ): + commitmentType = lnrpc.CommitmentType_SIMPLE_TAPROOT_OVERLAY + + case channelFeatures.OnlyContains( + lnwire.SimpleTaprootOverlayChansRequired, + lnwire.ZeroConfRequired, + ): + commitmentType = lnrpc.CommitmentType_SIMPLE_TAPROOT_OVERLAY + + case channelFeatures.OnlyContains( + lnwire.SimpleTaprootOverlayChansRequired, + lnwire.ScidAliasRequired, + ): + commitmentType = lnrpc.CommitmentType_SIMPLE_TAPROOT_OVERLAY + + case channelFeatures.OnlyContains( + lnwire.SimpleTaprootOverlayChansRequired, + ): + commitmentType = lnrpc.CommitmentType_SIMPLE_TAPROOT_OVERLAY + case channelFeatures.OnlyContains( lnwire.StaticRemoteKeyRequired, ): From 117a145b9718eb2c71a5150f5f531493dfef882c Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Wed, 20 Nov 2024 10:37:17 +0100 Subject: [PATCH 2/2] docs: add release notes --- docs/release-notes/release-notes-0.18.4.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/release-notes/release-notes-0.18.4.md b/docs/release-notes/release-notes-0.18.4.md index c3b1ecdb7b..56270c0a77 100644 --- a/docs/release-notes/release-notes-0.18.4.md +++ b/docs/release-notes/release-notes-0.18.4.md @@ -38,6 +38,7 @@ types in a series of changes: * https://github.com/lightningnetwork/lnd/pull/9095 * https://github.com/lightningnetwork/lnd/pull/8960 * https://github.com/lightningnetwork/lnd/pull/9194 + * https://github.com/lightningnetwork/lnd/pull/9288 ## Functional Enhancements