diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-07-08 18:00:37 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-07-16 19:29:56 +0800 |
| commit | 682c4531afeaa3aa6aded275d72eb62819c1e0d7 (patch) | |
| tree | 1e11999a224c9996bfc64afe7059d1611b6b3192 /miner | |
| parent | 5c3051e6faeabf2356437258f65168ed35896e93 (diff) | |
| download | go-tangerine-682c4531afeaa3aa6aded275d72eb62819c1e0d7.tar go-tangerine-682c4531afeaa3aa6aded275d72eb62819c1e0d7.tar.gz go-tangerine-682c4531afeaa3aa6aded275d72eb62819c1e0d7.tar.bz2 go-tangerine-682c4531afeaa3aa6aded275d72eb62819c1e0d7.tar.lz go-tangerine-682c4531afeaa3aa6aded275d72eb62819c1e0d7.tar.xz go-tangerine-682c4531afeaa3aa6aded275d72eb62819c1e0d7.tar.zst go-tangerine-682c4531afeaa3aa6aded275d72eb62819c1e0d7.zip | |
[release/1.4.10] cmd/geth, miner, params: special extradata for DAO fork start
(cherry picked from commit 1e24c2e4f428c85c2f83272af2696469cb8f5bed)
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/miner/worker.go b/miner/worker.go index fe759560c..48cde168b 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -33,6 +33,7 @@ import ( "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/logger/glog" + "github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/pow" "gopkg.in/fatih/set.v0" ) @@ -468,7 +469,14 @@ func (self *worker) commitNewWork() { Extra: self.extra, Time: big.NewInt(tstamp), } - + // If we are doing a DAO hard-fork check whether to override the extra-data or not + 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 { + header.Extra = common.CopyBytes(params.DAOForkBlockExtra) + } + } previous := self.current // Could potentially happen if starting to mine in an odd state. err := self.makeCurrent(parent, header) |