Skip to content

miner: fix miner application of DAO state #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
meowsbits merged 1 commit into from
Jun 30, 2020
Merged

miner: fix miner application of DAO state #128

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions miner/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,8 +902,12 @@ func (w *worker) commitNewWork(interrupt *int32, noempty bool, timestamp int64)
}
// Create the current work task and check any fork transitions needed
env := w.current
if w.chainConfig.IsEnabled(w.chainConfig.GetEthashEIP779Transition, header.Number) {
misc.ApplyDAOHardFork(env.state)
// Mutate the block and state according to any hard-fork specs
isDAOSupport := w.chainConfig.IsEnabled(w.chainConfig.GetEthashEIP779Transition, header.Number)
if isDAOSupport {
if daoNumber := w.chainConfig.GetEthashEIP779Transition(); daoNumber != nil && *daoNumber == header.Number.Uint64() {
misc.ApplyDAOHardFork(env.state)
}
}
// Accumulate the uncles for the current block
uncles := make([]*types.Header, 0, 2)
Expand Down