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-15 21:52:55 +0800 |
| commit | 2c2e389b778b490fcaf14d9cc45a750647ca5c68 (patch) | |
| tree | 0534f50f26ce5f62b1acaf0c18667b6cc0998103 /miner | |
| parent | 3291235711082759cd7b70253c02150a80d57011 (diff) | |
| download | dexon-2c2e389b778b490fcaf14d9cc45a750647ca5c68.tar dexon-2c2e389b778b490fcaf14d9cc45a750647ca5c68.tar.gz dexon-2c2e389b778b490fcaf14d9cc45a750647ca5c68.tar.bz2 dexon-2c2e389b778b490fcaf14d9cc45a750647ca5c68.tar.lz dexon-2c2e389b778b490fcaf14d9cc45a750647ca5c68.tar.xz dexon-2c2e389b778b490fcaf14d9cc45a750647ca5c68.tar.zst dexon-2c2e389b778b490fcaf14d9cc45a750647ca5c68.zip | |
cmd, core, eth, miner, params, tests: finalize the DAO fork
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 9118b0f8e..dfda6d898 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) |