diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-07-11 18:55:11 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-07-16 19:30:03 +0800 |
| commit | 14bad7e212011337d14e40c9f975efd096ab7418 (patch) | |
| tree | 9cd51c5fd6af97deb85d1e558b836b52afec7f21 /miner | |
| parent | 8c20fe17bdd78a15226a3df589e8f89b48726b6e (diff) | |
| download | go-tangerine-14bad7e212011337d14e40c9f975efd096ab7418.tar go-tangerine-14bad7e212011337d14e40c9f975efd096ab7418.tar.gz go-tangerine-14bad7e212011337d14e40c9f975efd096ab7418.tar.bz2 go-tangerine-14bad7e212011337d14e40c9f975efd096ab7418.tar.lz go-tangerine-14bad7e212011337d14e40c9f975efd096ab7418.tar.xz go-tangerine-14bad7e212011337d14e40c9f975efd096ab7418.tar.zst go-tangerine-14bad7e212011337d14e40c9f975efd096ab7418.zip | |
[release/1.4.10] core, params, tests: add DAO hard-fork balance moves
(cherry picked from commit 461cdb593b9e5bd9ae9ac35c68809a3a29290dcb)
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/miner/worker.go b/miner/worker.go index 950971eb3..82bf5d920 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -490,7 +490,11 @@ func (self *worker) commitNewWork() { glog.V(logger.Info).Infoln("Could not create new env for mining, retrying on next block.") return } + // Create the current work task and check any fork transitions needed work := self.current + if self.config.DAOForkSupport && self.config.DAOForkBlock != nil && self.config.DAOForkBlock.Cmp(header.Number) == 0 { + core.ApplyDAOHardFork(work.state) + } /* //approach 1 transactions := self.eth.TxPool().GetTransactions() |