From 73ce28c356dd5c47009633c3380e3f4391b3ecbd Mon Sep 17 00:00:00 2001
From: Nishant Das <nishdas93@gmail.com>
Date: Wed, 31 Jan 2024 18:27:26 +0800
Subject: [PATCH] make it the default (#13556)

---
 config/features/config.go           | 7 ++++---
 config/features/deprecated_flags.go | 6 ++++++
 config/features/flags.go            | 9 ++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/config/features/config.go b/config/features/config.go
index 79adb39d499b..68a70996156a 100644
--- a/config/features/config.go
+++ b/config/features/config.go
@@ -223,9 +223,10 @@ func ConfigureBeaconChain(ctx *cli.Context) error {
 		logEnabled(enableFullSSZDataLogging)
 		cfg.EnableFullSSZDataLogging = true
 	}
-	if ctx.IsSet(enableVerboseSigVerification.Name) {
-		logEnabled(enableVerboseSigVerification)
-		cfg.EnableVerboseSigVerification = true
+	cfg.EnableVerboseSigVerification = true
+	if ctx.IsSet(disableVerboseSigVerification.Name) {
+		logEnabled(disableVerboseSigVerification)
+		cfg.EnableVerboseSigVerification = false
 	}
 	if ctx.IsSet(prepareAllPayloads.Name) {
 		logEnabled(prepareAllPayloads)
diff --git a/config/features/deprecated_flags.go b/config/features/deprecated_flags.go
index 28bef98ecf27..ee17617b9c39 100644
--- a/config/features/deprecated_flags.go
+++ b/config/features/deprecated_flags.go
@@ -73,6 +73,11 @@ var (
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
+	deprecatedVerboseSigVerification = &cli.BoolFlag{
+		Name:   "enable-verbose-sig-verification",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
 )
 
 // Deprecated flags for both the beacon node and validator client.
@@ -90,6 +95,7 @@ var deprecatedFlags = []cli.Flag{
 	deprecatedDisableOptionalEngineMethods,
 	deprecatedDisableAggregateParallel,
 	deprecatedEnableEIP4881,
+	deprecatedVerboseSigVerification,
 }
 
 // deprecatedBeaconFlags contains flags that are still used by other components
diff --git a/config/features/flags.go b/config/features/flags.go
index 1731f674fd1f..97fd6adddab2 100644
--- a/config/features/flags.go
+++ b/config/features/flags.go
@@ -129,9 +129,9 @@ var (
 		Name:  "enable-beacon-rest-api",
 		Usage: "(Experimental): Enables of the beacon REST API when querying a beacon node.",
 	}
-	enableVerboseSigVerification = &cli.BoolFlag{
-		Name:  "enable-verbose-sig-verification",
-		Usage: "Enables identifying invalid signatures if batch verification fails when processing block.",
+	disableVerboseSigVerification = &cli.BoolFlag{
+		Name:  "disable-verbose-sig-verification",
+		Usage: "Disables identifying invalid signatures if batch verification fails when processing block.",
 	}
 	prepareAllPayloads = &cli.BoolFlag{
 		Name:  "prepare-all-payloads",
@@ -159,7 +159,6 @@ var (
 
 // devModeFlags holds list of flags that are set when development mode is on.
 var devModeFlags = []cli.Flag{
-	enableVerboseSigVerification,
 	enableExperimentalState,
 	backfill.EnableExperimentalBackfill,
 }
@@ -201,7 +200,7 @@ var BeaconChainFlags = append(deprecatedBeaconFlags, append(deprecatedFlags, []c
 	SaveFullExecutionPayloads,
 	enableStartupOptimistic,
 	enableFullSSZDataLogging,
-	enableVerboseSigVerification,
+	disableVerboseSigVerification,
 	prepareAllPayloads,
 	aggregateFirstInterval,
 	aggregateSecondInterval,