From 296112848cfe1a9697bbb92a9deb3eb1e04d6276 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Thu, 4 Dec 2014 15:13:29 +0100
Subject: [PATCH] Moved block validation as first step

---
 core/block_manager.go | 10 +++-------
 peer.go               |  2 +-
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/core/block_manager.go b/core/block_manager.go
index da8a3fa15..c2ffc7ae0 100644
--- a/core/block_manager.go
+++ b/core/block_manager.go
@@ -224,8 +224,9 @@ func (sm *BlockManager) ProcessWithParent(block, parent *types.Block) (td *big.I
 	// before that.
 	defer state.Reset()
 
-	if ethutil.Config.Diff && ethutil.Config.DiffType == "all" {
-		fmt.Printf("## %x %x ##\n", block.Hash(), block.Number)
+	// Block validation
+	if err = sm.ValidateBlock(block, parent); err != nil {
+		return
 	}
 
 	_, 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 {
 		return
 	}
diff --git a/peer.go b/peer.go
index 0d48faa1e..bf84f6e35 100644
--- a/peer.go
+++ b/peer.go
@@ -24,7 +24,7 @@ const (
 	// The size of the output buffer for writing messages
 	outputBufferSize = 50
 	// Current protocol version
-	ProtocolVersion = 46
+	ProtocolVersion = 47
 	// Current P2P version
 	P2PVersion = 2
 	// Ethereum network version