Don't create V2 server instance in v1-only runtime mode (#1222)

Layr-Labs · Feb 6, 2025 · c5e2040 · c5e2040
1 parent f4f3ed7
commit c5e2040
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/node/cmd/main.go b/node/cmd/main.go
@@ -108,9 +108,13 @@ func NodeMain(ctx *cli.Context) error {
 	// TODO(cody-littley): the metrics server is currently started by eigenmetrics, which is in another repo.
 	//  When we fully remove v1 support, we need to start the metrics server inside the v2 metrics code.
 	server := nodegrpc.NewServer(config, node, logger, ratelimiter)
-	serverV2, err := nodegrpc.NewServerV2(context.Background(), config, node, logger, ratelimiter, reg, reader)
-	if err != nil {
-		return fmt.Errorf("failed to create server v2: %v", err)
+
+	var serverV2 *nodegrpc.ServerV2
+	if config.EnableV2 {
+		serverV2, err = nodegrpc.NewServerV2(context.Background(), config, node, logger, ratelimiter, reg, reader)
+		if err != nil {
+			return fmt.Errorf("failed to create server v2: %v", err)
+		}
 	}
 	err = nodegrpc.RunServers(server, serverV2, config, logger)
 

diff --git a/node/flags/flags.go b/node/flags/flags.go
@@ -399,9 +399,9 @@ var (
 
 	RuntimeModeFlag = cli.StringFlag{
 		Name:     common.PrefixFlag(FlagPrefix, "runtime-mode"),
-		Usage:    fmt.Sprintf("Node runtime mode (%s (default), %s, or %s)", ModeV1Only, ModeV2Only, ModeV1AndV2),
+		Usage:    fmt.Sprintf("Node runtime mode (%s (default), %s, or %s)", ModeV1AndV2, ModeV1Only, ModeV2Only),
 		Required: false,
-		Value:    ModeV1Only,
+		Value:    ModeV1AndV2,
 		EnvVar:   common.PrefixEnvVar(EnvVarPrefix, "RUNTIME_MODE"),
 	}
 )