poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into miner

This commit is contained in:
Maran 2014-03-17 11:15:28 +01:00
parent 095d5baaed 826c827e6b
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) return s.trie.Cmp(other.trie)
} }
func (s *State) Copy() *State {
return NewState(s.trie.Copy())
}
type ObjType byte type ObjType byte
const ( 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 // Verify the nonce of the block. Return an error if it's not valid
if !sm.Pow.Verify(block.HashNoNonce(), block.Difficulty, block.Nonce) { 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 return nil

1
peer.go
View File

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