Add Beacon Gateway Flag to Validator Client (#7179)

* add in cors for web ui in val client and gateway flag
* Merge branch 'master' into add-default-beacon-gateway
* gateway cors value
* Merge branch 'add-default-beacon-gateway' of github.com:prysmaticlabs/prysm into add-default-beacon-gateway
* fix tests
* Merge refs/heads/master into add-default-beacon-gateway

beacon-chain/flags/base.go

@@ -69,6 +69,7 @@ var (
 		Name: "grpc-gateway-corsdomain",
 		Usage: "Comma separated list of domains from which to accept cross origin requests " +
 			"(browser enforced). This flag has no effect if not used with --grpc-gateway-port.",
+		Value: "http://localhost:4200",
 	}
 	// MinSyncPeers specifies the required number of successful peer handshakes in order
 	// to start syncing with external peers.

beacon-chain/gateway/cors.go

@@ -11,7 +11,7 @@ func newCorsHandler(srv http.Handler, allowedOrigins []string) http.Handler {
 		return srv
 	}
 	c := cors.New(cors.Options{
-		AllowedOrigins: append(allowedOrigins, "http://localhost:4200"),
+		AllowedOrigins: allowedOrigins,
 		AllowedMethods: []string{http.MethodPost, http.MethodGet},
 		MaxAge:         600,
 		AllowedHeaders: []string{"*"},

validator/client/service.go

@@ -348,11 +348,6 @@ func (v *ValidatorService) Syncing(ctx context.Context) (bool, error) {
 	return resp.Syncing, nil
 }
 
-// BeaconNodeEndpoint as a string.
-func (v *ValidatorService) BeaconNodeEndpoint() string {
-	return v.endpoint
-}
-
 // to accounts changes in the keymanager, then updates those keys'
 // buckets in bolt DB if a bucket for a key does not exist.
 func recheckValidatingKeysBucket(ctx context.Context, valDB db.Database, km v2.IKeymanager) {

validator/flags/flags.go

@@ -33,6 +33,12 @@ var (
 		Usage: "Beacon node RPC provider endpoint",
 		Value: "127.0.0.1:4000",
 	}
+	// BeaconRPCGatewayProviderFlag defines a beacon node JSON-RPC endpoint.
+	BeaconRPCGatewayProviderFlag = &cli.StringFlag{
+		Name:  "beacon-rpc-gateway-provider",
+		Usage: "Beacon node RPC gateway provider endpoint",
+		Value: "127.0.0.1:3500",
+	}
 	// CertFlag defines a flag for the node's TLS certificate.
 	CertFlag = &cli.StringFlag{
 		Name:  "tls-cert",
@@ -101,6 +107,13 @@ var (
 		Usage: "Enable gRPC gateway for JSON requests",
 		Value: 7500,
 	}
+	// GPRCGatewayCorsDomain serves preflight requests when serving gRPC JSON gateway.
+	GPRCGatewayCorsDomain = &cli.StringFlag{
+		Name: "grpc-gateway-corsdomain",
+		Usage: "Comma separated list of domains from which to accept cross origin requests " +
+			"(browser enforced). This flag has no effect if not used with --grpc-gateway-port.",
+		Value: "http://localhost:4200",
+	}
 	// KeyManager specifies the key manager to use.
 	KeyManager = &cli.StringFlag{
 		Name:  "keymanager",

validator/main.go

@@ -49,6 +49,7 @@ func startNode(ctx *cli.Context) error {
 
 var appFlags = []cli.Flag{
 	flags.BeaconRPCProviderFlag,
+	flags.BeaconRPCGatewayProviderFlag,
 	flags.CertFlag,
 	flags.GraffitiFlag,
 	flags.KeystorePathFlag,
@@ -67,6 +68,7 @@ var appFlags = []cli.Flag{
 	flags.GrpcRetriesFlag,
 	flags.GrpcRetryDelayFlag,
 	flags.GrpcHeadersFlag,
+	flags.GPRCGatewayCorsDomain,
 	flags.KeyManager,
 	flags.KeyManagerOpts,
 	flags.DisableAccountMetricsFlag,

validator/node/node.go

@@ -360,6 +360,7 @@ func (s *ValidatorClient) registerRPCService(cliCtx *cli.Context) error {
 	}
 	rpcHost := cliCtx.String(flags.RPCHost.Name)
 	rpcPort := cliCtx.Int(flags.RPCPort.Name)
+	nodeGatewayEndpoint := cliCtx.String(flags.BeaconRPCGatewayProviderFlag.Name)
 	server := rpc.NewServer(context.Background(), &rpc.Config{
 		ValDB:                 s.db,
 		Host:                  rpcHost,
@@ -367,6 +368,7 @@ func (s *ValidatorClient) registerRPCService(cliCtx *cli.Context) error {
 		WalletInitializedFeed: s.walletInitialized,
 		ValidatorService:      vs,
 		SyncChecker:           vs,
+		NodeGatewayEndpoint:   nodeGatewayEndpoint,
 	})
 	return s.services.RegisterService(server)
 }
@@ -378,7 +380,7 @@ func (s *ValidatorClient) registerRPCGatewayService(cliCtx *cli.Context) error {
 	rpcPort := cliCtx.Int(flags.RPCPort.Name)
 	rpcAddr := fmt.Sprintf("%s:%d", rpcHost, rpcPort)
 	gatewayAddress := fmt.Sprintf("%s:%d", gatewayHost, gatewayPort)
-	allowedOrigins := []string{"localhost"}
+	allowedOrigins := strings.Split(cliCtx.String(flags.GPRCGatewayCorsDomain.Name), ",")
 	gatewaySrv := gateway.New(
 		context.Background(),
 		rpcAddr,

validator/rpc/health.go

@@ -16,7 +16,7 @@ func (s *Server) GetBeaconNodeConnection(ctx context.Context, _ *ptypes.Empty) (
 		return nil, status.Error(codes.Internal, "Could not determine sync status of beacon node")
 	}
 	return &pb.NodeConnectionResponse{
-		BeaconNodeEndpoint: s.validatorService.BeaconNodeEndpoint(),
+		BeaconNodeEndpoint: s.nodeGatewayEndpoint,
 		Connected:          s.validatorService.Status() == nil,
 		Syncing:            syncStatus,
 	}, nil

validator/rpc/health_test.go

@@ -21,14 +21,13 @@ func (m *mockSyncChecker) Syncing(ctx context.Context) (bool, error) {
 func TestServer_GetBeaconNodeConnection(t *testing.T) {
 	ctx := context.Background()
 	endpoint := "localhost:90210"
-	vs, err := client.NewValidatorService(ctx, &client.Config{
-		Endpoint: endpoint,
-	})
+	vs, err := client.NewValidatorService(ctx, &client.Config{})
 	require.NoError(t, err)
 	s := &Server{
-		walletInitialized: true,
-		validatorService:  vs,
-		syncChecker:       &mockSyncChecker{syncing: true},
+		walletInitialized:   true,
+		validatorService:    vs,
+		syncChecker:         &mockSyncChecker{syncing: true},
+		nodeGatewayEndpoint: endpoint,
 	}
 	got, err := s.GetBeaconNodeConnection(ctx, &ptypes.Empty{})
 	require.NoError(t, err)

validator/rpc/server.go

@@ -40,6 +40,7 @@ type Config struct {
 	ValidatorService      *client.ValidatorService
 	SyncChecker           client.SyncChecker
 	WalletInitializedFeed *event.Feed
+	NodeGatewayEndpoint   string
 }
 
 // Server defining a gRPC server for the remote signer API.
@@ -61,6 +62,7 @@ type Server struct {
 	wallet                *accountsv2.Wallet
 	walletInitializedFeed *event.Feed
 	walletInitialized     bool
+	nodeGatewayEndpoint   string
 }
 
 // NewServer instantiates a new gRPC server.
@@ -78,6 +80,7 @@ func NewServer(ctx context.Context, cfg *Config) *Server {
 		syncChecker:           cfg.SyncChecker,
 		walletInitializedFeed: cfg.WalletInitializedFeed,
 		walletInitialized:     false,
+		nodeGatewayEndpoint:   cfg.NodeGatewayEndpoint,
 	}
 }
 

validator/usage.go

@@ -78,6 +78,7 @@ var appHelpFlagGroups = []flagGroup{
 		Name: "validator",
 		Flags: []cli.Flag{
 			flags.BeaconRPCProviderFlag,
+			flags.BeaconRPCGatewayProviderFlag,
 			flags.CertFlag,
 			flags.EnableWebFlag,
 			flags.KeyManager,
@@ -93,6 +94,7 @@ var appHelpFlagGroups = []flagGroup{
 			flags.GRPCGatewayHost,
 			flags.GrpcRetriesFlag,
 			flags.GrpcRetryDelayFlag,
+			flags.GPRCGatewayCorsDomain,
 			flags.GrpcHeadersFlag,
 			flags.SlasherRPCProviderFlag,
 			flags.SlasherCertFlag,