forked from cerc-io/laconicd-deprecated
all, deps: bump go-ethereum version (#5)
* evm, rpc: access lists, JSON-RPC and transaction updates (wip) * ante, evm, rpc: update signature verification * evm: msg server and tests updates * evm: tests (wip) * evm: fix cdc and params * evm: cleanup state transition * fix nil cases * lint
This commit is contained in:
@@ -2,11 +2,12 @@ package config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/cosmos/cosmos-sdk/telemetry"
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/viper"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/telemetry"
|
||||
|
||||
serverconfig "github.com/cosmos/cosmos-sdk/server/config"
|
||||
storetypes "github.com/cosmos/cosmos-sdk/store/types"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
@@ -91,7 +92,7 @@ type EVMRPCConfig struct {
|
||||
// Enable defines if the EVM RPC server should be enabled.
|
||||
Enable bool `mapstructure:"enable"`
|
||||
// Address defines the HTTP server to listen on
|
||||
RpcAddress string `mapstructure:"address"`
|
||||
RPCAddress string `mapstructure:"address"`
|
||||
// Address defines the WebSocket server to listen on
|
||||
WsAddress string `mapstructure:"ws-address"`
|
||||
}
|
||||
@@ -178,7 +179,7 @@ func DefaultConfig() *Config {
|
||||
},
|
||||
EVMRPC: EVMRPCConfig{
|
||||
Enable: true,
|
||||
RpcAddress: DefaultEVMAddress,
|
||||
RPCAddress: DefaultEVMAddress,
|
||||
WsAddress: DefaultEVMWSAddress,
|
||||
},
|
||||
StateSync: StateSyncConfig{
|
||||
@@ -231,7 +232,7 @@ func GetConfig(v *viper.Viper) Config {
|
||||
},
|
||||
EVMRPC: EVMRPCConfig{
|
||||
Enable: v.GetBool("evm-rpc.enable"),
|
||||
RpcAddress: v.GetString("evm-rpc.address"),
|
||||
RPCAddress: v.GetString("evm-rpc.address"),
|
||||
WsAddress: v.GetString("evm-rpc.ws-address"),
|
||||
},
|
||||
StateSync: StateSyncConfig{
|
||||
|
||||
@@ -157,7 +157,7 @@ address = "{{ .GRPC.Address }}"
|
||||
enable = {{ .EVMRPC.Enable }}
|
||||
|
||||
# Address defines the EVM RPC HTTP server address to bind to.
|
||||
address = "{{ .EVMRPC.RpcAddress }}"
|
||||
address = "{{ .EVMRPC.RPCAddress }}"
|
||||
|
||||
# Address defines the EVM WebSocket server address to bind to.
|
||||
ws-address = "{{ .EVMRPC.WsAddress }}"
|
||||
|
||||
+1
-11
@@ -2,7 +2,6 @@ package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/client/flags"
|
||||
"github.com/cosmos/cosmos-sdk/crypto/keyring"
|
||||
@@ -13,8 +12,7 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
flagLong = "long"
|
||||
flagLogLevel = "log_level"
|
||||
flagLong = "long"
|
||||
)
|
||||
|
||||
func init() {
|
||||
@@ -80,11 +78,3 @@ func addTxFlags(cmd *cobra.Command) *cobra.Command {
|
||||
cmd.MarkFlagRequired(flags.FlagChainID)
|
||||
return cmd
|
||||
}
|
||||
|
||||
func duration(s string, defaults time.Duration) time.Duration {
|
||||
dur, err := time.ParseDuration(s)
|
||||
if err != nil {
|
||||
dur = defaults
|
||||
}
|
||||
return dur
|
||||
}
|
||||
|
||||
@@ -276,13 +276,13 @@ func startInProcess(ctx *server.Context, clientCtx client.Context, appCreator ty
|
||||
})
|
||||
|
||||
httpSrv = &http.Server{
|
||||
Addr: config.EVMRPC.RpcAddress,
|
||||
Addr: config.EVMRPC.RPCAddress,
|
||||
Handler: handlerWithCors.Handler(r),
|
||||
}
|
||||
|
||||
errCh := make(chan error)
|
||||
go func() {
|
||||
log.Infoln("Starting EVM RPC server on", config.EVMRPC.RpcAddress)
|
||||
log.Infoln("Starting EVM RPC server on", config.EVMRPC.RPCAddress)
|
||||
if err := httpSrv.ListenAndServe(); err != nil {
|
||||
if err == http.ErrServerClosed {
|
||||
close(httpSrvDone)
|
||||
@@ -302,7 +302,7 @@ func startInProcess(ctx *server.Context, clientCtx client.Context, appCreator ty
|
||||
}
|
||||
|
||||
log.Infoln("Starting EVM WebSocket server on", config.EVMRPC.WsAddress)
|
||||
_, port, _ := net.SplitHostPort(config.EVMRPC.RpcAddress)
|
||||
_, port, _ := net.SplitHostPort(config.EVMRPC.RPCAddress)
|
||||
|
||||
// allocate separate WS connection to Tendermint
|
||||
tmWsClient = connectTmWS(tmRPCAddr, tmEndpoint)
|
||||
|
||||
Reference in New Issue
Block a user