From 25fac0e6e53899055f66a753dbc3454578c35bb4 Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Thu, 27 Jun 2024 15:49:37 +0530 Subject: [PATCH] chg: update enforced 30gwei for gas related configs in bor to 25gwei --- builder/files/config.toml | 6 +++--- core/txpool/legacypool/legacypool.go | 2 +- core/txpool/legacypool/legacypool_test.go | 2 +- docs/cli/example_config.toml | 6 +++--- docs/cli/server.md | 6 +++--- eth/backend.go | 2 +- eth/catalyst/api_test.go | 4 ++-- internal/cli/server/testdata/default.toml | 6 +++--- internal/cli/server/testdata/test.toml | 2 +- miner/miner.go | 2 +- miner/worker_test.go | 2 +- packaging/templates/mainnet-v1/archive/config.toml | 6 +++--- .../templates/mainnet-v1/sentry/sentry/bor/config.toml | 6 +++--- .../templates/mainnet-v1/sentry/validator/bor/config.toml | 6 +++--- .../templates/mainnet-v1/without-sentry/bor/config.toml | 6 +++--- packaging/templates/testnet-amoy/archive/config.toml | 6 +++--- .../templates/testnet-amoy/sentry/sentry/bor/config.toml | 6 +++--- .../templates/testnet-amoy/sentry/validator/bor/config.toml | 6 +++--- .../templates/testnet-amoy/without-sentry/bor/config.toml | 6 +++--- packaging/templates/testnet-v4/archive/config.toml | 6 +++--- .../templates/testnet-v4/sentry/sentry/bor/config.toml | 6 +++--- .../templates/testnet-v4/sentry/validator/bor/config.toml | 6 +++--- .../templates/testnet-v4/without-sentry/bor/config.toml | 6 +++--- params/protocol_params.go | 6 +++--- 24 files changed, 59 insertions(+), 59 deletions(-) diff --git a/builder/files/config.toml b/builder/files/config.toml index 41281bc7e0..df34031979 100644 --- a/builder/files/config.toml +++ b/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 diff --git a/core/txpool/legacypool/legacypool.go b/core/txpool/legacypool/legacypool.go index 1ffeb54ab1..978f2382ea 100644 --- a/core/txpool/legacypool/legacypool.go +++ b/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 diff --git a/core/txpool/legacypool/legacypool_test.go b/core/txpool/legacypool/legacypool_test.go index a5fd8de6ab..923f9213f5 100644 --- a/core/txpool/legacypool/legacypool_test.go +++ b/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. diff --git a/docs/cli/example_config.toml b/docs/cli/example_config.toml index 21705db055..d951a3cda5 100644 --- a/docs/cli/example_config.toml +++ b/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 diff --git a/docs/cli/server.md b/docs/cli/server.md index fc04f12022..264842d589 100644 --- a/docs/cli/server.md +++ b/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) \ No newline at end of file diff --git a/eth/backend.go b/eth/backend.go index 627e39d1f0..8cde2ddbcf 100644 --- a/eth/backend.go +++ b/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) diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go index 3e95b57eba..8b7bcfb5c6 100644 --- a/eth/catalyst/api_test.go +++ b/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) diff --git a/internal/cli/server/testdata/default.toml b/internal/cli/server/testdata/default.toml index 72f166a8c2..0df37d610c 100644 --- a/internal/cli/server/testdata/default.toml +++ b/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 diff --git a/internal/cli/server/testdata/test.toml b/internal/cli/server/testdata/test.toml index 04b2dbed35..e1ff535956 100644 --- a/internal/cli/server/testdata/test.toml +++ b/internal/cli/server/testdata/test.toml @@ -11,7 +11,7 @@ snapshot = true "32000000" = "0x875500011e5eecc0c554f95d07b31cf59df4ca2505f4dbbfffa7d4e4da917c68" [miner] - gasprice = "30000000000" + gasprice = "25000000000" recommit = "20s" [jsonrpc] diff --git a/miner/miner.go b/miner/miner.go index e3f11480b8..44b1157294 100644 --- a/miner/miner.go +++ b/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) diff --git a/miner/worker_test.go b/miner/worker_test.go index cac3e936df..9ff8a19053 100644 --- a/miner/worker_test.go +++ b/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)) diff --git a/packaging/templates/mainnet-v1/archive/config.toml b/packaging/templates/mainnet-v1/archive/config.toml index 9be166bac8..1fb929b358 100644 --- a/packaging/templates/mainnet-v1/archive/config.toml +++ b/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 diff --git a/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml b/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml index 5dec42f6b6..9d606059fd 100644 --- a/packaging/templates/mainnet-v1/sentry/sentry/bor/config.toml +++ b/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 diff --git a/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml b/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml index b9ad57f5c2..9b581ac71d 100644 --- a/packaging/templates/mainnet-v1/sentry/validator/bor/config.toml +++ b/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 diff --git a/packaging/templates/mainnet-v1/without-sentry/bor/config.toml b/packaging/templates/mainnet-v1/without-sentry/bor/config.toml index c7a7a3ddb6..861683aeba 100644 --- a/packaging/templates/mainnet-v1/without-sentry/bor/config.toml +++ b/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 diff --git a/packaging/templates/testnet-amoy/archive/config.toml b/packaging/templates/testnet-amoy/archive/config.toml index 0940fd7819..8233b6e4d2 100644 --- a/packaging/templates/testnet-amoy/archive/config.toml +++ b/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 diff --git a/packaging/templates/testnet-amoy/sentry/sentry/bor/config.toml b/packaging/templates/testnet-amoy/sentry/sentry/bor/config.toml index 94c195a2fe..e020e53597 100644 --- a/packaging/templates/testnet-amoy/sentry/sentry/bor/config.toml +++ b/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 diff --git a/packaging/templates/testnet-amoy/sentry/validator/bor/config.toml b/packaging/templates/testnet-amoy/sentry/validator/bor/config.toml index 7c12b2c8b7..9df5c9ac3b 100644 --- a/packaging/templates/testnet-amoy/sentry/validator/bor/config.toml +++ b/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 diff --git a/packaging/templates/testnet-amoy/without-sentry/bor/config.toml b/packaging/templates/testnet-amoy/without-sentry/bor/config.toml index 64053f7c31..6fb1b809cb 100644 --- a/packaging/templates/testnet-amoy/without-sentry/bor/config.toml +++ b/packaging/templates/testnet-amoy/without-sentry/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 diff --git a/packaging/templates/testnet-v4/archive/config.toml b/packaging/templates/testnet-v4/archive/config.toml index 4bbefafe0d..16fe8e96d2 100644 --- a/packaging/templates/testnet-v4/archive/config.toml +++ b/packaging/templates/testnet-v4/archive/config.toml @@ -59,12 +59,12 @@ gcmode = "archive" # locals = [] # journal = "" # rejournal = "1h0m0s" - # pricelimit = 30000000000 + # pricelimit = 25000000000 # pricebump = 10 [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 diff --git a/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml b/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml index a21a1eb3eb..2af9f206f1 100644 --- a/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml +++ b/packaging/templates/testnet-v4/sentry/sentry/bor/config.toml @@ -59,12 +59,12 @@ syncmode = "full" # locals = [] # journal = "" # rejournal = "1h0m0s" - # pricelimit = 30000000000 + # pricelimit = 25000000000 # pricebump = 10 [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 diff --git a/packaging/templates/testnet-v4/sentry/validator/bor/config.toml b/packaging/templates/testnet-v4/sentry/validator/bor/config.toml index ed1fac2a51..ff397370b5 100644 --- a/packaging/templates/testnet-v4/sentry/validator/bor/config.toml +++ b/packaging/templates/testnet-v4/sentry/validator/bor/config.toml @@ -61,13 +61,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" @@ -123,7 +123,7 @@ syncmode = "full" # maxheaderhistory = 1024 # maxblockhistory = 1024 # maxprice = "5000000000000" - # ignoreprice = "30000000000" + # ignoreprice = "25000000000" [telemetry] metrics = true diff --git a/packaging/templates/testnet-v4/without-sentry/bor/config.toml b/packaging/templates/testnet-v4/without-sentry/bor/config.toml index e9e3b0d1cd..3690048645 100644 --- a/packaging/templates/testnet-v4/without-sentry/bor/config.toml +++ b/packaging/templates/testnet-v4/without-sentry/bor/config.toml @@ -61,13 +61,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" @@ -123,7 +123,7 @@ syncmode = "full" # maxheaderhistory = 1024 # maxblockhistory = 1024 # maxprice = "5000000000000" -# ignoreprice = "30000000000" +# ignoreprice = "25000000000" [telemetry] metrics = true diff --git a/params/protocol_params.go b/params/protocol_params.go index 031e3af0be..204439c21c 100644 --- a/params/protocol_params.go +++ b/params/protocol_params.go @@ -183,13 +183,13 @@ const ( MaxBlobGasPerBlock = 6 * BlobTxBlobGasPerBlob // Maximum consumable blob gas for data blobs per block // BorDefaultMinerGasPrice defines the minimum gas price for bor validators to mine a transaction. - BorDefaultMinerGasPrice = 30 * GWei + BorDefaultMinerGasPrice = 25 * GWei // BorDefaultTxPoolPriceLimit defines the minimum gas price limit for bor to enforce txs acceptance into the pool. - BorDefaultTxPoolPriceLimit = 30 * GWei + BorDefaultTxPoolPriceLimit = 25 * GWei // BorDefaultGpoIgnorePrice defines the minimum gas price below which bor gpo will ignore transactions. - BorDefaultGpoIgnorePrice = 30 * GWei + BorDefaultGpoIgnorePrice = 25 * GWei ) // Gas discount table for BLS12-381 G1 and G2 multi exponentiation operations