Merge pull request #2044 from arkpar/bc

Disabled v61 protocol

alethzero/MainWin.cpp

@@ -1899,7 +1899,7 @@ void Main::on_net_triggered()
 	{
 		web3()->setIdealPeerCount(ui->idealPeers->value());
 		web3()->setNetworkPreferences(netPrefs(), ui->dropPeers->isChecked());
-		ethereum()->setNetworkId(m_privateChain.size() ? sha3(m_privateChain.toStdString()) : h256(u256(42)));
+		ethereum()->setNetworkId(m_privateChain.size() ? sha3(m_privateChain.toStdString()) : h256());
 		web3()->startNetwork();
 		ui->downloadView->setDownloadMan(ethereum()->downloadMan());
 		ui->enode->setText(QString::fromStdString(web3()->enode()));

libethereum/EthereumHost.cpp

@@ -241,6 +241,7 @@ void EthereumHost::onPeerStatus(EthereumPeer* _peer)
 		_peer->disable("Peer banned for previous bad behaviour.");
 	else
 	{
+		_peer->m_protocolVersion = EthereumHost::c_oldProtocolVersion; //force V60 for now
 		if (_peer->m_protocolVersion != protocolVersion())
 			estimatePeerHashes(_peer);
 		else if (_peer->m_latestBlockNumber > m_chain.number())

libethereum/EthereumPeer.cpp

@@ -40,6 +40,7 @@ EthereumPeer::EthereumPeer(Session* _s, HostCapabilityFace* _h, unsigned _i, Cap
 	m_hashSub(host()->hashDownloadMan()),
 	m_peerCapabilityVersion(_cap.second)
 {
+	m_peerCapabilityVersion = EthereumHost::c_oldProtocolVersion;
 	m_syncHashNumber = host()->chain().number() + 1;
 	requestStatus();
 }