Rename the flag + add missing description

beacon-chain/execution/engine_client.go

@@ -442,10 +442,10 @@ func (s *Service) HeaderByNumber(ctx context.Context, number *big.Int) (*types.H
 	return hdr, err
 }
 
-// GetPayloadBodiesByHash --
+// GetPayloadBodiesByHash returns the relevant payload bodies for the provided block hash.
 func (s *Service) GetPayloadBodiesByHash(ctx context.Context, executionBlockHashes []common.Hash) ([]*pb.ExecutionPayloadBodyV1, error) {
-	if !features.Get().EnableCapellaEngineMethods {
-		return nil, errors.New("capella engine methods not enabled")
+	if !features.Get().EnableOptionalEngineMethods {
+		return nil, errors.New("optional engine methods not enabled")
 	}
 	ctx, span := trace.StartSpan(ctx, "powchain.engine-api-client.GetPayloadBodiesByHashV1")
 	defer span.End()
@@ -464,10 +464,10 @@ func (s *Service) GetPayloadBodiesByHash(ctx context.Context, executionBlockHash
 	return result, handleRPCError(err)
 }
 
-// GetPayloadBodiesByRange --
+// GetPayloadBodiesByRange returns the relevant payload bodies for the provided range.
 func (s *Service) GetPayloadBodiesByRange(ctx context.Context, start, count uint64) ([]*pb.ExecutionPayloadBodyV1, error) {
-	if !features.Get().EnableCapellaEngineMethods {
-		return nil, errors.New("capella engine methods not enabled")
+	if !features.Get().EnableOptionalEngineMethods {
+		return nil, errors.New("optional engine methods not enabled")
 	}
 	ctx, span := trace.StartSpan(ctx, "powchain.engine-api-client.GetPayloadBodiesByRangeV1")
 	defer span.End()

beacon-chain/execution/engine_client_test.go

@@ -1821,7 +1821,7 @@ func newPayloadV2Setup(t *testing.T, status *pb.PayloadStatus, payload *pb.Execu
 
 func TestCapella_PayloadBodiesByHash(t *testing.T) {
 	resetFn := features.InitWithReset(&features.Flags{
-		EnableCapellaEngineMethods: true,
+		EnableOptionalEngineMethods: true,
 	})
 	defer resetFn()
 	t.Run("empty response works", func(t *testing.T) {
@@ -2072,7 +2072,7 @@ func TestCapella_PayloadBodiesByHash(t *testing.T) {
 
 func TestCapella_PayloadBodiesByRange(t *testing.T) {
 	resetFn := features.InitWithReset(&features.Flags{
-		EnableCapellaEngineMethods: true,
+		EnableOptionalEngineMethods: true,
 	})
 	defer resetFn()
 	t.Run("empty response works", func(t *testing.T) {

config/features/config.go

@@ -74,7 +74,7 @@ type Flags struct {
 	DisableStakinContractCheck bool // Disables check for deposit contract when proposing blocks
 
 	EnableVerboseSigVerification bool // EnableVerboseSigVerification specifies whether to verify individual signature if batch verification fails
-	EnableCapellaEngineMethods   bool // EnableCapellaEngineMethods specifies whether to activate capella specific engine methods
+	EnableOptionalEngineMethods  bool // EnableOptionalEngineMethods specifies whether to activate capella specific engine methods
 
 	// KeystoreImportDebounceInterval specifies the time duration the validator waits to reload new keys if they have
 	// changed on disk. This feature is for advanced use cases only.
@@ -256,9 +256,9 @@ func ConfigureBeaconChain(ctx *cli.Context) error {
 		logEnabled(enableVerboseSigVerification)
 		cfg.EnableVerboseSigVerification = true
 	}
-	if ctx.IsSet(EnableCapellaEngineMethods.Name) {
-		logEnabled(EnableCapellaEngineMethods)
-		cfg.EnableCapellaEngineMethods = true
+	if ctx.IsSet(EnableOptionalEngineMethods.Name) {
+		logEnabled(EnableOptionalEngineMethods)
+		cfg.EnableOptionalEngineMethods = true
 	}
 	Init(cfg)
 	return nil

config/features/flags.go

@@ -135,9 +135,9 @@ var (
 		Name:  "enable-verbose-sig-verification",
 		Usage: "Enables identifying invalid signatures if batch verification fails when processing block",
 	}
-	EnableCapellaEngineMethods = &cli.BoolFlag{
-		Name:  "enable-capella-engine-methods",
-		Usage: "Enables the capella engine methods",
+	EnableOptionalEngineMethods = &cli.BoolFlag{
+		Name:  "enable-optional-engine-methods",
+		Usage: "Enables the optional engine methods",
 	}
 )
 
@@ -186,7 +186,7 @@ var BeaconChainFlags = append(deprecatedBeaconFlags, append(deprecatedFlags, []c
 	disableDefensivePull,
 	enableFullSSZDataLogging,
 	enableVerboseSigVerification,
-	EnableCapellaEngineMethods,
+	EnableOptionalEngineMethods,
 }...)...)
 
 // E2EBeaconChainFlags contains a list of the beacon chain feature flags to be tested in E2E.