Merge branch 'release/0.6.5' into develop

ethereum.go

@@ -25,7 +25,7 @@ import (
 
 const (
 	seedTextFileUri string = "http://www.ethereum.org/servers.poc3.txt"
-	seedNodeAddress        = "54.76.56.74:30303"
+	seedNodeAddress        = "poc-6.ethdev.com:30303"
 )
 
 var ethlogger = ethlog.NewLogger("SERV")

ethwire/messaging.go

@@ -111,7 +111,7 @@ func ReadMessages(conn net.Conn) (msgs []*Msg, err error) {
 
 		if n == 0 && len(buff) == 0 {
 			// If there's nothing on the wire wait for a bit
-			time.Sleep(200)
+			time.Sleep(200 * time.Millisecond)
 
 			continue
 		}

peer.go

@@ -362,22 +362,24 @@ clean:
 }
 
 func formatMessage(msg *ethwire.Msg) (ret string) {
-	ret = fmt.Sprintf("%v ", msg.Type)
+	ret = fmt.Sprintf("%v %v", msg.Type, msg.Data)
 
 	/*
 		XXX Commented out because I need the log level here to determine
 		if i should or shouldn't generate this message
 	*/
-	switch msg.Type {
+	/*
-	case ethwire.MsgPeersTy:
+		switch msg.Type {
-		ret += fmt.Sprintf("(%d entries)", msg.Data.Len())
+		case ethwire.MsgPeersTy:
-	case ethwire.MsgBlockTy:
+			ret += fmt.Sprintf("(%d entries)", msg.Data.Len())
-		b1, b2 := ethchain.NewBlockFromRlpValue(msg.Data.Get(0)), ethchain.NewBlockFromRlpValue(msg.Data.Get(msg.Data.Len()-1))
+		case ethwire.MsgBlockTy:
-		ret += fmt.Sprintf("(%d entries) %x - %x", msg.Data.Len(), b1.Hash()[0:4], b2.Hash()[0:4])
+			b1, b2 := ethchain.NewBlockFromRlpValue(msg.Data.Get(0)), ethchain.NewBlockFromRlpValue(msg.Data.Get(msg.Data.Len()-1))
-	case ethwire.MsgBlockHashesTy:
+			ret += fmt.Sprintf("(%d entries) %x - %x", msg.Data.Len(), b1.Hash()[0:4], b2.Hash()[0:4])
-		h1, h2 := msg.Data.Get(0).Bytes(), msg.Data.Get(msg.Data.Len()-1).Bytes()
+		case ethwire.MsgBlockHashesTy:
-		ret += fmt.Sprintf("(%d entries) %x - %x", msg.Data.Len(), h1[0:4], h2[0:4])
+			h1, h2 := msg.Data.Get(0).Bytes(), msg.Data.Get(msg.Data.Len()-1).Bytes()
-	}
+			ret += fmt.Sprintf("(%d entries) %x - %x", msg.Data.Len(), h1, h2)
+		}
+	*/
 
 	return
 }
@@ -512,7 +514,7 @@ func (p *Peer) HandleInbound() {
 						p.lastBlockReceived = time.Now()
 					}
 
-					if foundCommonHash {
+					if foundCommonHash || msg.Data.Len() == 0 {
 						p.FetchBlocks()
 					} else {
 						p.FetchHashes()