use default gas price as the base fee

0xPolygonHermez · Oct 2, 2024 · dd9a191 · dd9a191
1 parent 1fed9ea
commit dd9a191
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/chain/chain_config.go b/chain/chain_config.go
@@ -103,6 +103,7 @@ type Config struct {
 	ForkID12BananaBlock     *big.Int `json:"forkID12BananaBlock,omitempty"`
 
 	AllowFreeTransactions bool `json:"allowFreeTransactions,omitempty"`
+	ZkDefaultGasPrice uint64 `json:"zkDefaultGasFee,omitempty"`
 }
 
 func (c *Config) String() string {

diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
@@ -630,7 +630,8 @@ var (
 	DefaultGasPrice = cli.Uint64Flag{
 		Name:  "zkevm.default-gas-price",
 		Usage: "Set the default/min gas price",
-		Value: 0,
+		// 0.01 gwei
+		Value: 10000000,
 	}
 	MaxGasPrice = cli.Uint64Flag{
 		Name:  "zkevm.max-gas-price",

diff --git a/consensus/misc/eip1559.go b/consensus/misc/eip1559.go
@@ -59,7 +59,7 @@ func VerifyEip1559Header(config *chain.Config, parent, header *types.Header) err
 func CalcBaseFee(config *chain.Config, parent *types.Header) *big.Int {
 	// If the current block is the first EIP-1559 block, return the InitialBaseFee.
 	if !config.IsLondon(parent.Number.Uint64()) {
-		return new(big.Int).SetUint64(params.InitialBaseFee)
+		return new(big.Int).SetUint64(config.ZkDefaultGasPrice)
 	}
 
 	var (

diff --git a/eth/backend.go b/eth/backend.go
@@ -761,6 +761,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		cfg := backend.config
 
 		backend.chainConfig.AllowFreeTransactions = cfg.AllowFreeTransactions
+		backend.chainConfig.ZkDefaultGasPrice = cfg.DefaultGasPrice
 		l1Urls := strings.Split(cfg.L1RpcUrl, ",")
 
 		if cfg.Zk.L1CacheEnabled {