Merge branch 'develop' into miner
This commit is contained in:
commit
2be2fc7974
@ -112,6 +112,10 @@ func (s *State) Cmp(other *State) bool {
|
||||
return s.trie.Cmp(other.trie)
|
||||
}
|
||||
|
||||
func (s *State) Copy() *State {
|
||||
return NewState(s.trie.Copy())
|
||||
}
|
||||
|
||||
type ObjType byte
|
||||
|
||||
const (
|
||||
|
@ -266,7 +266,7 @@ func (sm *StateManager) ValidateBlock(block *Block) error {
|
||||
|
||||
// Verify the nonce of the block. Return an error if it's not valid
|
||||
if !sm.Pow.Verify(block.HashNoNonce(), block.Difficulty, block.Nonce) {
|
||||
return ValidationError("Block's nonce is invalid (= %v)", block.Nonce)
|
||||
return ValidationError("Block's nonce is invalid (= %v)", ethutil.Hex(block.Nonce))
|
||||
}
|
||||
|
||||
return nil
|
||||
|
Loading…
Reference in New Issue
Block a user