not must need config

alt-research · Apr 1, 2024 · 233a84a · 233a84a
1 parent 26be29b
commit 233a84a
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 41 deletions.
diff --git a/cli/actions/deposit_into_strategy.go b/cli/actions/deposit_into_strategy.go
@@ -17,15 +17,18 @@ func DepositIntoStrategy(ctx *cli.Context) error {
 
 	configPath := ctx.GlobalString(config.ConfigFileFlag.Name)
 	nodeConfig := config.NodeConfig{}
-	err := sdkutils.ReadYamlConfig(configPath, &nodeConfig)
-	if err != nil {
-		return err
-	}
-	configJson, err := json.MarshalIndent(nodeConfig, "", "  ")
-	if err != nil {
-		log.Fatalf(err.Error())
+
+	if configPath != "" {
+		err := sdkutils.ReadYamlConfig(configPath, &nodeConfig)
+		if err != nil {
+			return err
+		}
+		configJson, err := json.MarshalIndent(nodeConfig, "", "  ")
+		if err != nil {
+			log.Fatalf(err.Error())
+		}
+		log.Println("Config:", string(configJson))
 	}
-	log.Println("Config:", string(configJson))
 
 	operator, err := operator.NewOperatorFromConfig(nodeConfig)
 	if err != nil {

diff --git a/cli/actions/print_operator_status.go b/cli/actions/print_operator_status.go
@@ -14,15 +14,18 @@ func PrintOperatorStatus(ctx *cli.Context) error {
 
 	configPath := ctx.GlobalString(config.ConfigFileFlag.Name)
 	nodeConfig := config.NodeConfig{}
-	err := sdkutils.ReadYamlConfig(configPath, &nodeConfig)
-	if err != nil {
-		return err
-	}
-	configJson, err := json.MarshalIndent(nodeConfig, "", "  ")
-	if err != nil {
-		log.Fatalf(err.Error())
+
+	if configPath != "" {
+		err := sdkutils.ReadYamlConfig(configPath, &nodeConfig)
+		if err != nil {
+			return err
+		}
+		configJson, err := json.MarshalIndent(nodeConfig, "", "  ")
+		if err != nil {
+			log.Fatalf(err.Error())
+		}
+		log.Println("Config:", string(configJson))
 	}
-	log.Println("Config:", string(configJson))
 
 	operator, err := operator.NewOperatorFromConfig(nodeConfig)
 	if err != nil {

diff --git a/cli/actions/register_operator_with_avs.go b/cli/actions/register_operator_with_avs.go
@@ -16,15 +16,18 @@ func RegisterOperatorWithAvs(ctx *cli.Context) error {
 
 	configPath := ctx.GlobalString(config.ConfigFileFlag.Name)
 	nodeConfig := config.NodeConfig{}
-	err := sdkutils.ReadYamlConfig(configPath, &nodeConfig)
-	if err != nil {
-		return err
-	}
-	configJson, err := json.MarshalIndent(nodeConfig, "", "  ")
-	if err != nil {
-		log.Fatalf(err.Error())
+
+	if configPath != "" {
+		err := sdkutils.ReadYamlConfig(configPath, &nodeConfig)
+		if err != nil {
+			return err
+		}
+		configJson, err := json.MarshalIndent(nodeConfig, "", "  ")
+		if err != nil {
+			log.Fatalf(err.Error())
+		}
+		log.Println("Config:", string(configJson))
 	}
-	log.Println("Config:", string(configJson))
 
 	operator, err := operator.NewOperatorFromConfig(nodeConfig)
 	if err != nil {

diff --git a/cli/actions/register_operator_with_eigenlayer.go b/cli/actions/register_operator_with_eigenlayer.go
@@ -15,15 +15,18 @@ func RegisterOperatorWithEigenlayer(ctx *cli.Context) error {
 
 	configPath := ctx.GlobalString(config.ConfigFileFlag.Name)
 	nodeConfig := config.NodeConfig{}
-	err := sdkutils.ReadYamlConfig(configPath, &nodeConfig)
-	if err != nil {
-		return err
-	}
-	configJson, err := json.MarshalIndent(nodeConfig, "", "  ")
-	if err != nil {
-		log.Fatalf(err.Error())
+
+	if configPath != "" {
+		err := sdkutils.ReadYamlConfig(configPath, &nodeConfig)
+		if err != nil {
+			return err
+		}
+		configJson, err := json.MarshalIndent(nodeConfig, "", "  ")
+		if err != nil {
+			log.Fatalf(err.Error())
+		}
+		log.Println("Config:", string(configJson))
 	}
-	log.Println("Config:", string(configJson))
 
 	operator, err := operator.NewOperatorFromConfig(nodeConfig)
 	if err != nil {

diff --git a/core/config/config.go b/core/config/config.go
@@ -187,7 +187,7 @@ var (
 	/* Required Flags */
 	ConfigFileFlag = cli.StringFlag{
 		Name:     "config",
-		Required: true,
+		Required: false,
 		Usage:    "Load configuration from `FILE`",
 	}
 	DeploymentFileFlag = cli.StringFlag{

diff --git a/operator/cmd/main.go b/operator/cmd/main.go
@@ -33,15 +33,18 @@ func operatorMain(ctx *cli.Context) error {
 	log.Println("Initializing Operator")
 	configPath := ctx.GlobalString(config.ConfigFileFlag.Name)
 	nodeConfig := config.NodeConfig{}
-	err := sdkutils.ReadYamlConfig(configPath, &nodeConfig)
-	if err != nil {
-		return err
-	}
-	configJson, err := json.MarshalIndent(nodeConfig, "", "  ")
-	if err != nil {
-		log.Fatalf(err.Error())
+
+	if configPath != "" {
+		err := sdkutils.ReadYamlConfig(configPath, &nodeConfig)
+		if err != nil {
+			return err
+		}
+		configJson, err := json.MarshalIndent(nodeConfig, "", "  ")
+		if err != nil {
+			log.Fatalf(err.Error())
+		}
+		log.Println("Config from file:", string(configJson))
 	}
-	log.Println("Config from file:", string(configJson))
 
 	log.Println("initializing operator")
 	operator, err := operator.NewOperatorFromConfig(nodeConfig)

diff --git a/operator/operator.go b/operator/operator.go
@@ -82,6 +82,11 @@ func withEnvConfig(c config.NodeConfig) config.NodeConfig {
 	// - `OPERATOR_SERVER_URL` : operator_server_ip_port_addr
 	// - `METADATA_URI` : metadata_uri
 
+	Production, ok := os.LookupEnv("OPERATOR_PRODUCTION")
+	if ok && Production != "" {
+		c.Production = Production == "true"
+	}
+
 	ethRpcUrl, ok := os.LookupEnv("ETH_RPC_URL")
 	if ok && ethRpcUrl != "" {
 		c.EthRpcUrl = ethRpcUrl