Make New Engine Methods The Default (#12997)

config/features/config.go

@@ -229,9 +229,10 @@ func ConfigureBeaconChain(ctx *cli.Context) error {
 		logEnabled(enableVerboseSigVerification)
 		cfg.EnableVerboseSigVerification = true
 	}
-	if ctx.IsSet(enableOptionalEngineMethods.Name) {
-		logEnabled(enableOptionalEngineMethods)
-		cfg.EnableOptionalEngineMethods = true
+	cfg.EnableOptionalEngineMethods = true
+	if ctx.IsSet(disableOptionalEngineMethods.Name) {
+		logEnabled(disableOptionalEngineMethods)
+		cfg.EnableOptionalEngineMethods = false
 	}
 	if ctx.IsSet(prepareAllPayloads.Name) {
 		logEnabled(prepareAllPayloads)

config/features/deprecated_flags.go

@@ -43,6 +43,11 @@ var (
 		Usage:  deprecatedUsage,
 		Hidden: true,
 	}
+	deprecatedEnableOptionalEngineMethods = &cli.BoolFlag{
+		Name:   "enable-optional-engine-methods",
+		Usage:  deprecatedUsage,
+		Hidden: true,
+	}
 )
 
 // Deprecated flags for both the beacon node and validator client.
@@ -54,6 +59,7 @@ var deprecatedFlags = []cli.Flag{
 	deprecatedBuildBlockParallel,
 	deprecatedEnableRegistrationCache,
 	deprecatedAggregateParallel,
+	deprecatedEnableOptionalEngineMethods,
 }
 
 // deprecatedBeaconFlags contains flags that are still used by other components

config/features/flags.go

@@ -137,9 +137,9 @@ var (
 		Name:  "enable-verbose-sig-verification",
 		Usage: "Enables identifying invalid signatures if batch verification fails when processing block",
 	}
-	enableOptionalEngineMethods = &cli.BoolFlag{
-		Name:  "enable-optional-engine-methods",
-		Usage: "Enables the optional engine methods",
+	disableOptionalEngineMethods = &cli.BoolFlag{
+		Name:  "disable-optional-engine-methods",
+		Usage: "Disables the optional engine methods",
 	}
 	prepareAllPayloads = &cli.BoolFlag{
 		Name:  "prepare-all-payloads",
@@ -173,7 +173,6 @@ var (
 // devModeFlags holds list of flags that are set when development mode is on.
 var devModeFlags = []cli.Flag{
 	enableVerboseSigVerification,
-	enableOptionalEngineMethods,
 	enableEIP4881,
 }
 
@@ -216,7 +215,7 @@ var BeaconChainFlags = append(deprecatedBeaconFlags, append(deprecatedFlags, []c
 	enableStartupOptimistic,
 	enableFullSSZDataLogging,
 	enableVerboseSigVerification,
-	enableOptionalEngineMethods,
+	disableOptionalEngineMethods,
 	prepareAllPayloads,
 	disableBuildBlockParallel,
 	aggregateFirstInterval,