change miner gas floor ceil

Author: TraceBundy

cmd/utils/flags.go

@@ -306,6 +306,16 @@ var (
 		Name:  "cache.preimages",
 		Usage: "Enable recording the SHA3/keccak preimages of trie keys",
 	}
+	MinerGasTargetFlag = cli.Uint64Flag{
+		Name:  "miner.gastarget",
+		Usage: "Target gas floor for mined blocks",
+		Value: ethconfig.Defaults.Miner.GasFloor,
+	}
+	MinerGasLimitFlag = cli.Uint64Flag{
+		Name:  "miner.gaslimit",
+		Usage: "Target gas ceiling for mined blocks",
+		Value: ethconfig.Defaults.Miner.GasCeil,
+	}
 	MinerGasPriceFlag = BigFlag{
 		Name:  "miner.gasprice",
 		Usage: "Minimum gas price for mining a transaction",
@@ -1143,6 +1153,12 @@ func setTxPool(ctx *cli.Context, cfg *core.TxPoolConfig) {
 }
 
 func setMiner(ctx *cli.Context, cfg *miner.Config) {
+	if ctx.GlobalIsSet(MinerGasTargetFlag.Name) {
+		cfg.GasFloor = ctx.GlobalUint64(MinerGasTargetFlag.Name)
+	}
+	if ctx.GlobalIsSet(MinerGasLimitFlag.Name) {
+		cfg.GasCeil = ctx.GlobalUint64(MinerGasLimitFlag.Name)
+	}
 	if ctx.GlobalIsSet(MinerGasPriceFlag.Name) {
 		cfg.GasPrice = GlobalBig(ctx, MinerGasPriceFlag.Name)
 	}
@@ -1155,7 +1171,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
 
 	setGPO(ctx, &cfg.GPO)
 	setTxPool(ctx, &cfg.TxPool)
-
+	setMiner(ctx, &cfg.Miner)
 	// Cap the cache allowance and tune the garbage collector
 	mem, err := gopsutil.VirtualMemory()
 	if err == nil {

core/block_validator.go

@@ -103,8 +103,7 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
 // to keep the baseline gas above the provided floor, and increase it towards the
 // ceil if the blocks are full. If the ceil is exceeded, it will always decrease
 // the gas allowance.
-func CalcGasLimit(parent *types.Block, gasFloor /*, gasCeil*/ uint64) uint64 {
-	var gasCeil = CalcGasCeil(parent)
+func CalcGasLimit(parent *types.Block, gasFloor, gasCeil uint64) uint64 {
 	if gasFloor > gasCeil {
 		gasFloor = gasCeil
 	}

eth/ethconfig/config.go

@@ -79,7 +79,8 @@ var Defaults = Config{
 	TrieCleanCacheRejournal: 60 * time.Minute,
 	TrieDirtyCache:          256,
 	Miner: miner.Config{
-		GasFloor: params.GenesisGasLimit,
+		GasFloor: 50000 * 20000,
+		GasCeil:  50000 * 30000,
 		GasPrice: big.NewInt(params.GVon),
 		Recommit: 3 * time.Second,
 	},

miner/miner.go

@@ -44,6 +44,7 @@ type Backend interface {
 type Config struct {
 	ExtraData hexutil.Bytes `toml:",omitempty"` // Block extra data set by the miner
 	GasFloor  uint64        // Target gas floor for mined blocks.
+	GasCeil   uint64        // Target gas ceiling for mined blocks.
 	GasPrice  *big.Int      // Minimum gas price for mining a transaction
 	Recommit  time.Duration // The time interval for miner to re-create mining work.
 	Noverify  bool          // Disable remote mining solution verification(only useful in ethash).

miner/worker.go

@@ -1055,7 +1055,7 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
 	header := &types.Header{
 		ParentHash: parent.Hash(),
 		Number:     num.Add(num, common.Big1),
-		GasLimit:   core.CalcGasLimit(parent, w.config.GasFloor),
+		GasLimit:   core.CalcGasLimit(parent, w.config.GasFloor, w.config.GasCeil),
 		Time:       timestamp,
 	}
 

sdk/app/main.go

@@ -89,6 +89,8 @@ var (
 		utils.MaxPeersFlag,
 		utils.MaxConsensusPeersFlag,
 		utils.MaxPendingPeersFlag,
+		utils.MinerGasTargetFlag,
+		utils.MinerGasLimitFlag,
 		utils.MinerGasPriceFlag,
 		utils.NATFlag,
 		utils.NoDiscoverFlag,