roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Moved block validation as first step

Browse Source
This commit is contained in:
obscuren 2014-12-04 15:13:29 +01:00
parent 008e91db6a
commit 296112848c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/block_manager.go
View File

@ -224,8 +224,9 @@ func (sm *BlockManager) ProcessWithParent(block, parent *types.Block) (td *big.I
// before that. // before that.
defer state.Reset() defer state.Reset()
if ethutil.Config.Diff && ethutil.Config.DiffType == "all" { // Block validation
fmt.Printf("## %x %x ##\n", block.Hash(), block.Number) if err = sm.ValidateBlock(block, parent); err != nil {
return
} }
_, err = sm.TransitionState(state, parent, block) _, err = sm.TransitionState(state, parent, block)
@ -247,11 +248,6 @@ func (sm *BlockManager) ProcessWithParent(block, parent *types.Block) (td *big.I
} }
*/ */
// Block validation
if err = sm.ValidateBlock(block, parent); err != nil {
return
}
if err = sm.AccumelateRewards(state, block, parent); err != nil { if err = sm.AccumelateRewards(state, block, parent); err != nil {
return return
} }

2
peer.go
View File

@ -24,7 +24,7 @@ const (
// The size of the output buffer for writing messages // The size of the output buffer for writing messages
outputBufferSize = 50 outputBufferSize = 50
// Current protocol version // Current protocol version
ProtocolVersion = 46 ProtocolVersion = 47
// Current P2P version // Current P2P version
P2PVersion = 2 P2PVersion = 2
// Ethereum network version // Ethereum network version