forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-15 16:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(miner): improve prepareWork() (#292)

Browse source
This commit is contained in:
David 2024-07-29 17:26:23 +08:00 committed by GitHub
parent 217c9ec0f4
commit 06b29039cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
miner/worker.go
View file

@ -988,11 +988,13 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
// 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) { if w.chainConfig.IsLondon(header.Number) {
if w.chainConfig.Taiko { if w.chainConfig.Taiko {
if !w.chainConfig.IsOntake(header.Number) { if w.chainConfig.IsOntake(header.Number) {
header.BaseFee = genParams.baseFeePerGas
} else {
_, blockGasTargetMillion := core.DecodeOntakeExtraData(header.Extra) _, blockGasTargetMillion := core.DecodeOntakeExtraData(header.Extra)
header.BaseFee = eip1559.CalcBaseFeeOntake(w.chainConfig, parent, uint64(blockGasTargetMillion)*1_000_000) header.BaseFee = eip1559.CalcBaseFeeOntake(w.chainConfig, parent, uint64(blockGasTargetMillion)*1_000_000)
} else if genParams.baseFeePerGas != nil {
header.BaseFee = genParams.baseFeePerGas
} else {
header.BaseFee = eip1559.CalcBaseFee(w.chainConfig, parent)
} }
} else { } else {
header.BaseFee = eip1559.CalcBaseFee(w.chainConfig, parent) header.BaseFee = eip1559.CalcBaseFee(w.chainConfig, parent)