Don't include base fee on non-1559 chains
This commit is contained in:
parent
3a2484e12d
commit
7c47123898
@ -940,9 +940,12 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
|
|||||||
header.MixDigest = genParams.random
|
header.MixDigest = genParams.random
|
||||||
}
|
}
|
||||||
// Set baseFee and GasLimit if we are on an EIP-1559 chain
|
// 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)
|
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()
|
parentGasLimit := parent.GasLimit * w.chainConfig.ElasticityMultiplier()
|
||||||
header.GasLimit = core.CalcGasLimit(parentGasLimit, w.config.GasCeil)
|
header.GasLimit = core.CalcGasLimit(parentGasLimit, w.config.GasCeil)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user