Prot

peer.go

@@ -22,7 +22,7 @@ const (
 	// The size of the output buffer for writing messages
 	outputBufferSize = 50
 	// Current protocol version
-	ProtocolVersion = 23
+	ProtocolVersion = 25
 	// Interval for ping/pong message
 	pingPongTimer = 2 * time.Second
 )
@@ -436,19 +436,20 @@ func (p *Peer) HandleInbound() {
 				if err != nil {
 					// If the parent is unknown try to catch up with this peer
 					if ethchain.IsParentErr(err) {
-						/*
-							b := ethchain.NewBlockFromRlpValue(msg.Data.Get(0))
+						b := ethchain.NewBlockFromRlpValue(msg.Data.Get(0))
+
+						peerlogger.Infof("Attempting to catch (%x). Parent unknown\n", b.Hash())
+						p.catchingUp = false
 
-							peerlogger.Infof("Attempting to catch (%x). Parent known\n", b.Hash())
-							p.catchingUp = false
+						p.CatchupWithPeer(b.Hash())
 
-							p.CatchupWithPeer(b.Hash())
+						peerlogger.Infoln(b)
 
-							peerlogger.Infoln(b)
+						/*
+							peerlogger.Infoln("Attempting to catch. Parent known")
+								p.catchingUp = false
+								p.CatchupWithPeer(p.ethereum.BlockChain().CurrentBlock.Hash())
 						*/
-						peerlogger.Infoln("Attempting to catch. Parent known")
-						p.catchingUp = false
-						p.CatchupWithPeer(p.ethereum.BlockChain().CurrentBlock.Hash())
 					} else if ethchain.IsValidationErr(err) {
 						fmt.Println("Err:", err)
 						p.catchingUp = false