Merge branch 'hotfix/0.7.11'

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")

cmd/evm/main.go

@@ -141,9 +141,7 @@ func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
 }
 
 func (self *VMEnv) vm(addr, data []byte, gas, price, value *big.Int) *core.Execution {
-	evm := vm.New(self, vm.DebugVmTy)
+	return core.NewExecution(self, addr, data, gas, price, value)
-
-	return core.NewExecution(evm, addr, data, gas, price, value)
 }
 
 func (self *VMEnv) Call(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {

cmd/mist/main.go

@@ -31,7 +31,7 @@ import (
 
 const (
 	ClientIdentifier = "Mist"
-	Version          = "0.7.10"
+	Version          = "0.7.11"
 )
 
 var ethereum *eth.Ethereum

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: