Add back deprecated flags (#11284)

* Add back deprecated flags * Add enable-validator-registration as alias * Clean up * Add deprecatedEnableLargerGossipHistory * Rm duplicated gossip batch aggregation
prysmaticlabs · Aug 22, 2022 · 1c6fa65 · 1c6fa65
1 parent eaa2566
commit 1c6fa65
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 6 deletions.
diff --git a/cmd/validator/flags/flags.go b/cmd/validator/flags/flags.go
@@ -341,9 +341,10 @@ var (
 
 	// EnableBuilderFlag enables the periodic validator registration API calls that will update the custom builder with validator settings.
 	EnableBuilderFlag = &cli.BoolFlag{
-		Name:  "enable-builder",
-		Usage: "Enables Builder validator registration APIs for the validator client to update settings such as fee recipient and gas limit. Note* this flag is not required if using proposer settings config file",
-		Value: false,
+		Name:    "enable-builder",
+		Usage:   "Enables Builder validator registration APIs for the validator client to update settings such as fee recipient and gas limit. Note* this flag is not required if using proposer settings config file",
+		Value:   false,
+		Aliases: []string{"enable-validator-registration"},
 	}
 
 	// BuilderGasLimitFlag defines the gas limit for the builder to use for constructing a payload.

diff --git a/config/features/deprecated_flags.go b/config/features/deprecated_flags.go
@@ -12,7 +12,7 @@ var (
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
-	deprecatedBackupWebHookFlag = &cli.StringFlag{
+	deprecatedBackupWebHookFlag = &cli.BoolFlag{
 		Name:   "enable-db-backup-webhook",
 		Usage:  deprecatedUsage,
 		Hidden: true,
@@ -22,16 +22,51 @@ var (
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
-	deprecatedDisableDiscV5Flag = &cli.StringFlag{
+	deprecatedDisableDiscV5Flag = &cli.BoolFlag{
 		Name:   "disable-discv5",
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
-	deprecatedDisableAttHistoryCacheFlag = &cli.StringFlag{
+	deprecatedDisableAttHistoryCacheFlag = &cli.BoolFlag{
 		Name:   "disable-attesting-history-db-cache",
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
+	deprecatedEnableVectorizedHtr = &cli.BoolFlag{
+		Name:   "enable-vectorized-htr",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
+	deprecatedEnablePeerScorer = &cli.BoolFlag{
+		Name:   "enable-peer-scorer",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
+	deprecatedEnableForkchoiceDoublyLinkedTree = &cli.BoolFlag{
+		Name:   "enable-forkchoice-doubly-linked-tree",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
+	deprecatedDutyCountdown = &cli.BoolFlag{
+		Name:   "enable-duty-count-down",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
+	deprecatedHeadSync = &cli.BoolFlag{
+		Name:   "head-sync",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
+	deprecatedGossipBatchAggregation = &cli.BoolFlag{
+		Name:   "enable-gossip-batch-aggregation",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
+	deprecatedEnableLargerGossipHistory = &cli.BoolFlag{
+		Name:   "enable-larger-gossip-history",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
 	deprecatedFallbackProvider = &cli.StringFlag{
 		Name:   "fallback-web3provider",
 		Usage:  deprecatedUsage,
@@ -45,6 +80,13 @@ var deprecatedFlags = []cli.Flag{
 	deprecatedBoltMmapFlag,
 	deprecatedDisableDiscV5Flag,
 	deprecatedDisableAttHistoryCacheFlag,
+	deprecatedEnableVectorizedHtr,
+	deprecatedEnablePeerScorer,
+	deprecatedEnableForkchoiceDoublyLinkedTree,
+	deprecatedDutyCountdown,
+	deprecatedHeadSync,
+	deprecatedGossipBatchAggregation,
+	deprecatedEnableLargerGossipHistory,
 	deprecatedFallbackProvider,
 }