Merge branch 'develop' into miner

2014-03-17 11:15:28 +01:00
parent 095d5baaed 826c827e6b
commit 2be2fc7974
3 changed files with 6 additions and 1 deletions
--- a/ethchain/state_manager.go
+++ b/ethchain/state_manager.go
@ -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