forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-03-21 02:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' into miner

Browse source
This commit is contained in:
Maran 2014-03-17 11:15:28 +01:00
commit 2be2fc7974
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ethchain/state.go
View file

@ -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 (

2
ethchain/state_manager.go
View file

@ -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

1
peer.go
View file

@ -301,6 +301,7 @@ func (p *Peer) HandleInbound() {
if ethutil.Config.Debug {
ethutil.Config.Log.Infof("[PEER] Block %x failed\n", block.Hash())
ethutil.Config.Log.Infof("[PEER] %v\n", err)
ethutil.Config.Log.Infoln(block)
}
break
} else {