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-15 21:52:55 +0800 |
| commit | 461cdb593b9e5bd9ae9ac35c68809a3a29290dcb (patch) | |
| tree | 62a669dfab270dcfa1e334240083ba067569253f /miner | |
| parent | 7f00e8c0331bf13739e749bab88bf9006ca02f96 (diff) | |
| download | dexon-461cdb593b9e5bd9ae9ac35c68809a3a29290dcb.tar dexon-461cdb593b9e5bd9ae9ac35c68809a3a29290dcb.tar.gz dexon-461cdb593b9e5bd9ae9ac35c68809a3a29290dcb.tar.bz2 dexon-461cdb593b9e5bd9ae9ac35c68809a3a29290dcb.tar.lz dexon-461cdb593b9e5bd9ae9ac35c68809a3a29290dcb.tar.xz dexon-461cdb593b9e5bd9ae9ac35c68809a3a29290dcb.tar.zst dexon-461cdb593b9e5bd9ae9ac35c68809a3a29290dcb.zip | |
core, params, tests: add DAO hard-fork balance moves
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 ba0085d52..9118b0f8e 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() |