conflicts

go.mod

@@ -27,7 +27,7 @@ require (
 	github.com/rakyll/statik v0.1.7
 	github.com/regen-network/cosmos-proto v0.3.1
 	github.com/rjeczalik/notify v0.9.2 // indirect
-	github.com/rs/cors v1.7.0
+	github.com/rs/cors v1.8.0
 	github.com/rs/zerolog v1.23.0
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.2.1
@@ -37,7 +37,6 @@ require (
 	github.com/tendermint/tendermint v0.34.11
 	github.com/tendermint/tm-db v0.6.4
 	github.com/tyler-smith/go-bip39 v1.1.0
-	github.com/xlab/closer v0.0.0-20190328110542-03326addb7c2
 	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
 	google.golang.org/genproto v0.0.0-20210712171009-5404628d0f46
 	google.golang.org/grpc v1.39.0

go.sum

@@ -967,8 +967,6 @@ github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+m
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/xlab/closer v0.0.0-20190328110542-03326addb7c2 h1:LPYwXwwHigHHFX3SFa9W9zBIa5reyaLJos2e95eHh68=
-github.com/xlab/closer v0.0.0-20190328110542-03326addb7c2/go.mod h1:Y8IYP9aVODN3Vnw1FCqygCG5IWyYBeBlZqQ5aX+fHFw=
 github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/xtaci/kcp-go v5.4.20+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE=

server/start.go

@@ -13,8 +13,11 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 
 	"github.com/spf13/cobra"
+<<<<<<< HEAD
 	"github.com/xlab/closer"
 
+=======
+>>>>>>> 0d055294613411af571742856d989ddbf287febe
 	"google.golang.org/grpc"
 
 	abciserver "github.com/tendermint/tendermint/abci/server"
@@ -40,7 +43,11 @@ import (
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+<<<<<<< HEAD
 	ethrpc "github.com/ethereum/go-ethereum/rpc"
+=======
+	ethlog "github.com/ethereum/go-ethereum/log"
+>>>>>>> 0d055294613411af571742856d989ddbf287febe
 
 	ethlog "github.com/ethereum/go-ethereum/log"
 	"github.com/tharsis/ethermint/cmd/ethermintd/config"
@@ -328,42 +335,7 @@ func startInProcess(ctx *server.Context, clientCtx client.Context, appCreator ty
 			return err
 		}
 
-		clientCtx := clientCtx.
-			WithHomeDir(home).
-			WithChainID(genDoc.ChainID)
-
-		apiSrv = api.New(clientCtx, ctx.Logger.With("server", "api"))
-		app.RegisterAPIRoutes(apiSrv, config.API)
-		errCh := make(chan error)
-
-		go func() {
-			if err := apiSrv.Start(config.Config); err != nil {
-				errCh <- err
-			}
-		}()
-
-		select {
-		case err := <-errCh:
-			return err
-		case <-time.After(types.ServerStartTime): // assume server started successfully
-		}
-	}
-
-	var (
-		grpcSrv    *grpc.Server
-		grpcWebSrv *http.Server
-	)
-	if config.GRPC.Enable {
-		grpcSrv, err = servergrpc.StartGRPCServer(clientCtx, app, config.GRPC.Address)
-		if err != nil {
-			return err
-		}
-	}
-
-	var httpSrv *http.Server
-	var httpSrvDone = make(chan struct{}, 1)
-	var wsSrv rpc.WebsocketsServer
-
+<<<<<<< HEAD
 	ethlog.Root().SetHandler(log.NewHandler(ctx.Logger))
 
 	if config.EVMRPC.Enable {
@@ -412,35 +384,55 @@ func startInProcess(ctx *server.Context, clientCtx client.Context, appCreator ty
 			Addr:    config.EVMRPC.RPCAddress,
 			Handler: handlerWithCors.Handler(r),
 		}
+=======
+		clientCtx := clientCtx.
+			WithHomeDir(home).
+			WithChainID(genDoc.ChainID)
+>>>>>>> 0d055294613411af571742856d989ddbf287febe
 
+		apiSrv = api.New(clientCtx, ctx.Logger.With("server", "api"))
+		app.RegisterAPIRoutes(apiSrv, config.API)
 		errCh := make(chan error)
-		go func() {
-			logger.Info("Starting EVM RPC server", "address", config.EVMRPC.RPCAddress)
-			if err := httpSrv.ListenAndServe(); err != nil {
-				if err == http.ErrServerClosed {
-					close(httpSrvDone)
-					return
-				}
 
-				logger.Error("failed to start EVM RPC server", "error", err.Error())
+		go func() {
+			if err := apiSrv.Start(config.Config); err != nil {
 				errCh <- err
 			}
 		}()
 
 		select {
 		case err := <-errCh:
-			logger.Error("failed to boot EVM RPC server", "error", err.Error())
 			return err
-		case <-time.After(1 * time.Second): // assume EVM RPC server started successfully
+		case <-time.After(types.ServerStartTime): // assume server started successfully
 		}
+	}
 
+<<<<<<< HEAD
 		logger.Info("Starting EVM WebSocket server", "address", config.EVMRPC.WsAddress)
 		_, port, _ := net.SplitHostPort(config.EVMRPC.RPCAddress)
 
 		// allocate separate WS connection to Tendermint
 		tmWsClient = ConnectTmWS(tmRPCAddr, tmEndpoint, ctx.Logger)
 		wsSrv = rpc.NewWebsocketsServer(logger, tmWsClient, "localhost:"+port, config.EVMRPC.WsAddress)
 		go wsSrv.Start()
+=======
+	var (
+		grpcSrv    *grpc.Server
+		grpcWebSrv *http.Server
+	)
+	if config.GRPC.Enable {
+		grpcSrv, err = servergrpc.StartGRPCServer(clientCtx, app, config.GRPC.Address)
+		if err != nil {
+			return err
+		}
+		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
+			}
+		}
+>>>>>>> 0d055294613411af571742856d989ddbf287febe
 	}
 
 	var rosettaSrv crgserver.Server