Merge branch 'main' into hoa/test

berachain · Jan 18, 2024 · b0de89a · b0de89a
2 parents 4114e04 + 1fc6fc3
commit b0de89a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git 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
 }

diff --git 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
@@ -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{