Skip to content

Commit

Permalink
fix: do not overwrite comet config when set in `InterceptConfigsPreRu…
Browse files Browse the repository at this point in the history
…nHandler` (backport #16395) (#16399)

Co-authored-by: Julien Robert <julien@rbrt.fr>
  • Loading branch information
mergify[bot] and julienrbrt authored Jun 1, 2023
1 parent 6d95900 commit 2e70efc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Bug Fixes

* (server) [#16395](https://github.com/cosmos/cosmos-sdk/pull/16395) Do not override some Comet config is purposely set differently in `InterceptConfigsPreRunHandler`.
* (cli) [#16312](https://github.com/cosmos/cosmos-sdk/pull/16312) Allow any addresses in `client.ValidatePromptAddress`.
* (x/group) [#16017](https://github.com/cosmos/cosmos-sdk/pull/16017) Correctly apply account number in group v2 migration.

Expand Down
14 changes: 9 additions & 5 deletions server/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,16 @@ func interceptConfigs(rootViper *viper.Viper, customAppTemplate string, customCo
return nil, fmt.Errorf("error in config file: %w", err)
}

conf.RPC.PprofListenAddress = "localhost:6060"
conf.P2P.RecvRate = 5120000
conf.P2P.SendRate = 5120000
conf.Consensus.TimeoutCommit = 5 * time.Second
defaultCometCfg := tmcfg.DefaultConfig()
// The SDK is opinionated about those comet values, so we set them here.
// We verify first that the user has not changed them for not overriding them.
if conf.Consensus.TimeoutCommit == defaultCometCfg.Consensus.TimeoutCommit {
conf.Consensus.TimeoutCommit = 5 * time.Second
}
if conf.RPC.PprofListenAddress == defaultCometCfg.RPC.PprofListenAddress {
conf.RPC.PprofListenAddress = "localhost:6060"
}
tmcfg.WriteConfigFile(tmCfgFile, conf)

case err != nil:
return nil, err

Expand Down

0 comments on commit 2e70efc

Please sign in to comment.