Merge branch '0-19-1-rc1-branch-9858' into 0-19-1-rc1-branch

feature/default_sets.go

@@ -107,4 +107,8 @@ var defaultSetDesc = setDesc{
 		SetInit:    {}, // I
 		SetNodeAnn: {}, // N
 	},
+	lnwire.RbfCoopCloseOptional: {
+		SetInit:    {}, // I
+		SetNodeAnn: {}, // N
+	},
 }

feature/manager.go

@@ -219,6 +219,7 @@ func newManager(cfg Config, desc setDesc) (*Manager, error) {
 		}
 		if cfg.NoRbfCoopClose {
 			raw.Unset(lnwire.RbfCoopCloseOptionalStaging)
+			raw.Unset(lnwire.RbfCoopCloseOptional)
 		}
 
 		for _, custom := range cfg.CustomFeatures[set] {

peer/brontide.go

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