From 17ea475b9bef83128490f62566f5a603a55e3db0 Mon Sep 17 00:00:00 2001 From: itsdevbear Date: Wed, 17 Jan 2024 18:49:05 -0500 Subject: [PATCH 1/2] update default configs for gpo --- e2e/testapp/docker/local/config/app.toml | 2 +- eth/polar/config.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/e2e/testapp/docker/local/config/app.toml b/e2e/testapp/docker/local/config/app.toml index cc91de3f2..697a22805 100644 --- a/e2e/testapp/docker/local/config/app.toml +++ b/e2e/testapp/docker/local/config/app.toml @@ -356,7 +356,7 @@ max-block-history = "1024" default = "1000000000" # Maximum gas price value -max-price = "500000000000" +max-price = "500000000000000" # Prices to ignore for gas price determination ignore-price = "2" diff --git a/eth/polar/config.go b/eth/polar/config.go index d36e31fc3..1de919bc6 100644 --- a/eth/polar/config.go +++ b/eth/polar/config.go @@ -36,7 +36,6 @@ import ( ) const ( - // gpoDefault is the default gpo starting point. gpoDefault = 1000000000 @@ -50,10 +49,13 @@ const ( func DefaultConfig() *Config { gpoConfig := ethconfig.FullNodeGPO gpoConfig.Default = big.NewInt(gpoDefault) + gpoConfig.MaxPrice = big.NewInt(ethparams.GWei * 10000) //nolint:gomnd // default. minerCfg := miner.DefaultConfig minerCfg.Etherbase = common.HexToAddress(developmentCoinbase) minerCfg.GasPrice = big.NewInt(1) legacyPool := legacypool.DefaultConfig + legacyPool.NoLocals = true + legacyPool.PriceLimit = 8 // to handle the low base fee. legacyPool.Journal = "" return &Config{ From 1fc6fc319fe8ce0b38b7067982d844c4845f4e4b Mon Sep 17 00:00:00 2001 From: itsdevbear Date: Wed, 17 Jan 2024 19:46:07 -0500 Subject: [PATCH 2/2] remove change --- cosmos/config/default.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cosmos/config/default.go b/cosmos/config/default.go index 365f03a83..5a252cba6 100644 --- a/cosmos/config/default.go +++ b/cosmos/config/default.go @@ -21,6 +21,8 @@ package config import ( + "time" + "github.com/berachain/polaris/eth/node" "github.com/berachain/polaris/eth/polar" @@ -33,8 +35,8 @@ import ( // for the application. func RecommendedCometBFTConfig() *cmtcfg.Config { cfg := cmtcfg.DefaultConfig() - cfg.Mempool.Size = 30000 - cfg.Mempool.CacheSize = 30000 + cfg.Mempool.Size = 3000 + cfg.Mempool.CacheSize = 250000 cfg.Mempool.Recheck = true cfg.Mempool.Type = "flood" @@ -43,6 +45,10 @@ func RecommendedCometBFTConfig() *cmtcfg.Config { cfg.TxIndex.Indexer = "null" + cfg.Consensus.TimeoutPropose = 3 * time.Second + cfg.Consensus.TimeoutPrevote = 1 * time.Second + cfg.Consensus.TimeoutPrecommit = 1 * time.Second + cfg.Instrumentation.Prometheus = true return cfg }