From 7c47123898ba00e7d74adb7c266460a3de5f7932 Mon Sep 17 00:00:00 2001 From: Austin Roberts Date: Wed, 14 Feb 2024 16:30:05 -0600 Subject: [PATCH] Don't include base fee on non-1559 chains --- miner/worker.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/miner/worker.go b/miner/worker.go index 2ed91cc18..fc706601e 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -940,9 +940,12 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) { header.MixDigest = genParams.random } // Set baseFee and GasLimit if we are on an EIP-1559 chain - if w.chainConfig.IsLondon(header.Number) { + + // begin PluGeth injection + if w.chainConfig.Is1559(header.Number) { header.BaseFee = eip1559.CalcBaseFee(w.chainConfig, parent) - if !w.chainConfig.IsLondon(parent.Number) { + if !w.chainConfig.Is1559(parent.Number) { + // end PluGeth injection parentGasLimit := parent.GasLimit * w.chainConfig.ElasticityMultiplier() header.GasLimit = core.CalcGasLimit(parentGasLimit, w.config.GasCeil) }