diff options
| author | obscuren <geffobscura@gmail.com> | 2014-12-24 18:30:13 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-12-24 18:30:13 +0800 |
| commit | 771bfe9e78f9952002a71cccc8d41c8c544fdfcb (patch) | |
| tree | be03fb3b74f0598729c0010fbb6bb153e08a139c | |
| parent | 25d16f358ab5778ea04b23f60083b5a5325621c9 (diff) | |
| parent | c9f963a77e6e728c90e08c0e0008f1dc40df1fe0 (diff) | |
| download | dexon-771bfe9e78f9952002a71cccc8d41c8c544fdfcb.tar.gz dexon-771bfe9e78f9952002a71cccc8d41c8c544fdfcb.tar.zst dexon-771bfe9e78f9952002a71cccc8d41c8c544fdfcb.zip | |
Merge branch 'hotfix/0.7.11'
| -rw-r--r-- | cmd/ethereum/main.go | 2 | ||||
| -rw-r--r-- | cmd/mist/main.go | 2 | ||||
| -rw-r--r-- | peer.go | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go index 2a3c46054..30107c145 100644 --- 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") diff --git a/cmd/mist/main.go b/cmd/mist/main.go index eaf0af0c7..c6dc80171 100644 --- 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 @@ -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: |