fix: normalize grpc addr (#4689)

Co-authored-by: Vlad <[email protected]>

Author: gupadhyaya

api/client/grpc.go

@@ -3,6 +3,7 @@ package client
 import (
 	"context"
 	"crypto/tls"
+	"net"
 	"time"
 
 	grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
@@ -27,9 +28,9 @@ type CoreGRPCConfig struct {
 	AuthToken string
 }
 
-// Validate performs basic validation of the config.
 func (cfg *CoreGRPCConfig) Validate() error {
-	_, err := utils.SanitizeAddr(cfg.Addr)
+	normalized := utils.NormalizeGRPCAddress(cfg.Addr)
+	_, _, err := net.SplitHostPort(normalized)
 	return err
 }
 
@@ -76,7 +77,8 @@ func grpcClient(cfg CoreGRPCConfig) (*grpc.ClientConn, error) {
 			grpc.WithChainStreamInterceptor(authStreamInterceptor(cfg.AuthToken), retryStreamInterceptor),
 		)
 	}
-	return grpc.NewClient(cfg.Addr, opts...)
+	normalizedAddr := utils.NormalizeGRPCAddress(cfg.Addr)
+	return grpc.NewClient(normalizedAddr, opts...)
 }
 
 func authInterceptor(xtoken string) grpc.UnaryClientInterceptor {

libs/utils/address.go

@@ -19,6 +19,14 @@ func NormalizeAddress(addr string) string {
 	return addr
 }
 
+func NormalizeGRPCAddress(addr string) string {
+	addr = NormalizeAddress(addr)
+	if idx := strings.Index(addr, "/"); idx != -1 {
+		addr = addr[:idx]
+	}
+	return addr
+}
+
 // SanitizeAddr trims leading protocol scheme and port from the given
 // IP address or hostname if present.
 func SanitizeAddr(addr string) (string, error) {

libs/utils/address_test.go

@@ -75,3 +75,28 @@ func TestValidateAddr(t *testing.T) {
 		})
 	}
 }
+
+func TestNormalizeGRPCAddress(t *testing.T) {
+	tests := []struct {
+		addr string
+		want string
+	}{
+		{addr: "https://your-quicknode-url.celestia-mocha.quiknode.pro:9090", want: "your-quicknode-url.celestia-mocha.quiknode.pro:9090"},
+		{addr: "http://localhost:9090", want: "localhost:9090"},
+		{addr: "https://host.example.com:9090/some/path", want: "host.example.com:9090"},
+		{addr: "host.example.com:9090/some/path", want: "host.example.com:9090"},
+		{addr: "localhost:9090", want: "localhost:9090"},
+		{addr: "localhost", want: "localhost"},
+		{addr: "https://localhost", want: "localhost"},
+		{addr: "tcp://localhost:9090", want: "localhost:9090"},
+		{addr: "[::1]:9090", want: "[::1]:9090"},
+		{addr: "https://[::1]:9090", want: "[::1]:9090"},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.addr, func(t *testing.T) {
+			got := NormalizeGRPCAddress(tt.addr)
+			require.Equal(t, tt.want, got)
+		})
+	}
+}