miner/worker.go — Version Comparison
|
v1.16.8 |
v1.17.3 |
| Branch |
etc/v1.16.8-full-node |
etc/v1.17.3-full-node |
| Delta |
+2 -2 |
+2 -2 |
ETC delta on v1.16.8 (+2 -2)
diff --git a/miner/worker.go b/miner/worker.go
index c0574eac2..eda61ac16 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -219,9 +219,9 @@ func (miner *Miner) prepareWork(genParams *generateParams, witness bool) (*envir
header.MixDigest = genParams.random
}
// Set baseFee and GasLimit if we are on an EIP-1559 chain
- if miner.chainConfig.IsLondon(header.Number) {
+ if miner.chainConfig.IsEIP1559(header.Number) {
header.BaseFee = eip1559.CalcBaseFee(miner.chainConfig, parent)
- if !miner.chainConfig.IsLondon(parent.Number) {
+ if !miner.chainConfig.IsEIP1559(parent.Number) {
parentGasLimit := parent.GasLimit * miner.chainConfig.ElasticityMultiplier()
header.GasLimit = core.CalcGasLimit(parentGasLimit, miner.config.GasCeil)
}
ETC delta on v1.17.3 (+2 -2)
diff --git a/miner/worker.go b/miner/worker.go
index 42e369502..eb9692b7c 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -291,9 +291,9 @@ func (miner *Miner) prepareWork(ctx context.Context, genParams *generateParams,
header.MixDigest = genParams.random
}
// Set baseFee and GasLimit if we are on an EIP-1559 chain
- if miner.chainConfig.IsLondon(header.Number) {
+ if miner.chainConfig.IsEIP1559(header.Number) {
header.BaseFee = eip1559.CalcBaseFee(miner.chainConfig, parent)
- if !miner.chainConfig.IsLondon(parent.Number) {
+ if !miner.chainConfig.IsEIP1559(parent.Number) {
parentGasLimit := parent.GasLimit * miner.chainConfig.ElasticityMultiplier()
header.GasLimit = core.CalcGasLimit(parentGasLimit, miner.config.GasCeil)
}
← Back to Version Comparison