diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-07-14 16:22:58 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-07-16 19:30:07 +0800 |
| commit | 1b2941cd56d69744e6121b7a590285d0faecbded (patch) | |
| tree | 3c65047a8230fe02333e43b2277f9e69b91b47e3 /miner | |
| parent | b8c088377097f040dc51f56d3e375d039e0e9ebe (diff) | |
| download | go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.gz go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.bz2 go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.lz go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.xz go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.tar.zst go-tangerine-1b2941cd56d69744e6121b7a590285d0faecbded.zip | |
[release/1.4.10] cmd, core, eth, miner, params, tests: finalize the DAO fork
(cherry picked from commit 2c2e389b778b490fcaf14d9cc45a750647ca5c68)
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miner/worker.go b/miner/worker.go index 82bf5d920..93b1abf36 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -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) |