fix: add internal v2 ports for nodes behind reverse proxy (#1646)

Author: pschork

node/config.go

@@ -47,6 +47,8 @@ type Config struct {
 	InternalDispersalPort           string
 	V2DispersalPort                 string
 	V2RetrievalPort                 string
+	InternalV2DispersalPort         string
+	InternalV2RetrievalPort         string
 	EnableNodeApi                   bool
 	NodeApiPort                     string
 	EnableMetrics                   bool
@@ -305,6 +307,15 @@ func NewConfig(ctx *cli.Context) (*Config, error) {
 
 	v2DispersalPort := ctx.GlobalString(flags.V2DispersalPortFlag.Name)
 	v2RetrievalPort := ctx.GlobalString(flags.V2RetrievalPortFlag.Name)
+	internalV2DispersalPort := ctx.GlobalString(flags.InternalV2DispersalPortFlag.Name)
+	internalV2RetrievalPort := ctx.GlobalString(flags.InternalV2RetrievalPortFlag.Name)
+	if internalV2DispersalPort == "" {
+		internalV2DispersalPort = v2DispersalPort
+	}
+	if internalV2RetrievalPort == "" {
+		internalV2RetrievalPort = v2RetrievalPort
+	}
+
 	if v2Enabled {
 		if v2DispersalPort == "" {
 			return nil, errors.New("v2 dispersal port (NODE_V2_DISPERSAL_PORT) must be defined when v2 is enabled")
@@ -326,6 +337,8 @@ func NewConfig(ctx *cli.Context) (*Config, error) {
 		InternalRetrievalPort:               internalRetrievalFlag,
 		V2DispersalPort:                     v2DispersalPort,
 		V2RetrievalPort:                     v2RetrievalPort,
+		InternalV2DispersalPort:             internalV2DispersalPort,
+		InternalV2RetrievalPort:             internalV2RetrievalPort,
 		EnableNodeApi:                       ctx.GlobalBool(flags.EnableNodeApiFlag.Name),
 		NodeApiPort:                         ctx.GlobalString(flags.NodeApiPortFlag.Name),
 		EnableMetrics:                       ctx.GlobalBool(flags.EnableMetricsFlag.Name),

node/flags/flags.go

@@ -67,6 +67,18 @@ var (
 		Required: false,
 		EnvVar:   common.PrefixEnvVar(EnvVarPrefix, "V2_RETRIEVAL_PORT"),
 	}
+	InternalV2DispersalPortFlag = cli.StringFlag{
+		Name:     common.PrefixFlag(FlagPrefix, "internal-v2-dispersal-port"),
+		Usage:    "Port at which node listens for v2 dispersal calls (used when node is behind NGINX)",
+		Required: false,
+		EnvVar:   common.PrefixEnvVar(EnvVarPrefix, "INTERNAL_V2_DISPERSAL_PORT"),
+	}
+	InternalV2RetrievalPortFlag = cli.StringFlag{
+		Name:     common.PrefixFlag(FlagPrefix, "internal-v2-retrieval-port"),
+		Usage:    "Port at which node listens for v2 retrieval calls (used when node is behind NGINX)",
+		Required: false,
+		EnvVar:   common.PrefixEnvVar(EnvVarPrefix, "INTERNAL_V2_RETRIEVAL_PORT"),
+	}
 	EnableNodeApiFlag = cli.BoolFlag{
 		Name:     common.PrefixFlag(FlagPrefix, "enable-node-api"),
 		Usage:    "enable node-api to serve eigenlayer-cli node-api calls",
@@ -562,6 +574,8 @@ var optionalFlags = []cli.Flag{
 	NumBatchDeserializationWorkersFlag,
 	InternalDispersalPortFlag,
 	InternalRetrievalPortFlag,
+	InternalV2DispersalPortFlag,
+	InternalV2RetrievalPortFlag,
 	ClientIPHeaderFlag,
 	ChurnerUseSecureGRPC,
 	EcdsaKeyFileFlag,

node/grpc/run.go

@@ -65,7 +65,7 @@ func RunServers(serverV1 *Server, serverV2 *ServerV2, config *node.Config, logge
 			return
 		}
 		for {
-			addr := fmt.Sprintf("%s:%s", localhost, config.V2DispersalPort)
+			addr := fmt.Sprintf("%s:%s", localhost, config.InternalV2DispersalPort)
 			listener, err := net.Listen("tcp", addr)
 			if err != nil {
 				logger.Fatalf("Could not start tcp listener: %v", err)
@@ -82,7 +82,7 @@ func RunServers(serverV1 *Server, serverV2 *ServerV2, config *node.Config, logge
 
 			healthcheck.RegisterHealthServer("node.v2.Dispersal", gs)
 
-			logger.Info("v2 dispersal enabled on port", config.V2DispersalPort, "address", listener.Addr().String(), "GRPC Listening")
+			logger.Info("v2 dispersal enabled on port", config.InternalV2DispersalPort, "address", listener.Addr().String(), "GRPC Listening")
 			if err := gs.Serve(listener); err != nil {
 				logger.Error("dispersal v2 server failed; restarting.", "err", err)
 			}
@@ -126,7 +126,7 @@ func RunServers(serverV1 *Server, serverV2 *ServerV2, config *node.Config, logge
 			return
 		}
 		for {
-			addr := fmt.Sprintf("%s:%s", localhost, config.V2RetrievalPort)
+			addr := fmt.Sprintf("%s:%s", localhost, config.InternalV2RetrievalPort)
 			listener, err := net.Listen("tcp", addr)
 			if err != nil {
 				logger.Fatalf("Could not start tcp listener: %v", err)
@@ -142,7 +142,7 @@ func RunServers(serverV1 *Server, serverV2 *ServerV2, config *node.Config, logge
 
 			healthcheck.RegisterHealthServer("node.v2.Retrieval", gs)
 
-			logger.Info("v2 retrieval enabled on port", config.V2RetrievalPort, "address", listener.Addr().String(), "GRPC Listening")
+			logger.Info("v2 retrieval enabled on port", config.InternalV2RetrievalPort, "address", listener.Addr().String(), "GRPC Listening")
 			if err := gs.Serve(listener); err != nil {
 				logger.Error("retrieval v2 server failed; restarting.", "err", err)
 			}

node/node.go

@@ -203,9 +203,13 @@ func NewNode(
 		"chainID", chainID.String(),
 		"operatorID", config.ID.Hex(),
 		"dispersalPort", config.DispersalPort,
+		"internalDispersalPort", config.InternalDispersalPort,
 		"v2DispersalPort", config.V2DispersalPort,
+		"internalV2DispersalPort", config.InternalV2DispersalPort,
 		"retrievalPort", config.RetrievalPort,
+		"internalRetrievalPort", config.InternalRetrievalPort,
 		"v2RetrievalPort", config.V2RetrievalPort,
+		"internalV2RetrievalPort", config.InternalV2RetrievalPort,
 		"churnerUrl", config.ChurnerUrl,
 		"quorumIDs", fmt.Sprint(config.QuorumIDList),
 		"registerNodeAtStart", config.RegisterNodeAtStart,