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

Merge pull request #1595 from obscuren/extra-data

Browse Source 
cmd/geth, eth: added canonical extra data
This commit is contained in:
Jeffrey Wilcke
2015-08-07 05:00:36 -07:00
parent b1fac4270d 132df860d9
commit d7580f21f6
4 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
miner/miner.go
View File

@ -18,6 +18,7 @@
package miner
import (
"fmt"
"math/big"
"sync/atomic"
@ -29,6 +30,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"
)
@ -150,8 +152,13 @@ func (self *Miner) HashRate() (tot int64) {
return
}
func (self *Miner) SetExtra(extra []byte) {
func (self *Miner) SetExtra(extra []byte) error {
if uint64(len(extra)) > params.MaximumExtraDataSize.Uint64() {
return fmt.Errorf("Extra exceeds max length. %d > %v", len(extra), params.MaximumExtraDataSize)
}
self.worker.extra = extra
return nil
}
func (self *Miner) PendingState() *state.StateDB {