multi: remove RBF co-op close staging feature bits

Now that the final RBF-based co-op close feature bits (rbf-coop-close,
bits 60/61) have been in production for a while, the staging feature
bits (rbf-coop-close-x, bits 160/161) are no longer needed.

Author: MPins

feature/default_sets.go

@@ -107,10 +107,6 @@ var defaultSetDesc = setDesc{
 	lnwire.ExperimentalAccountabilityOptional: {
 		SetNodeAnn: {}, // N
 	},
-	lnwire.RbfCoopCloseOptionalStaging: {
-		SetInit:    {}, // I
-		SetNodeAnn: {}, // N
-	},
 	lnwire.RbfCoopCloseOptional: {
 		SetInit:    {}, // I
 		SetNodeAnn: {}, // N

feature/manager.go

@@ -224,7 +224,6 @@ func newManager(cfg Config, desc setDesc) (*Manager, error) {
 			raw.Unset(lnwire.ExperimentalAccountabilityRequired)
 		}
 		if cfg.NoRbfCoopClose {
-			raw.Unset(lnwire.RbfCoopCloseOptionalStaging)
 			raw.Unset(lnwire.RbfCoopCloseOptional)
 		}
 		if cfg.NoOnionMessages {

lnwire/features.go

@@ -241,14 +241,6 @@ const (
 	// new RBF-based co-op close protocol is supported.
 	RbfCoopCloseOptional = 61
 
-	// RbfCoopCloseRequiredStaging is a required feature bit that signals
-	// that the new RBF-based co-op close protocol is supported.
-	RbfCoopCloseRequiredStaging = 160
-
-	// RbfCoopCloseOptionalStaging is an optional feature bit that signals
-	// that the new RBF-based co-op close protocol is supported.
-	RbfCoopCloseOptionalStaging = 161
-
 	// ScriptEnforcedLeaseRequired is a required feature bit that signals
 	// that the node requires channels having zero-fee second-level HTLC
 	// transactions, which also imply anchor commitments, along with an
@@ -401,8 +393,6 @@ var Features = map[FeatureBit]string{
 	Bolt11BlindedPathsRequired:           "bolt-11-blinded-paths",
 	RbfCoopCloseOptional:                 "rbf-coop-close",
 	RbfCoopCloseRequired:                 "rbf-coop-close",
-	RbfCoopCloseOptionalStaging:          "rbf-coop-close-x",
-	RbfCoopCloseRequiredStaging:          "rbf-coop-close-x",
 	OnionMessagesOptional:                "onion-messages",
 	OnionMessagesRequired:                "onion-messages",
 }

peer/brontide.go

@@ -1092,13 +1092,8 @@ func (p *Brontide) taprootShutdownAllowed() bool {
 // rbfCoopCloseAllowed returns true if both parties have negotiated the new RBF
 // coop close feature.
 func (p *Brontide) rbfCoopCloseAllowed() bool {
-	bothHaveBit := func(bit lnwire.FeatureBit) bool {
-		return p.RemoteFeatures().HasFeature(bit) &&
-			p.LocalFeatures().HasFeature(bit)
-	}
-
-	return bothHaveBit(lnwire.RbfCoopCloseOptional) ||
-		bothHaveBit(lnwire.RbfCoopCloseOptionalStaging)
+	return p.RemoteFeatures().HasFeature(lnwire.RbfCoopCloseOptional) &&
+		p.LocalFeatures().HasFeature(lnwire.RbfCoopCloseOptional)
 }
 
 // QuitSignal is a method that should return a channel which will be sent upon