gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd, core, miner: add extradata validation to consensus rules

Browse Source
This commit is contained in:
Péter Szilágyi
2016-07-08 18:48:17 +03:00
parent 1e24c2e4f4
commit a87089fd2d
7 changed files with 296 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
miner/worker.go
View File

@ -17,6 +17,7 @@
package miner
import (
"bytes"
"fmt"
"math/big"
"sync"
@ -469,12 +470,17 @@ 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 we are care about TheDAO 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)
// Depending whether we support or oppose the fork, override differently
if self.config.DAOForkSupport {
header.Extra = common.CopyBytes(params.DAOForkBlockExtra)
} else if bytes.Compare(header.Extra, params.DAOForkBlockExtra) == 0 {
header.Extra = []byte{} // If miner opposes, don't let it use the reserved extra-data
}
}
}
previous := self.current