Base Fee Configs

command/default.go

@@ -1,6 +1,8 @@
 package command
 
 import (
+	"fmt"
+
 	"github.com/umbracle/ethgo"
 
 	"github.com/0xPolygon/polygon-edge/chain"
@@ -18,9 +20,10 @@ const (
 )
 
 var (
-	DefaultStake          = ethgo.Ether(1e6)
-	DefaultPremineBalance = ethgo.Ether(1e6)
-	DefaultGenesisBaseFee = chain.GenesisBaseFee
+	DefaultStake                = ethgo.Ether(1e6)
+	DefaultPremineBalance       = ethgo.Ether(1e6)
+	DefaultGenesisBaseFee       = chain.GenesisBaseFee
+	DefaultGenesisBaseFeeConfig = fmt.Sprintf("%d:%d", DefaultGenesisBaseFee, DefaultGenesisBaseFeeEM)
 )
 
 const (

command/genesis/genesis.go

@@ -77,6 +77,15 @@ func setFlags(cmd *cobra.Command) {
 		"the burn contract block and address (format: <block>:<address>[:<burn destination>])",
 	)
 
+	cmd.Flags().StringVar(
+		&params.baseFeeConfig,
+		genesisBaseFeeConfigFlag,
+		command.DefaultGenesisBaseFeeConfig,
+		`initial base fee(in wei) and baseFeeEM (format: <baseFee>[:<baseFeeEM>]). 
+		Default BaseFee is 1 Gwei and BaseFeeEM is 2.
+		Note: BaseFee and BaseFeeEM should be greater than 0.`,
+	)
+
 	cmd.Flags().StringArrayVar(
 		&params.bootnodes,
 		command.BootnodeFlag,

command/genesis/params.go

@@ -34,6 +34,7 @@ const (
 	epochRewardFlag           = "epoch-reward"
 	blockGasLimitFlag         = "block-gas-limit"
 	burnContractFlag          = "burn-contract"
+	genesisBaseFeeConfigFlag  = "genesis-base-fee-config"
 	posFlag                   = "pos"
 	minValidatorCount         = "min-validator-count"
 	maxValidatorCount         = "max-validator-count"
@@ -93,7 +94,8 @@ type genesisParams struct {
 	blockGasLimit uint64
 	isPos         bool
 
-	burnContract string
+	burnContract  string
+	baseFeeConfig string
 
 	minNumValidators uint64
 	maxNumValidators uint64
@@ -182,6 +184,10 @@ func (p *genesisParams) validateFlags() error {
 			return err
 		}
 
+		if err := p.validateGenesisBaseFeeConfig(); err != nil {
+			return err
+		}
+
 		if err := p.validateRewardWallet(); err != nil {
 			return err
 		}
@@ -438,8 +444,9 @@ func (p *genesisParams) initGenesisConfig() error {
 
 	// burn contract can be set only for non mintable native token
 	if p.isBurnContractEnabled() {
-		chainConfig.Genesis.BaseFee = command.DefaultGenesisBaseFee
-		chainConfig.Genesis.BaseFeeEM = command.DefaultGenesisBaseFeeEM
+		baseFeeInfo, _ := parseBaseFeeConfig(p.baseFeeConfig)
+		chainConfig.Genesis.BaseFee = baseFeeInfo.baseFee
+		chainConfig.Genesis.BaseFeeEM = baseFeeInfo.baseFeeEM
 		chainConfig.Params.BurnContract = make(map[uint64]types.Address, 1)
 
 		burnContractInfo, err := parseBurnContractInfo(p.burnContract)
@@ -576,6 +583,27 @@ func (p *genesisParams) validateBurnContract() error {
 	return nil
 }
 
+func (p *genesisParams) validateGenesisBaseFeeConfig() error {
+	if p.baseFeeConfig == "" {
+		return errors.New("genesis base fee config must be set")
+	}
+
+	baseFeeInfo, err := parseBaseFeeConfig(p.baseFeeConfig)
+	if err != nil {
+		return err
+	}
+
+	if baseFeeInfo.baseFee <= 0 {
+		return errors.New("BaseFee should be greater than 0")
+	}
+
+	if baseFeeInfo.baseFeeEM <= 0 {
+		return errors.New("BaseFeeEM should be graeter than 0")
+	}
+
+	return nil
+}
+
 func (p *genesisParams) validateProxyContractsAdmin() error {
 	if strings.TrimSpace(p.proxyContractsAdmin) == "" {
 		return errors.New("proxy contracts admin address must be set")

command/genesis/polybft_params.go

@@ -367,8 +367,9 @@ func (p *genesisParams) generatePolyBftChainConfig(o command.OutputFormatter) er
 	if p.isBurnContractEnabled() {
 		// only populate base fee and base fee multiplier values if burn contract(s)
 		// is provided
-		chainConfig.Genesis.BaseFee = command.DefaultGenesisBaseFee
-		chainConfig.Genesis.BaseFeeEM = command.DefaultGenesisBaseFeeEM
+		baseFeeInfo, _ := parseBaseFeeConfig(p.baseFeeConfig)
+		chainConfig.Genesis.BaseFee = baseFeeInfo.baseFee
+		chainConfig.Genesis.BaseFeeEM = baseFeeInfo.baseFeeEM
 	}
 
 	return helper.WriteGenesisConfigToDisk(chainConfig, params.genesisPath)

command/genesis/utils.go

@@ -2,6 +2,7 @@ package genesis
 
 import (
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"math/big"
@@ -164,6 +165,41 @@ func parseBurnContractInfo(burnContractInfoRaw string) (*polyCommon.BurnContract
 	}, nil
 }
 
+type baseFeeInfo struct {
+	baseFee   uint64
+	baseFeeEM uint64
+}
+
+// parseBaseFeeConfig parses provided base fee configuration and returns baseFeeInfo
+func parseBaseFeeConfig(baseFeeConfigRaw string) (*baseFeeInfo, error) {
+	baseFeeInfo := &baseFeeInfo{command.DefaultGenesisBaseFee, command.DefaultGenesisBaseFeeEM}
+
+	baseFeeConfig := strings.Split(baseFeeConfigRaw, ":")
+	if len(baseFeeConfig) > 2 {
+		return baseFeeInfo, errors.New("invalid number of arguments for base fee configuration")
+	}
+
+	if baseFeeConfig[0] != "" {
+		baseFee, err := strconv.ParseUint(baseFeeConfig[0], 10, 64)
+		if err != nil {
+			return baseFeeInfo, err
+		}
+
+		baseFeeInfo.baseFee = baseFee
+	}
+
+	if len(baseFeeConfig) == 2 && baseFeeConfig[1] != "" {
+		baseFeeEM, err := strconv.ParseUint(baseFeeConfig[1], 10, 64)
+		if err != nil {
+			return baseFeeInfo, err
+		}
+
+		baseFeeInfo.baseFeeEM = baseFeeEM
+	}
+
+	return baseFeeInfo, nil
+}
+
 // GetValidatorKeyFiles returns file names which has validator secrets
 func GetValidatorKeyFiles(rootDir, filePrefix string) ([]string, error) {
 	if rootDir == "" {