Merge branch '0-18-4-branch-rc1-9288' into 0-18-4-branch-rc1

Author: guggero

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,
 				):

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