Merge branch 'hotfix/0.7.11' into develop

2014-12-24 11:31:08 +01:00 · 2014-12-24 11:31:08 +01:00 · 9d429180f9
commit 9d429180f9
parent f468a9a0e2 c9f963a77e
3 changed files with 8 additions and 2 deletions
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@ -30,7 +30,7 @@ import (

 const (
 	ClientIdentifier = "Ethereum(G)"
-	Version          = "0.7.10"
+	Version          = "0.7.11"
 )

 var clilogger = logger.NewLogger("CLI")
--- a/cmd/mist/main.go
+++ b/cmd/mist/main.go
@ -31,7 +31,7 @@ import (

 const (
 	ClientIdentifier = "Mist"
-	Version          = "0.7.10"
+	Version          = "0.7.11"
 )

 var ethereum *eth.Ethereum
--- a/peer.go
+++ b/peer.go
@ -412,6 +412,12 @@ func (p *Peer) HandleInbound() {
 				//}

 			case wire.MsgDiscTy:
+				blockPool := p.ethereum.blockPool
+				if blockPool.peer == p {
+					blockPool.peer = nil
+					blockPool.td = ethutil.Big0
+				}
+
 				p.Stop()
 				peerlogger.Infoln("Disconnect peer: ", DiscReason(msg.Data.Get(0).Uint()))
 			case wire.MsgPingTy: