refactor: Add RelayUseSecureGRPC flag to node (#1768)

* Add RelayUseSecureGRPC flag to node

* Rename UseSecureGrpc to ChurnerUseSecureGrpc

* Run gen.sh and set NODE_RELAY_USE_SECURE_GRPC to false

* Remove unused variable

Author: dmanc

inabox/deploy/config.go

@@ -442,6 +442,7 @@ func (env *Config) generateOperatorVars(ind int, name, key, churnerUrl, logPath,
 		NODE_REGISTER_AT_NODE_START:           "true",
 		NODE_CHURNER_URL:                      churnerUrl,
 		NODE_CHURNER_USE_SECURE_GRPC:          "false",
+		NODE_RELAY_USE_SECURE_GRPC:            "false",
 		NODE_EXPIRATION_POLL_INTERVAL:         "10",
 		NODE_G1_PATH:                          "",
 		NODE_G2_PATH:                          "",
@@ -471,14 +472,13 @@ func (env *Config) generateOperatorVars(ind int, name, key, churnerUrl, logPath,
 // Generates retriever .env
 func (env *Config) generateRetrieverVars(ind int, key string, graphUrl, logPath, grpcPort string) RetrieverVars {
 	v := RetrieverVars{
-		RETRIEVER_LOG_FORMAT:                   "text",
-		RETRIEVER_HOSTNAME:                     "",
-		RETRIEVER_GRPC_PORT:                    grpcPort,
-		RETRIEVER_TIMEOUT:                      "10s",
-		RETRIEVER_EIGENDA_DIRECTORY:            env.EigenDA.EigenDADirectory,
-		RETRIEVER_BLS_OPERATOR_STATE_RETRIEVER: env.EigenDA.OperatorStateRetriever,
-		RETRIEVER_EIGENDA_SERVICE_MANAGER:      env.EigenDA.ServiceManager,
-		RETRIEVER_NUM_CONNECTIONS:              "10",
+		RETRIEVER_LOG_FORMAT:              "text",
+		RETRIEVER_HOSTNAME:                "",
+		RETRIEVER_GRPC_PORT:               grpcPort,
+		RETRIEVER_TIMEOUT:                 "10s",
+		RETRIEVER_EIGENDA_DIRECTORY:       env.EigenDA.EigenDADirectory,
+		RETRIEVER_EIGENDA_SERVICE_MANAGER: env.EigenDA.ServiceManager,
+		RETRIEVER_NUM_CONNECTIONS:         "10",
 
 		RETRIEVER_CHAIN_RPC:   "",
 		RETRIEVER_PRIVATE_KEY: key[2:],

inabox/deploy/env_vars.go

@@ -77,7 +77,8 @@ type Config struct {
 	NumBatchDeserializationWorkers  int
 	EnableGnarkBundleEncoding       bool
 	ClientIPHeader                  string
-	UseSecureGrpc                   bool
+	ChurnerUseSecureGrpc            bool
+	RelayUseSecureGrpc              bool
 	RelayMaxMessageSize             uint
 	ReachabilityPollIntervalSec     uint64
 	DisableNodeInfoResources        bool
@@ -370,7 +371,8 @@ func NewConfig(ctx *cli.Context) (*Config, error) {
 		NumBatchDeserializationWorkers:      ctx.GlobalInt(flags.NumBatchDeserializationWorkersFlag.Name),
 		EnableGnarkBundleEncoding:           ctx.Bool(flags.EnableGnarkBundleEncodingFlag.Name),
 		ClientIPHeader:                      ctx.GlobalString(flags.ClientIPHeaderFlag.Name),
-		UseSecureGrpc:                       ctx.GlobalBoolT(flags.ChurnerUseSecureGRPC.Name),
+		ChurnerUseSecureGrpc:                ctx.GlobalBoolT(flags.ChurnerUseSecureGRPC.Name),
+		RelayUseSecureGrpc:                  ctx.GlobalBoolT(flags.RelayUseSecureGRPC.Name),
 		RelayMaxMessageSize:                 uint(ctx.GlobalInt(flags.RelayMaxGRPCMessageSizeFlag.Name)),
 		DisableNodeInfoResources:            ctx.GlobalBool(flags.DisableNodeInfoResourcesFlag.Name),
 		BlsSignerConfig:                     blsSignerConfig,

node/config.go

@@ -186,6 +186,12 @@ var (
 		Required: false,
 		EnvVar:   common.PrefixEnvVar(EnvVarPrefix, "CHURNER_USE_SECURE_GRPC"),
 	}
+	RelayUseSecureGRPC = cli.BoolTFlag{
+		Name:     common.PrefixFlag(FlagPrefix, "relay-use-secure-grpc"),
+		Usage:    "Whether to use secure GRPC connection to Relay (defaults to true)",
+		Required: false,
+		EnvVar:   common.PrefixEnvVar(EnvVarPrefix, "RELAY_USE_SECURE_GRPC"),
+	}
 	PubIPProviderFlag = cli.StringSliceFlag{
 		Name:     common.PrefixFlag(FlagPrefix, "public-ip-provider"),
 		Usage:    "The ip provider service(s) used to obtain a node's public IP. Valid options: 'seeip', 'ipify'",
@@ -582,6 +588,7 @@ var optionalFlags = []cli.Flag{
 	InternalV2RetrievalPortFlag,
 	ClientIPHeaderFlag,
 	ChurnerUseSecureGRPC,
+	RelayUseSecureGRPC,
 	EcdsaKeyFileFlag,
 	EcdsaKeyPasswordFlag,
 	DataApiUrlFlag,

node/flags/flags.go

@@ -302,7 +302,7 @@ func NewNode(
 		blobVersionParams = corev2.NewBlobVersionParameterMap(blobParams)
 
 		relayClientConfig := &relay.RelayClientConfig{
-			UseSecureGrpcFlag:  config.UseSecureGrpc,
+			UseSecureGrpcFlag:  config.RelayUseSecureGrpc,
 			OperatorID:         &config.ID,
 			MessageSigner:      n.SignMessage,
 			MaxGRPCMessageSize: n.Config.RelayMaxMessageSize,
@@ -396,7 +396,7 @@ func (n *Node) Start(ctx context.Context) error {
 			QuorumIDs:           n.Config.QuorumIDList,
 			RegisterNodeAtStart: n.Config.RegisterNodeAtStart,
 		}
-		churnerClient := NewChurnerClient(n.Config.ChurnerUrl, n.Config.UseSecureGrpc, n.Config.Timeout, n.Logger)
+		churnerClient := NewChurnerClient(n.Config.ChurnerUrl, n.Config.ChurnerUseSecureGrpc, n.Config.Timeout, n.Logger)
 		err = RegisterOperator(ctx, operator, n.Transactor, churnerClient, n.Logger)
 		if err != nil {
 			return fmt.Errorf("failed to register the operator: %w", err)