merge conflicts

cmd/ethermintd/config/config.go

@@ -67,10 +67,8 @@ type EVMRPCConfig struct {
 	Enable bool `mapstructure:"enable"`
 	// Api defines the api namespaces that should be enabled
 	API string `mapstructure:"api"`
-	// Address defines the HTTP server to listen on
-	RPCAddress string `mapstructure:"address"`
-	// Address defines the WebSocket server to listen on
-	WsAddress string `mapstructure:"ws-address"`
+	// EnableUnsafeCORS defines if CORS should be enabled (unsafe - use it at your own risk)
+	EnableUnsafeCORS bool `mapstructure:"enable-unsafe-cors"`
 }
 
 // DefaultEVMConfig returns an EVM config with the JSON-RPC API enabled by default

server/evmrpc.go

@@ -3,6 +3,7 @@ package server
 import (
 	"net"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/gorilla/mux"
@@ -21,7 +22,11 @@ func StartEVMRPC(ctx *server.Context, clientCtx client.Context, tmRPCAddr string
 	tmWsClient := ConnectTmWS(tmRPCAddr, tmEndpoint)
 
 	rpcServer := ethrpc.NewServer()
-	apis := rpc.GetRPCAPIs(ctx, clientCtx, tmWsClient)
+
+	rpcapi := config.EVMRPC.API
+	rpcapi = strings.ReplaceAll(rpcapi, " ", "")
+	rpcapiArr := strings.Split(rpcapi, ",")
+	apis := rpc.GetRPCAPIs(ctx, clientCtx, tmWsClient, rpcapiArr)
 
 	for _, api := range apis {
 		if err := rpcServer.RegisterName(api.Namespace, api.Service); err != nil {

server/start.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"path/filepath"
 	"runtime/pprof"
-	"strings"
 	"time"
 
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -70,12 +69,15 @@ const (
 
 // GRPC-related flags.
 const (
-	flagGRPCEnable    = "grpc.enable"
-	flagGRPCAddress   = "grpc.address"
-	flagEVMRPCEnable  = "evm-rpc.enable"
-	flagEVMRPCAPI     = "evm-rpc.api"
-	flagEVMRPCAddress = "evm-rpc.address"
-	flagEVMWSAddress  = "evm-rpc.ws-address"
+	flagGRPCEnable          = "grpc.enable"
+	flagGRPCAddress         = "grpc.address"
+	flagEVMRPCEnable        = "evm-rpc.enable"
+	flagEVMRPCAPI           = "evm-rpc.api"
+	flagEVMRPCAddress       = "evm-rpc.address"
+	flagEVMWSAddress        = "evm-rpc.ws-address"
+	flagEVMEnableUnsafeCORS = "evm-rpc.enable-unsafe-cors"
+	flagGRPCWebEnable       = "grpc-web.enable"
+	flagGRPCWebAddress      = "grpc-web.address"
 )
 
 // State sync-related flags.
@@ -352,34 +354,10 @@ func startInProcess(ctx *server.Context, clientCtx client.Context, appCreator ty
 		if err != nil {
 			return err
 		}
-	}
-
-	var httpSrv *http.Server
-	var httpSrvDone = make(chan struct{}, 1)
-	var wsSrv rpc.WebsocketsServer
-
-	ethlog.Root().SetHandler(ethlog.StdoutHandler)
-	if config.EVMRPC.Enable {
-		tmEndpoint := "/websocket"
-		tmRPCAddr := cfg.RPC.ListenAddress
-		logger.Info("EVM RPC Connecting to Tendermint WebSocket at", "address", tmRPCAddr+tmEndpoint)
-		tmWsClient := ConnectTmWS(tmRPCAddr, tmEndpoint)
-
-		rpcServer := ethrpc.NewServer()
-
-		rpcApi := config.EVMRPC.API
-		rpcApi = strings.ReplaceAll(rpcApi, " ", "")
-		rpcApiArr := strings.Split(rpcApi, ",")
-
-		apis := rpc.GetRPCAPIs(ctx, clientCtx, tmWsClient, rpcApiArr)
-
-		for _, api := range apis {
-			if err := rpcServer.RegisterName(api.Namespace, api.Service); err != nil {
-				logger.Error(
-					"failed to register service in EVM RPC namespace",
-					"namespace", api.Namespace,
-					"service", api.Service,
-				)
+		if config.GRPCWeb.Enable {
+			grpcWebSrv, err = servergrpc.StartGRPCWeb(grpcSrv, config.Config)
+			if err != nil {
+				ctx.Logger.Error("failed to start grpc-web http server: ", err)
 				return err
 			}
 		}