Skip to content

Commit f55073f

Browse files
authored
PIP-35 for amoy: enforce 25gwei gas config for amoy for erigon 2 (#11078)
Cherry picks #11077 > A followup PR to #10119 which sets the fields `txpool.pricelimit`, `miner.gasprice` and `gpo.ignoreprice` to 25gwei only for polygon amoy network. > Upon sufficient announcements, it will be generalised to all polygon chains later.
1 parent 1f73ed5 commit f55073f

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

erigon-lib/txpool/txpoolcfg/txpoolcfg.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
)
3131

3232
// BorDefaultTxPoolPriceLimit defines the minimum gas price limit for bor to enforce txs acceptance into the pool.
33-
const BorDefaultTxPoolPriceLimit = 30 * common.GWei
33+
const BorDefaultTxPoolPriceLimit = 25 * common.GWei
3434

3535
type Config struct {
3636
DBDir string

eth/backend.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -1649,17 +1649,19 @@ func (s *Ethereum) DataDir() string {
16491649
return s.config.Dirs.DataDir
16501650
}
16511651

1652-
// setBorDefaultMinerGasPrice enforces Miner.GasPrice to be equal to BorDefaultMinerGasPrice (30gwei by default)
1652+
// setBorDefaultMinerGasPrice enforces Miner.GasPrice to be equal to BorDefaultMinerGasPrice (25gwei by default)
1653+
// only for polygon amoy network.
16531654
func setBorDefaultMinerGasPrice(chainConfig *chain.Config, config *ethconfig.Config, logger log.Logger) {
1654-
if chainConfig.Bor != nil && (config.Miner.GasPrice == nil || config.Miner.GasPrice.Cmp(ethconfig.BorDefaultMinerGasPrice) != 0) {
1655+
if chainConfig.Bor != nil && chainConfig.ChainID.Cmp(params.AmoyChainConfig.ChainID) == 0 && (config.Miner.GasPrice == nil || config.Miner.GasPrice.Cmp(ethconfig.BorDefaultMinerGasPrice) != 0) {
16551656
logger.Warn("Sanitizing invalid bor miner gas price", "provided", config.Miner.GasPrice, "updated", ethconfig.BorDefaultMinerGasPrice)
16561657
config.Miner.GasPrice = ethconfig.BorDefaultMinerGasPrice
16571658
}
16581659
}
16591660

1660-
// setBorDefaultTxPoolPriceLimit enforces MinFeeCap to be equal to BorDefaultTxPoolPriceLimit (30gwei by default)
1661+
// setBorDefaultTxPoolPriceLimit enforces MinFeeCap to be equal to BorDefaultTxPoolPriceLimit (25gwei by default)
1662+
// only for polygon amoy network.
16611663
func setBorDefaultTxPoolPriceLimit(chainConfig *chain.Config, config txpoolcfg.Config, logger log.Logger) {
1662-
if chainConfig.Bor != nil && config.MinFeeCap != txpoolcfg.BorDefaultTxPoolPriceLimit {
1664+
if chainConfig.Bor != nil && chainConfig.ChainID.Cmp(params.AmoyChainConfig.ChainID) == 0 && config.MinFeeCap != txpoolcfg.BorDefaultTxPoolPriceLimit {
16631665
logger.Warn("Sanitizing invalid bor min fee cap", "provided", config.MinFeeCap, "updated", txpoolcfg.BorDefaultTxPoolPriceLimit)
16641666
config.MinFeeCap = txpoolcfg.BorDefaultTxPoolPriceLimit
16651667
}

eth/ethconfig/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import (
4646
)
4747

4848
// BorDefaultMinerGasPrice defines the minimum gas price for bor validators to mine a transaction.
49-
var BorDefaultMinerGasPrice = big.NewInt(30 * params.GWei)
49+
var BorDefaultMinerGasPrice = big.NewInt(25 * params.GWei)
5050

5151
// FullNodeGPO contains default gasprice oracle settings for full node.
5252
var FullNodeGPO = gaspricecfg.Config{

eth/gasprice/gasprice.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/ledgerwatch/erigon-lib/chain"
2727
libcommon "github.com/ledgerwatch/erigon-lib/common"
2828
"github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg"
29+
"github.com/ledgerwatch/erigon/params"
2930
"github.com/ledgerwatch/log/v3"
3031

3132
"github.com/ledgerwatch/erigon/core/types"
@@ -284,9 +285,10 @@ func (s *sortingHeap) Pop() interface{} {
284285
return x
285286
}
286287

287-
// setBorDefaultGpoIgnorePrice enforces gpo IgnorePrice to be equal to BorDefaultGpoIgnorePrice (30gwei by default)
288+
// setBorDefaultGpoIgnorePrice enforces gpo IgnorePrice to be equal to BorDefaultGpoIgnorePrice (25gwei by default)
289+
// only for polygon amoy network.
288290
func setBorDefaultGpoIgnorePrice(chainConfig *chain.Config, gasPriceConfig gaspricecfg.Config) {
289-
if chainConfig.Bor != nil && gasPriceConfig.IgnorePrice != gaspricecfg.BorDefaultGpoIgnorePrice {
291+
if chainConfig.Bor != nil && chainConfig.ChainID.Cmp(params.AmoyChainConfig.ChainID) == 0 && gasPriceConfig.IgnorePrice != gaspricecfg.BorDefaultGpoIgnorePrice {
290292
log.Warn("Sanitizing invalid bor gasprice oracle ignore price", "provided", gasPriceConfig.IgnorePrice, "updated", gaspricecfg.BorDefaultGpoIgnorePrice)
291293
gasPriceConfig.IgnorePrice = gaspricecfg.BorDefaultGpoIgnorePrice
292294
}

eth/gasprice/gaspricecfg/gaspricecfg.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
var DefaultIgnorePrice = big.NewInt(2 * params.Wei)
1010

1111
// BorDefaultGpoIgnorePrice defines the minimum gas price below which bor gpo will ignore transactions.
12-
var BorDefaultGpoIgnorePrice = big.NewInt(30 * params.Wei)
12+
var BorDefaultGpoIgnorePrice = big.NewInt(25 * params.Wei)
1313

1414
var (
1515
DefaultMaxPrice = big.NewInt(500 * params.GWei)

0 commit comments

Comments
 (0)