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

Merge branch 'develop' into miner

Browse Source
This commit is contained in:
obscuren
2015-02-05 09:13:35 -08:00
parent 9d2166a964 db7c34a9df
commit ac69538707
9 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
miner/miner.go
View File

@ -205,9 +205,7 @@ func (self *Miner) mine() {
block.Header().Extra = self.Extra
// Apply uncles
if len(self.uncles) > 0 {
block.SetUncles(self.uncles)
}
block.SetUncles(self.uncles)
parent := chainMan.GetBlock(block.ParentHash())
coinbase := state.GetOrNewStateObject(block.Coinbase())
@ -234,10 +232,10 @@ func (self *Miner) mine() {
minerlogger.Infof("Mining on block. Includes %v transactions", len(transactions))
x, y := getSeed(chainMan, block)
self.pow, err = ethash.New(append(x, y...), block)
x, _ := getSeed(chainMan, block)
self.pow, err = ethash.New(x, block)
if err != nil {
fmt.Println("err", err)
fmt.Println("miner gave back err", err)
return
}