Merge pull request #449 from lochjin/main

gaslimit fork for meerevm

consensus/forks/gaslimitfork.go

@@ -0,0 +1,24 @@
+package forks
+
+import (
+	mparams "github.com/Qitmeer/qng/meerevm/params"
+)
+
+const (
+	// New gas limit for evm block
+	GasLimitForkEVMHeight = 606567
+)
+
+func IsGasLimitForkHeight(number int64, chainID int64) bool {
+	if chainID != mparams.QngMainnetChainConfig.ChainID.Int64() {
+		return false
+	}
+	return number >= GasLimitForkEVMHeight
+}
+
+func NeedFixedGasLimit(number int64, chainID int64) bool {
+	if chainID != mparams.QngMainnetChainConfig.ChainID.Int64() {
+		return false
+	}
+	return !IsGasLimitForkHeight(number, chainID)
+}

meerevm/meer/meerchain.go

@@ -7,12 +7,12 @@ package meer
 import (
 	"encoding/hex"
 	"fmt"
+	"github.com/Qitmeer/qng/consensus/forks"
 	"github.com/Qitmeer/qng/consensus/model"
 	"github.com/Qitmeer/qng/consensus/vm"
 	qtypes "github.com/Qitmeer/qng/core/types"
 	qcommon "github.com/Qitmeer/qng/meerevm/common"
 	"github.com/Qitmeer/qng/meerevm/eth"
-	mparams "github.com/Qitmeer/qng/meerevm/params"
 	"github.com/Qitmeer/qng/rpc/api"
 	qconsensus "github.com/Qitmeer/qng/vm/consensus"
 	"github.com/ethereum/go-ethereum/common"
@@ -80,11 +80,9 @@ func (b *MeerChain) buildBlock(parent *types.Header, qtxs []model.Tx, timestamp
 	}
 	gaslimit := core.CalcGasLimit(parentBlock.GasLimit(), b.meerpool.config.GasCeil)
 
-	// --------Will be discard in the future --------------------
-	if config.ChainID.Int64() == mparams.QngMainnetChainConfig.ChainID.Int64() {
+	if forks.NeedFixedGasLimit(parent.Number.Int64(), config.ChainID.Int64()) {
 		gaslimit = 0x10000000000000
 	}
-	// ----------------------------------------------------------
 
 	header := makeHeader(&b.chain.Config().Eth, parentBlock, statedb, timestamp, gaslimit)
 

meerevm/meer/meerpool.go

@@ -10,7 +10,6 @@ import (
 	"fmt"
 	"github.com/Qitmeer/qng/common/hash"
 	"github.com/Qitmeer/qng/core/blockchain/opreturn"
-	mparams "github.com/Qitmeer/qng/meerevm/params"
 	"github.com/ethereum/go-ethereum/core/txpool"
 	"github.com/ethereum/go-ethereum/miner"
 	"math/big"
@@ -377,12 +376,6 @@ func (m *MeerPool) updateTemplate(timestamp int64) {
 	}
 	gaslimit := core.CalcGasLimit(parent.GasLimit, m.config.GasCeil)
 
-	// --------Will be discard in the future --------------------
-	if m.chainConfig.ChainID.Int64() == mparams.QngMainnetChainConfig.ChainID.Int64() {
-		gaslimit = params.MaxGasLimit
-	}
-	// ----------------------------------------------------------
-
 	num := big.NewInt(0)
 	num.Set(parent.Number)
 	header := &types.Header{