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

Changed nonce to a uint64

Browse Source
This commit is contained in:
obscuren
2015-03-03 21:04:31 +01:00
parent e9f1e868e2
commit 26de12d9bf
10 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
miner/worker.go
View File

@ -47,7 +47,7 @@ func env(block *types.Block, eth core.Backend) *environment {
type Work struct {
Number uint64
Nonce []byte
Nonce uint64
MixDigest []byte
SeedHash []byte
}
@ -150,7 +150,7 @@ func (self *worker) wait() {
for work := range self.recv {
// Someone Successfully Mined!
block := self.current.block
if block.Number().Uint64() == work.Number && block.Nonce() == nil {
if block.Number().Uint64() == work.Number && block.Nonce() == 0 {
self.current.block.Header().Nonce = work.Nonce
self.current.block.Header().MixDigest = work.MixDigest
self.current.block.Header().SeedHash = work.SeedHash
@ -242,7 +242,7 @@ func (self *worker) commitUncle(uncle *types.Header) error {
}
if !self.pow.Verify(types.NewBlockWithHeader(uncle)) {
return core.ValidationError("Uncle's nonce is invalid (= %v)", ethutil.Bytes2Hex(uncle.Nonce))
return core.ValidationError("Uncle's nonce is invalid (= %x)", uncle.Nonce)
}
uncleAccount := self.current.state.GetAccount(uncle.Coinbase)