[v0.20.x-branch] Backport #10495: lncfg: add deprecated no-experimental-endorsement config option

lncfg/protocol.go

@@ -74,6 +74,11 @@ type ProtocolOptions struct {
 	// NoExperimentalEndorsementOption disables experimental endorsement.
 	NoExperimentalEndorsementOption bool `long:"no-experimental-endorsement" description:"do not forward experimental endorsement signals"`
 
+	// NoExperimentalEndorsementOption is the deprecated name for
+	// NoExperimentalAccountabilityOption. It is hidden and will be removed
+	// in a future release.
+	NoExperimentalEndorsementOption bool `long:"no-experimental-endorsement" hidden:"true" description:"deprecated: use no-experimental-accountability instead"`
+
 	// CustomMessage allows the custom message APIs to handle messages with
 	// the provided protocol numbers, which fall outside the custom message
 	// number range.
@@ -139,10 +144,19 @@ func (l *ProtocolOptions) NoRouteBlinding() bool {
 	return l.NoRouteBlindingOption
 }
 
+<<<<<<< HEAD
 // NoExperimentalEndorsement returns true if experimental endorsement should
 // be disabled.
 func (l *ProtocolOptions) NoExperimentalEndorsement() bool {
 	return l.NoExperimentalEndorsementOption
+=======
+// NoExpAccountability returns true if experimental accountability should be
+// disabled. It also checks the deprecated NoExperimentalEndorsementOption for
+// backwards compatibility.
+func (l *ProtocolOptions) NoExpAccountability() bool {
+	return l.NoExperimentalAccountabilityOption ||
+		l.NoExperimentalEndorsementOption
+>>>>>>> 04dab619c (lncfg: add deprecated no-experimental-endorsement config option)
 }
 
 // NoQuiescence returns true if quiescence is disabled.

lncfg/protocol_integration.go

@@ -77,6 +77,11 @@ type ProtocolOptions struct {
 	// NoExperimentalEndorsementOption disables experimental endorsement.
 	NoExperimentalEndorsementOption bool `long:"no-experimental-endorsement" description:"do not forward experimental endorsement signals"`
 
+	// NoExperimentalEndorsementOption is the deprecated name for
+	// NoExperimentalAccountabilityOption. It is hidden and will be removed
+	// in a future release.
+	NoExperimentalEndorsementOption bool `long:"no-experimental-endorsement" hidden:"true" description:"deprecated: use no-experimental-accountability instead"`
+
 	// NoQuiescenceOption disables quiescence for all channels.
 	NoQuiescenceOption bool `long:"no-quiescence" description:"do not allow or advertise quiescence for any channel"`
 
@@ -137,10 +142,19 @@ func (l *ProtocolOptions) NoRouteBlinding() bool {
 	return l.NoRouteBlindingOption
 }
 
+<<<<<<< HEAD
 // NoExperimentalEndorsement returns true if experimental endorsement should
 // be disabled.
 func (l *ProtocolOptions) NoExperimentalEndorsement() bool {
 	return l.NoExperimentalEndorsementOption
+=======
+// NoExpAccountability returns true if experimental accountability should be
+// disabled. It also checks the deprecated NoExperimentalEndorsementOption for
+// backwards compatibility.
+func (l *ProtocolOptions) NoExpAccountability() bool {
+	return l.NoExperimentalAccountabilityOption ||
+		l.NoExperimentalEndorsementOption
+>>>>>>> 04dab619c (lncfg: add deprecated no-experimental-endorsement config option)
 }
 
 // NoQuiescence returns true if quiescence is disabled.

sample-lnd.conf

@@ -1434,6 +1434,10 @@
 ; Set to disable experimental endorsement signaling.
 ; protocol.no-experimental-endorsement=false
 
+; DEPRECATED: Use protocol.no-experimental-accountability instead.
+; Set to disable experimental endorsement signaling.
+; protocol.no-experimental-endorsement=false
+
 ; Set to enable support for RBF based coop close.
 ; protocol.rbf-coop-close=false