chg: update enforced 30gwei for gas related configs in bor to 25gwei

builder/files/config.toml

@@ -56,7 +56,7 @@ syncmode = "full"
 
 [txpool]
  nolocals = true
- pricelimit = 30000000000
+ pricelimit = 25000000000
  accountslots = 16
  globalslots = 32768
  accountqueue = 16
@@ -69,7 +69,7 @@ syncmode = "full"
 
 [miner]
  gaslimit = 30000000
- gasprice = "30000000000"
+ gasprice = "25000000000"
  # mine = true
  # etherbase = "VALIDATOR ADDRESS"
  # extradata = ""
@@ -127,7 +127,7 @@ syncmode = "full"
  # maxheaderhistory = 1024
  # maxblockhistory = 1024
  # maxprice = "5000000000000"
- ignoreprice = "30000000000"
+ ignoreprice = "25000000000"
 
 [telemetry]
  metrics = true

core/txpool/legacypool/legacypool.go

@@ -167,7 +167,7 @@ func (config *Config) sanitize() Config {
  log.Warn("Sanitizing invalid txpool journal time", "provided", conf.Rejournal, "updated", time.Second)
  conf.Rejournal = time.Second
  }
- // enforce txpool price limit to 30gwei in bor
+ // enforce txpool price limit to 25gwei in bor
  if conf.PriceLimit != params.BorDefaultTxPoolPriceLimit {
  log.Warn("Sanitizing invalid txpool price limit", "provided", conf.PriceLimit, "updated", DefaultConfig.PriceLimit)
  conf.PriceLimit = DefaultConfig.PriceLimit

core/txpool/legacypool/legacypool_test.go

@@ -62,7 +62,7 @@ func init() {
  testTxPoolConfig = DefaultConfig
  testTxPoolConfig.Journal = ""
  /*
- Given the introduction of `BorDefaultTxPoolPriceLimit=30gwei`,
+ Given the introduction of `BorDefaultTxPoolPriceLimit=25gwei`,
  we set `testTxPoolConfig.PriceLimit = 1` to avoid rewriting all `legacypool_test.go` tests,
  causing code divergence from geth, as this has been widely tested on different networks.
  Also, `worker_test.go` has been adapted to reflect such changes.

docs/cli/example_config.toml

@@ -61,7 +61,7 @@ devfakeauthor = false # Run miner without validator set authorization
  nolocals = false # Disables price exemptions for locally submitted transactions
  journal = "transactions.rlp" # Disk journal for local transaction to survive node restarts
  rejournal = "1h0m0s" # Time interval to regenerate the local transaction journal
- pricelimit = 30000000000 # Minimum gas price limit to enforce for acceptance into the pool. Regardless the value set, it will be enforced to 30000000000 in bor.
+ pricelimit = 25000000000 # Minimum gas price limit to enforce for acceptance into the pool. Regardless the value set, it will be enforced to 25000000000 in bor.
  pricebump = 10 # Price bump percentage to replace an already existing transaction
  accountslots = 16 # Minimum number of executable transaction slots guaranteed per account
  globalslots = 32768 # Maximum number of executable transaction slots for all accounts
@@ -74,7 +74,7 @@ devfakeauthor = false # Run miner without validator set authorization
  etherbase = "" # Public address for block mining rewards
  extradata = "" # Block extra data set by the miner (default = client version)
  gaslimit = 30000000 # Target gas ceiling for mined blocks
- gasprice = "30000000000" # Minimum gas price for mining a transaction. Regardless the value set, it will be enforced to 30000000000 in bor, default suitable for amoy/mumbai/devnet.
+ gasprice = "25000000000" # Minimum gas price for mining a transaction. Regardless the value set, it will be enforced to 25000000000 in bor, default suitable for amoy/mumbai/devnet.
  recommit = "2m5s" # The time interval for miner to re-create mining work
  commitinterrupt = true # Interrupt the current mining work when time is exceeded and create partial blocks
 
@@ -128,7 +128,7 @@ devfakeauthor = false # Run miner without validator set authorization
  maxheaderhistory = 1024 # Maximum header history of gasprice oracle
  maxblockhistory = 1024 # Maximum block history of gasprice oracle
  maxprice = "5000000000000" # Maximum gas price will be recommended by gpo
- ignoreprice = "2" # Gas price below which gpo will ignore transactions (recommended for mainnet = 30000000000, default suitable for amoy/mumbai/devnet)
+ ignoreprice = "25000000000" # Gas price below which gpo will ignore transactions. Regardless the value set, it will be enforced to 25000000000 in bor, default suitable for amoy/mumbai/devnet.
 
 [telemetry]
  metrics = false # Enable metrics collection and reporting

docs/cli/server.md

@@ -46,7 +46,7 @@ The ```bor server``` command runs the Bor client.
 
 - ```gpo.blocks```: Number of recent blocks to check for gas prices (default: 20)
 
-- ```gpo.ignoreprice```: Gas price below which gpo will ignore transactions (default: 30000000000). It's set to 30gwei in bor
+- ```gpo.ignoreprice```: Gas price below which gpo will ignore transactions (default: 25000000000). It's set to 25gwei in bor
 
 - ```gpo.maxblockhistory```: Maximum block history of gasprice oracle (default: 1024)
 
@@ -250,7 +250,7 @@ The ```bor server``` command runs the Bor client.
 
 - ```miner.gaslimit```: Target gas ceiling (gas limit) for mined blocks (default: 30000000)
 
-- ```miner.gasprice```: Minimum gas price for mining a transaction (default: 30000000000). It's set to 30gwei in bor
+- ```miner.gasprice```: Minimum gas price for mining a transaction (default: 25000000000). It's set to 25gwei in bor
 
 - ```miner.interruptcommit```: Interrupt block commit when block creation time is passed (default: true)
 
@@ -306,6 +306,6 @@ The ```bor server``` command runs the Bor client.
 
 - ```txpool.pricebump```: Price bump percentage to replace an already existing transaction (default: 10)
 
-- ```txpool.pricelimit```: Minimum gas price limit to enforce the acceptance of txs into the pool (default: 30000000000). It's set to 30gwei in bor
+- ```txpool.pricelimit```: Minimum gas price limit to enforce the acceptance of txs into the pool (default: 25000000000). It's set to 25gwei in bor
 
 - ```txpool.rejournal```: Time interval to regenerate the local transaction journal (default: 1h0m0s)

eth/backend.go

@@ -122,7 +122,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
  if !config.SyncMode.IsValid() {
  return nil, fmt.Errorf("invalid sync mode %d", config.SyncMode)
  }
- // enforce minimum gas price of 30 gwei in bor
+ // enforce minimum gas price of 25 gwei in bor
  if config.Miner.GasPrice == nil || config.Miner.GasPrice.Cmp(big.NewInt(params.BorDefaultMinerGasPrice)) != 0 {
  log.Warn("Sanitizing invalid miner gas price", "provided", config.Miner.GasPrice, "updated", ethconfig.Defaults.Miner.GasPrice)
  config.Miner.GasPrice = new(big.Int).Set(ethconfig.Defaults.Miner.GasPrice)

eth/catalyst/api_test.go

@@ -84,7 +84,7 @@ func generateMergeChain(n int, merged bool) (*core.Genesis, []*types.Block) {
  generate := func(i int, g *core.BlockGen) {
  g.OffsetTime(5)
  g.SetExtra([]byte("test"))
- tx, _ := types.SignTx(types.NewTransaction(testNonce, common.HexToAddress("0x9a9070028361F7AAbeB3f2F2Dc07F82C4a98A02a"), big.NewInt(1), params.TxGas, big.NewInt(params.InitialBaseFee*32), nil), types.LatestSigner(&config), testKey)
+ tx, _ := types.SignTx(types.NewTransaction(testNonce, common.HexToAddress("0x9a9070028361F7AAbeB3f2F2Dc07F82C4a98A02a"), big.NewInt(1), params.TxGas, big.NewInt(params.InitialBaseFee*26), nil), types.LatestSigner(&config), testKey)
  g.AddTx(tx)
  testNonce++
  }
@@ -604,7 +604,7 @@ func TestNewPayloadOnInvalidChain(t *testing.T) {
  Nonce: statedb.GetNonce(testAddr),
  Value: new(big.Int),
  Gas: 1000000,
- GasPrice: big.NewInt(32 * params.InitialBaseFee),
+ GasPrice: big.NewInt(26 * params.InitialBaseFee),
  Data: logCode,
  })
  ethservice.TxPool().Add([]*types.Transaction{tx}, false, true)

internal/cli/server/command_test.go

@@ -86,7 +86,7 @@ func TestFlagsWithConfig(t *testing.T) {
  "32000000": "0x875500011e5eecc0c554f95d07b31cf59df4ca2505f4dbbfffa7d4e4da917c68",
  },
  )
- require.Equal(t, c.config.Sealer.GasPrice, big.NewInt(30000000000))
+ require.Equal(t, c.config.Sealer.GasPrice, big.NewInt(25000000000))
  require.Equal(t, c.config.Sealer.Recommit, recommit)
  require.Equal(t, c.config.JsonRPC.RPCEVMTimeout, evmTimeout)
  require.Equal(t, c.config.JsonRPC.Http.API, []string{"eth", "bor"})

internal/cli/server/config_legacy_test.go

@@ -26,7 +26,7 @@ func TestConfigLegacy(t *testing.T) {
  "31000000": "0x2087b9e2b353209c2c21e370c82daa12278efd0fe5f0febe6c29035352cf050e",
  "32000000": "0x875500011e5eecc0c554f95d07b31cf59df4ca2505f4dbbfffa7d4e4da917c68",
  }
- testConfig.Sealer.GasPrice = big.NewInt(30000000000)
+ testConfig.Sealer.GasPrice = big.NewInt(25000000000)
  testConfig.Sealer.Recommit = 20 * time.Second
  testConfig.JsonRPC.RPCEVMTimeout = 5 * time.Second
  testConfig.JsonRPC.TxFeeCap = 6.0

internal/cli/server/testdata/default.toml

@@ -58,7 +58,7 @@ devfakeauthor = false
  nolocals = false
  journal = "transactions.rlp"
  rejournal = "1h0m0s"
- pricelimit = 30000000000
+ pricelimit = 25000000000
  pricebump = 10
  accountslots = 16
  globalslots = 32768
@@ -71,7 +71,7 @@ devfakeauthor = false
  etherbase = ""
  extradata = ""
  gaslimit = 30000000
- gasprice = "30000000000"
+ gasprice = "25000000000"
  recommit = "2m5s"
  commitinterrupt = true
 
@@ -127,7 +127,7 @@ devfakeauthor = false
  maxheaderhistory = 1024
  maxblockhistory = 1024
  maxprice = "500000000000"
- ignoreprice = "30000000000"
+ ignoreprice = "25000000000"
 
 [telemetry]
  metrics = false

internal/cli/server/testdata/test.toml

@@ -11,7 +11,7 @@ snapshot = true
 "32000000" = "0x875500011e5eecc0c554f95d07b31cf59df4ca2505f4dbbfffa7d4e4da917c68"
 
 [miner]
- gasprice = "30000000000"
+ gasprice = "25000000000"
  recommit = "20s"
 
 [jsonrpc]

miner/miner.go

@@ -60,7 +60,7 @@ type Config struct {
 // DefaultConfig contains default settings for miner.
 var DefaultConfig = Config{
  GasCeil: 30000000,
- GasPrice: big.NewInt(params.BorDefaultMinerGasPrice), // enforces minimum gas price of 30 gwei in bor
+ GasPrice: big.NewInt(params.BorDefaultMinerGasPrice), // enforces minimum gas price of 25 gwei in bor
 
  // The default recommit time is chosen as two seconds since
  // consensus-layer usually will wait a half slot of time(6s)

miner/worker_test.go

@@ -297,7 +297,7 @@ func (b *testWorkerBackend) newRandomTxWithNonce(creation bool, nonce uint64) *t
 func (b *testWorkerBackend) newStorageCreateContractTx() (*types.Transaction, common.Address) {
  var tx *types.Transaction
 
- gasPrice := big.NewInt(30 * params.InitialBaseFee)
+ gasPrice := big.NewInt(25 * params.InitialBaseFee)
 
  tx, _ = types.SignTx(types.NewContractCreation(b.txPool.Nonce(TestBankAddress), big.NewInt(0), testGas, gasPrice, common.FromHex(storageContractByteCode)), types.HomesteadSigner{}, testBankKey)
  contractAddr := crypto.CreateAddress(TestBankAddress, b.txPool.Nonce(TestBankAddress))

packaging/templates/mainnet-v1/archive/config.toml

@@ -51,7 +51,7 @@ gcmode = "archive"
 
 [txpool]
  nolocals = true
- pricelimit = 30000000000
+ pricelimit = 25000000000
  accountslots = 16
  globalslots = 32768
  accountqueue = 16
@@ -64,7 +64,7 @@ gcmode = "archive"
 
 [miner]
  gaslimit = 30000000
- gasprice = "30000000000"
+ gasprice = "25000000000"
  # mine = false
  # etherbase = ""
  # extradata = ""
@@ -121,7 +121,7 @@ gcmode = "archive"
  # maxheaderhistory = 1024
  # maxblockhistory = 1024
  # maxprice = "5000000000000"
- ignoreprice = "30000000000"
+ ignoreprice = "25000000000"
 
 [telemetry]
  metrics = true

packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml

@@ -51,7 +51,7 @@ syncmode = "full"
 
 [txpool]
  nolocals = true
- pricelimit = 30000000000
+ pricelimit = 25000000000
  accountslots = 16
  globalslots = 32768
  accountqueue = 16
@@ -64,7 +64,7 @@ syncmode = "full"
 
 [miner]
  gaslimit = 30000000
- gasprice = "30000000000"
+ gasprice = "25000000000"
  # mine = false
  # etherbase = ""
  # extradata = ""
@@ -121,7 +121,7 @@ syncmode = "full"
  # maxheaderhistory = 1024
  # maxblockhistory = 1024
  # maxprice = "5000000000000"
- ignoreprice = "30000000000"
+ ignoreprice = "25000000000"
 
 [telemetry]
  metrics = true

packaging/templates/mainnet-v1/sentry/validator/bor/config.toml

@@ -53,7 +53,7 @@ syncmode = "full"
 
 [txpool]
  nolocals = true
- pricelimit = 30000000000
+ pricelimit = 25000000000
  accountslots = 16
  globalslots = 32768
  accountqueue = 16
@@ -67,7 +67,7 @@ syncmode = "full"
 [miner]
  mine = true
  gaslimit = 30000000
- gasprice = "30000000000"
+ gasprice = "25000000000"
  # etherbase = ""
  # extradata = ""
  # recommit = "2m5s"
@@ -123,7 +123,7 @@ syncmode = "full"
  # maxheaderhistory = 1024
  # maxblockhistory = 1024
  # maxprice = "5000000000000"
- ignoreprice = "30000000000"
+ ignoreprice = "25000000000"
 
 [telemetry]
  metrics = true

packaging/templates/mainnet-v1/without-sentry/bor/config.toml

@@ -53,7 +53,7 @@ syncmode = "full"
 
 [txpool]
  nolocals = true
- pricelimit = 30000000000
+ pricelimit = 25000000000
  accountslots = 16
  globalslots = 32768
  accountqueue = 16
@@ -67,7 +67,7 @@ syncmode = "full"
 [miner]
  mine = true
  gaslimit = 30000000
- gasprice = "30000000000"
+ gasprice = "25000000000"
  # etherbase = ""
  # extradata = ""
  # recommit = "2m5s"
@@ -123,7 +123,7 @@ syncmode = "full"
 # maxheaderhistory = 1024
 # maxblockhistory = 1024
 # maxprice = "5000000000000"
- ignoreprice = "30000000000"
+ ignoreprice = "25000000000"
 
 [telemetry]
  metrics = true

packaging/templates/testnet-amoy/archive/config.toml

@@ -57,12 +57,12 @@ gcmode = "archive"
  # locals = []
  # journal = ""
  # rejournal = "1h0m0s"
- # pricelimit = 30000000000
+ # pricelimit = 25000000000
  # pricebump = 10
 
 [miner]
  gaslimit = 30000000
- # gasprice = "30000000000"
+ # gasprice = "25000000000"
  # mine = false
  # etherbase = ""
  # extradata = ""
@@ -119,7 +119,7 @@ gcmode = "archive"
  # maxheaderhistory = 1024
  # maxblockhistory = 1024
  # maxprice = "5000000000000"
- # ignoreprice = "30000000000"
+ # ignoreprice = "25000000000"
 
 [telemetry]
  metrics = true

packaging/templates/testnet-amoy/sentry/sentry/bor/config.toml

@@ -57,12 +57,12 @@ syncmode = "full"
  # locals = []
  # journal = ""
  # rejournal = "1h0m0s"
- # pricelimit = 30000000000
+ # pricelimit = 25000000000
  # pricebump = 10
 
 [miner]
  gaslimit = 30000000
- # gasprice = "30000000000"
+ # gasprice = "25000000000"
  # mine = false
  # etherbase = ""
  # extradata = ""
@@ -119,7 +119,7 @@ syncmode = "full"
  # maxheaderhistory = 1024
  # maxblockhistory = 1024
  # maxprice = "5000000000000"
- # ignoreprice = "30000000000"
+ # ignoreprice = "25000000000"
 
 [telemetry]
  metrics = true

packaging/templates/testnet-amoy/sentry/validator/bor/config.toml

@@ -59,13 +59,13 @@ syncmode = "full"
  # locals = []
  # journal = ""
  # rejournal = "1h0m0s"
- # pricelimit = 30000000000
+ # pricelimit = 25000000000
  # pricebump = 10
 
 [miner]
  mine = true
  gaslimit = 30000000
- # gasprice = "30000000000"
+ # gasprice = "25000000000"
  # etherbase = ""
  # extradata = ""
  # recommit = "2m5s"
@@ -121,7 +121,7 @@ syncmode = "full"
  # maxheaderhistory = 1024
  # maxblockhistory = 1024
  # maxprice = "5000000000000"
- # ignoreprice = "30000000000"
+ # ignoreprice = "25000000000"
 
 [telemetry]
  metrics = true