Merge branch 'hotfix/0.7.11' into develop
This commit is contained in:
commit
9d429180f9
@ -30,7 +30,7 @@ import (
|
||||
|
||||
const (
|
||||
ClientIdentifier = "Ethereum(G)"
|
||||
Version = "0.7.10"
|
||||
Version = "0.7.11"
|
||||
)
|
||||
|
||||
var clilogger = logger.NewLogger("CLI")
|
||||
|
@ -31,7 +31,7 @@ import (
|
||||
|
||||
const (
|
||||
ClientIdentifier = "Mist"
|
||||
Version = "0.7.10"
|
||||
Version = "0.7.11"
|
||||
)
|
||||
|
||||
var ethereum *eth.Ethereum
|
||||
|
6
peer.go
6
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:
|
||||
|
Loading…
Reference in New Issue
Block a user