From 1d345066d6b401e592b831fefb3b58b0f129b04c Mon Sep 17 00:00:00 2001
From: NathanBSC <Nathan.l@nodereal.io>
Date: Thu, 8 Jun 2023 16:19:35 +0800
Subject: [PATCH] fix: not double GasLimit of block upon London upgrade

---
 core/chain_makers.go | 9 ---------
 miner/worker.go      | 4 ----
 2 files changed, 13 deletions(-)

diff --git a/core/chain_makers.go b/core/chain_makers.go
index c53269ed6e..f847b43450 100644
--- a/core/chain_makers.go
+++ b/core/chain_makers.go
@@ -173,11 +173,6 @@ func (b *BlockGen) AddUncle(h *types.Header) {
 	h.GasLimit = parent.GasLimit
 	if b.config.IsLondon(h.Number) {
 		h.BaseFee = misc.CalcBaseFee(b.config, parent)
-		h.BaseFee = misc.CalcBaseFee(b.config, parent)
-		if !b.config.IsLondon(parent.Number) {
-			parentGasLimit := parent.GasLimit * params.ElasticityMultiplier
-			h.GasLimit = CalcGasLimit(parentGasLimit, parentGasLimit)
-		}
 	}
 	b.uncles = append(b.uncles, h)
 }
@@ -310,10 +305,6 @@ func makeHeader(chain consensus.ChainReader, parent *types.Block, state *state.S
 	}
 	if chain.Config().IsLondon(header.Number) {
 		header.BaseFee = misc.CalcBaseFee(chain.Config(), parent.Header())
-		if !chain.Config().IsLondon(parent.Number()) {
-			parentGasLimit := parent.GasLimit() * params.ElasticityMultiplier
-			header.GasLimit = CalcGasLimit(parentGasLimit, parentGasLimit)
-		}
 	}
 	return header
 }
diff --git a/miner/worker.go b/miner/worker.go
index e4a3e5a4ff..7640c2c675 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -968,10 +968,6 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
 	// Set baseFee and GasLimit if we are on an EIP-1559 chain
 	if w.chainConfig.IsLondon(header.Number) {
 		header.BaseFee = misc.CalcBaseFee(w.chainConfig, parent.Header())
-		if !w.chainConfig.IsLondon(parent.Number()) {
-			parentGasLimit := parent.GasLimit() * params.ElasticityMultiplier
-			header.GasLimit = core.CalcGasLimit(parentGasLimit, w.config.GasCeil)
-		}
 	}
 	// Run the consensus preparation with the default or customized consensus engine.
 	if err := w.engine.Prepare(w.chain, header); err != nil {