From 1b2941cd56d69744e6121b7a590285d0faecbded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 14 Jul 2016 11:22:58 +0300 Subject: [release/1.4.10] cmd, core, eth, miner, params, tests: finalize the DAO fork (cherry picked from commit 2c2e389b778b490fcaf14d9cc45a750647ca5c68) --- miner/worker.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'miner') 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) -- cgit v1.2.3