gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd, core, eth, miner, params, tests: finalize the DAO fork

Browse Source
This commit is contained in:
Péter Szilágyi
2016-07-14 11:22:58 +03:00
parent 3291235711
commit 2c2e389b77
12 changed files with 7520 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
miner/worker.go
View File

@ -474,7 +474,7 @@ func (self *worker) commitNewWork() {
if daoBlock := self.config.DAOForkBlock; daoBlock != nil {
// Check whether the block is among the fork extra-override range
limit := new(big.Int).Add(daoBlock, params.DAOForkExtraRange)
if daoBlock.Cmp(header.Number) <= 0 && header.Number.Cmp(limit) < 0 {
if header.Number.Cmp(daoBlock) >= 0 && header.Number.Cmp(limit) < 0 {
// Depending whether we support or oppose the fork, override differently
if self.config.DAOForkSupport {
header.Extra = common.CopyBytes(params.DAOForkBlockExtra)