From 77aa4d1a18988f59c240ac055de5028963271d89 Mon Sep 17 00:00:00 2001 From: shawn Date: Wed, 3 Jan 2024 16:01:39 +0800 Subject: [PATCH] fix conflict --- l2geth/consensus/clique/clique.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/l2geth/consensus/clique/clique.go b/l2geth/consensus/clique/clique.go index cb6cf30089..bbdfb91035 100644 --- a/l2geth/consensus/clique/clique.go +++ b/l2geth/consensus/clique/clique.go @@ -586,7 +586,7 @@ func (c *Clique) FinalizeAndAssemble(chain consensus.ChainReader, header *types. //if UpdateGasLimitBlock = 0, from the genesis block //if UpdateGasLimitBlock = x, from the x mantleUpgradeConfig := upgrade.NewMantleUpgradeConfig(chain.Config().ChainID) - if !mantleUpgradeConfig.IsUpdateGasLimitBlock(header.Number) && chain.Config().ChainID == params.MantleTestnetChainID { + if !mantleUpgradeConfig.IsUpdateGasLimitBlock(header.Number) && chain.Config().ChainID.Cmp(params.MantleTestnetChainID) == 0 { //for testnet, when the UpdateGasLimitBlock is actived, we must update the gaslimit for all of block //which is after the "updategaslimit" block header.GasLimit = uint64(upgrade.PreUpgradedGaslimit)