From 43ddd22fa8def8211841680f2766162b5881462b Mon Sep 17 00:00:00 2001 From: Mister-EA Date: Wed, 19 Apr 2023 12:03:11 +0200 Subject: [PATCH] consensus, misc: remove unnecessary parent gas limit check --- consensus/misc/eip1559.go | 12 +----------- consensus/parlia/parlia.go | 3 --- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/consensus/misc/eip1559.go b/consensus/misc/eip1559.go index 4e69720ca3..41566ebdc3 100644 --- a/consensus/misc/eip1559.go +++ b/consensus/misc/eip1559.go @@ -28,22 +28,12 @@ import ( // - gas limit check // - basefee check func VerifyEip1559Header(config *params.ChainConfig, parent, header *types.Header) error { - // Verify that the gas limit remains within allowed bounds - parentGasLimit := parent.GasLimit - if !config.IsLondon(parent.Number) { - parentGasLimit = parent.GasLimit * params.ElasticityMultiplier - } - if err := VerifyGaslimit(parentGasLimit, header.GasLimit); err != nil { - return err - } + // Verify the header is not malformed if header.BaseFee == nil { return fmt.Errorf("header is missing baseFee") } - if header.BaseFee.Cmp(big.NewInt(params.InitialBaseFee)) != 0 { - return fmt.Errorf("header has a non-zero baseFee of %v", header.BaseFee) - } // Verify the baseFee is correct based on the parent header. expectedBaseFee := CalcBaseFee(config, parent) if header.BaseFee.Cmp(expectedBaseFee) != 0 { diff --git a/consensus/parlia/parlia.go b/consensus/parlia/parlia.go index 3c11cb4122..959173e16f 100644 --- a/consensus/parlia/parlia.go +++ b/consensus/parlia/parlia.go @@ -560,9 +560,6 @@ func (p *Parlia) verifyHeader(chain consensus.ChainHeaderReader, header *types.H if header.BaseFee != nil { return fmt.Errorf("invalid baseFee before fork: have %d, expected 'nil'", header.BaseFee) } - if err := misc.VerifyGaslimit(parent.GasLimit, header.GasLimit); err != nil { - return err - } } else if err := misc.VerifyEip1559Header(chain.Config(), parent, header); err != nil { // Verify the header's EIP-1559 attributes. return err