Skip to content

chore(cli): update defaults based on latest changes #1647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 7, 2023
Merged

chore(cli): update defaults based on latest changes #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c42ed5f
chore(cli): update defaults based on latest changes
GAtom22 Jul 5, 2023
a641cda
add changelog entry
GAtom22 Jul 5, 2023
304c585
add constants for config params
GAtom22 Jul 6, 2023
b07c30f
Merge branch 'main' into GAtom22/update-help
GAtom22 Jul 6, 2023
8391e6c
Merge branch 'main' into GAtom22/update-help
fedekunze Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
- (revenue) [#1607](https://github.com/evmos/evmos/pull/1607) Route gas fees from calling EVM extensions to community pool
- (docker) [#1606](https://github.com/evmos/evmos/pull/1606) Improve Dockerfile to reduce image size
- (deps) [#1635](https://github.com/evmos/evmos/pull/1635) Update cometbft `v0.34.29` with several minor bug fixes and low-severity security-fixes.
- (cli) [#1647](https://github.com/evmos/evmos/pull/1647) Update defaults on `evmosd start` flags.

### State Machine Breaking

Expand Down
28 changes: 23 additions & 5 deletions server/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@ import (
)

const (
// DefaultAPIEnable is the default value for the parameter that defines if the cosmos REST API server is enabled
DefaultAPIEnable = false

// DefaultGRPCEnable is the default value for the parameter that defines if the gRPC server is enabled
DefaultGRPCEnable = false

// DefaultGRPCWebEnable is the default value for the parameter that defines if the gRPC web server is enabled
DefaultGRPCWebEnable = false

// DefaultJSONRPCEnable is the default value for the parameter that defines if the JSON-RPC server is enabled
DefaultJSONRPCEnable = false

// DefaultRosettaEnable is the default value for the parameter that defines if the Rosetta API server is enabled
DefaultRosettaEnable = false

// DefaultTelemetryEnable is the default value for the parameter that defines if the telemetry is enabled
DefaultTelemetryEnable = false

// DefaultGRPCAddress is the default address the gRPC server binds to.
DefaultGRPCAddress = "0.0.0.0:9900"

Expand Down Expand Up @@ -175,11 +193,11 @@ func AppConfig(denom string) (string, interface{}) {
// DefaultConfig returns server's default configuration.
func DefaultConfig() *Config {
defaultSDKConfig := config.DefaultConfig()
defaultSDKConfig.API.Enable = false
defaultSDKConfig.GRPC.Enable = false
defaultSDKConfig.GRPCWeb.Enable = false
defaultSDKConfig.Rosetta.Enable = false
defaultSDKConfig.Telemetry.Enabled = false
defaultSDKConfig.API.Enable = DefaultAPIEnable
defaultSDKConfig.GRPC.Enable = DefaultGRPCEnable
defaultSDKConfig.GRPCWeb.Enable = DefaultGRPCWebEnable
defaultSDKConfig.Rosetta.Enable = DefaultRosettaEnable
defaultSDKConfig.Telemetry.Enabled = DefaultTelemetryEnable

return &Config{
Config: *defaultSDKConfig,
Expand Down
8 changes: 4 additions & 4 deletions server/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,15 @@ which accepts a path for the resulting pprof file.
cmd.Flags().String(srvflags.AppDBBackend, "", "The type of database for application and snapshots databases")

cmd.Flags().Bool(srvflags.GRPCOnly, false, "Start the node in gRPC query only mode without Tendermint process")
cmd.Flags().Bool(srvflags.GRPCEnable, true, "Define if the gRPC server should be enabled")
cmd.Flags().Bool(srvflags.GRPCEnable, config.DefaultGRPCEnable, "Define if the gRPC server should be enabled")
cmd.Flags().String(srvflags.GRPCAddress, serverconfig.DefaultGRPCAddress, "the gRPC server address to listen on")
cmd.Flags().Bool(srvflags.GRPCWebEnable, true, "Define if the gRPC-Web server should be enabled. (Note: gRPC must also be enabled.)")
cmd.Flags().Bool(srvflags.GRPCWebEnable, config.DefaultGRPCWebEnable, "Define if the gRPC-Web server should be enabled. (Note: gRPC must also be enabled.)")
cmd.Flags().String(srvflags.GRPCWebAddress, serverconfig.DefaultGRPCWebAddress, "The gRPC-Web server address to listen on")

cmd.Flags().Bool(srvflags.RPCEnable, false, "Defines if Cosmos-sdk REST server should be enabled")
cmd.Flags().Bool(srvflags.RPCEnable, config.DefaultAPIEnable, "Defines if Cosmos-sdk REST server should be enabled")
cmd.Flags().Bool(srvflags.EnabledUnsafeCors, false, "Defines if CORS should be enabled (unsafe - use it at your own risk)")

cmd.Flags().Bool(srvflags.JSONRPCEnable, true, "Define if the JSON-RPC server should be enabled")
cmd.Flags().Bool(srvflags.JSONRPCEnable, config.DefaultJSONRPCEnable, "Define if the JSON-RPC server should be enabled")
cmd.Flags().StringSlice(srvflags.JSONRPCAPI, config.GetDefaultAPINamespaces(), "Defines a list of JSON-RPC namespaces that should be enabled")
cmd.Flags().String(srvflags.JSONRPCAddress, config.DefaultJSONRPCAddress, "the JSON-RPC server address to listen on")
cmd.Flags().String(srvflags.JSONWsAddress, config.DefaultJSONRPCWsAddress, "the JSON-RPC WS server address to listen on")
Expand Down