From b1e2238df9c295a2c72ad2fe7494d2a07d112d94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Kapka?= <rkapka@wp.pl>
Date: Fri, 11 Sep 2020 11:49:24 +0200
Subject: [PATCH] Invert enable-finalized-deposits-cache (#7214)

* make flag opt-out
---
 shared/featureconfig/config.go |  7 ++++---
 shared/featureconfig/flags.go  | 16 ++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/shared/featureconfig/config.go b/shared/featureconfig/config.go
index b8b6bc8fbee5..a93a62978644 100644
--- a/shared/featureconfig/config.go
+++ b/shared/featureconfig/config.go
@@ -237,9 +237,10 @@ func ConfigureBeaconChain(ctx *cli.Context) {
 		log.Warn("Logging every processed block during initial syncing.")
 		cfg.InitSyncVerbose = true
 	}
-	if ctx.Bool(enableFinalizedDepositsCache.Name) {
-		log.Warn("Enabling finalized deposits cache")
-		cfg.EnableFinalizedDepositsCache = true
+	cfg.EnableFinalizedDepositsCache = true
+	if ctx.Bool(disableFinalizedDepositsCache.Name) {
+		log.Warn("Disabling finalized deposits cache")
+		cfg.EnableFinalizedDepositsCache = false
 	}
 	if ctx.Bool(enableEth1DataMajorityVote.Name) {
 		log.Warn("Enabling eth1data majority vote")
diff --git a/shared/featureconfig/flags.go b/shared/featureconfig/flags.go
index f5dc9e64cd3e..3bc066119491 100644
--- a/shared/featureconfig/flags.go
+++ b/shared/featureconfig/flags.go
@@ -141,9 +141,9 @@ var (
 		Name:  "init-sync-verbose",
 		Usage: "Enable logging every processed block during initial syncing.",
 	}
-	enableFinalizedDepositsCache = &cli.BoolFlag{
-		Name:  "enable-finalized-deposits-cache",
-		Usage: "Enables utilization of cached finalized deposits",
+	disableFinalizedDepositsCache = &cli.BoolFlag{
+		Name:  "disable-finalized-deposits-cache",
+		Usage: "Disables utilization of cached finalized deposits",
 	}
 	enableEth1DataMajorityVote = &cli.BoolFlag{
 		Name:  "enable-eth1-data-majority-vote",
@@ -175,7 +175,6 @@ var (
 var devModeFlags = []cli.Flag{
 	checkPtInfoCache,
 	batchBlockVerify,
-	enableFinalizedDepositsCache,
 	enableEth1DataMajorityVote,
 	enableAttBroadcastDiscoveryAttempts,
 	enablePeerScorer,
@@ -546,6 +545,11 @@ var (
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
+	deprecatedEnableFinalizedDepositsCache = &cli.BoolFlag{
+		Name:   "enable-finalized-deposits-cache",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
 )
 
 var deprecatedFlags = []cli.Flag{
@@ -621,6 +625,7 @@ var deprecatedFlags = []cli.Flag{
 	deprecatedNewStateMgmtFlag,
 	deprecatedSlasherProviderFlag,
 	deprecatedEnableSlasherFlag,
+	deprecatedEnableFinalizedDepositsCache,
 }
 
 // ValidatorFlags contains a list of all the feature flags that apply to the validator client.
@@ -672,7 +677,7 @@ var BeaconChainFlags = append(deprecatedFlags, []cli.Flag{
 	OnyxTestnet,
 	batchBlockVerify,
 	initSyncVerbose,
-	enableFinalizedDepositsCache,
+	disableFinalizedDepositsCache,
 	enableEth1DataMajorityVote,
 	enableAttBroadcastDiscoveryAttempts,
 	enablePeerScorer,
@@ -687,7 +692,6 @@ var E2EBeaconChainFlags = []string{
 	"--check-head-state",
 	"--attestation-aggregation-strategy=max_cover",
 	"--dev",
-	"--enable-finalized-deposits-cache",
 	"--enable-eth1-data-majority-vote",
 	"--use-check-point-cache",
 }