Merge branch 'downloadman' into develop

alethzero/MainWin.cpp

@@ -97,26 +97,10 @@ Main::Main(QWidget *parent) :
 //		ui->log->addItem(QString::fromStdString(s));
 	};
 
-#if 0&&ETH_DEBUG
-	m_servers.append("192.168.0.10:30301");
-#else
-    int pocnumber = QString(dev::Version).section('.', 1, 1).toInt();
-	if (pocnumber == 5)
-        m_servers.push_back("54.72.69.180:30303");
-	else if (pocnumber == 6)
-		m_servers.push_back("54.76.56.74:30303");
-	else
-	{
-		connect(&m_webCtrl, &QNetworkAccessManager::finished, [&](QNetworkReply* _r)
-		{
-			m_servers = QString::fromUtf8(_r->readAll()).split("\n", QString::SkipEmptyParts);
-		});
-		QNetworkRequest r(QUrl("http://www.ethereum.org/servers.poc" + QString::number(pocnumber) + ".txt"));
-		r.setHeader(QNetworkRequest::UserAgentHeader, "Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1712.0 Safari/537.36");
-		m_webCtrl.get(r);
-		srand(time(0));
-	}
+#if ETH_DEBUG
+	m_servers.append("localhost:30303");
 #endif
+	m_servers.append(QString::fromStdString(Host::pocHost() + ":30303"));
 
     cerr << "State root: " << BlockChain::genesis().stateRoot << endl;
     cerr << "Block Hash: " << sha3(BlockChain::createGenesisBlock()) << endl;

eth/main.cpp

@@ -99,6 +99,7 @@ void help()
         << "Usage eth [OPTIONS] <remote-host>" << endl
         << "Options:" << endl
         << "    -a,--address <addr>  Set the coinbase (mining payout) address to addr (default: auto)." << endl
+		<< "    -b,--bootstrap  Connect to the default Ethereum peerserver." << endl
         << "    -c,--client-name <name>  Add a name to your client's version string (default: blank)." << endl
         << "    -d,--db-path <path>  Load database from path (default:  ~/.ethereum " << endl
         << "                         <APPDATA>/Etherum or Library/Application Support/Ethereum)." << endl
@@ -134,17 +135,8 @@ string credits(bool _interactive = false)
 
 	if (_interactive)
 	{
-		string vs = toString(dev::Version);
-		vs = vs.substr(vs.find_first_of('.') + 1)[0];
-		int pocnumber = stoi(vs);
-		string m_servers;
-		if (pocnumber == 4)
-			m_servers = "54.72.31.55";
-		else
-			m_servers = "54.72.69.180";
-
 		cout << "Type 'netstart 30303' to start networking" << endl;
-		cout << "Type 'connect " << m_servers << " 30303' to connect" << endl;
+		cout << "Type 'connect " << Host::pocHost() << " 30303' to connect" << endl;
 		cout << "Type 'exit' to quit" << endl << endl;
 	}
 	return cout.str();
@@ -188,6 +180,7 @@ int main(int argc, char** argv)
 	int jsonrpc = 8080;
 #endif
 	string publicIP;
+	bool bootstrap = false;
 	bool upnp = true;
 	bool useLocal = false;
 	bool forceMining = false;
@@ -264,6 +257,8 @@ int main(int argc, char** argv)
 				return -1;
 			}
 		}
+		else if (arg == "-b" || arg == "--bootstrap")
+			bootstrap = true;
 		else if (arg == "-f" || arg == "--force-mining")
 			forceMining = true;
 		else if (arg == "-i" || arg == "--interactive")
@@ -317,7 +312,11 @@ int main(int argc, char** argv)
 
 	cout << "Address: " << endl << toHex(us.address().asArray()) << endl;
 	web3.startNetwork();
-	web3.connect(remoteHost, remotePort);
+
+	if (bootstrap)
+		web3.connect(Host::pocHost());
+	if (remoteHost.size())
+		web3.connect(remoteHost, remotePort);
 
 #if ETH_JSONRPC
 	auto_ptr<EthStubServer> jsonrpcServer;

exp/main.cpp

@@ -37,9 +37,9 @@ using namespace dev::shh;
 int main()
 {
 	DownloadMan man;
-	DownloadSub s0(&man);
-	DownloadSub s1(&man);
-	DownloadSub s2(&man);
+	DownloadSub s0(man);
+	DownloadSub s1(man);
+	DownloadSub s2(man);
 	man.resetToChain(h256s({u256(0), u256(1), u256(2), u256(3), u256(4), u256(5), u256(6), u256(7), u256(8)}));
 	cnote << s0.nextFetch(2);
 	cnote << s1.nextFetch(2);

libethereum/DownloadMan.cpp

@@ -24,7 +24,7 @@ using namespace std;
 using namespace dev;
 using namespace dev::eth;
 
-DownloadSub::DownloadSub(DownloadMan* _man): m_man(_man)
+DownloadSub::DownloadSub(DownloadMan& _man): m_man(&_man)
 {
 	WriteGuard l(m_man->x_subs);
 	m_man->m_subs.insert(this);

libethereum/DownloadMan.h

@@ -42,7 +42,7 @@ class DownloadSub
 	friend class DownloadMan;
 
 public:
-	DownloadSub(DownloadMan* _man);
+	DownloadSub(DownloadMan& _man);
 	~DownloadSub();
 
 	/// Finished last fetch - grab the next bunch of block hashes to download.

libethereum/EthereumHost.h

@@ -35,6 +35,7 @@
 #include <libp2p/Common.h>
 #include "CommonNet.h"
 #include "EthereumPeer.h"
+#include "DownloadMan.h"
 
 namespace dev
 {
@@ -122,6 +123,8 @@ private:
 
 	h256Set m_blocksOnWay;
 
+	DownloadMan m_man;
+
 	h256 m_latestBlockSent;
 	h256Set m_transactionsSent;
 };

libethereum/EthereumPeer.cpp

@@ -35,7 +35,8 @@ using namespace p2p;
 #define clogS(X) dev::LogOutputStream<X, true>(false) << "| " << std::setw(2) << session()->socketId() << "] "
 
 EthereumPeer::EthereumPeer(Session* _s, HostCapabilityFace* _h):
-	Capability(_s, _h)
+	Capability(_s, _h),
+	m_sub(host()->m_man)
 {
 	sendStatus();
 }
@@ -90,7 +91,7 @@ void EthereumPeer::tryGrabbingHashChain()
 	u256 td = max(host()->m_chain.details().totalDifficulty, host()->m_totalDifficultyOfNeeded);
 
 	clogS(NetAllDetail) << "Attempt chain-grab? Latest:" << c.abridged() << ", number:" << n << ", TD: max(" << host()->m_chain.details().totalDifficulty << "," << host()->m_totalDifficultyOfNeeded << ") versus " << m_totalDifficulty;
-	if (td > m_totalDifficulty)
+	if (td >= m_totalDifficulty)
 	{
 		clogS(NetAllDetail) << "No. Our chain is better.";
 		m_grabbing = Grabbing::Nothing;

libethereum/EthereumPeer.h

@@ -32,6 +32,7 @@
 #include <libethcore/CommonEth.h>
 #include <libp2p/Capability.h>
 #include "CommonNet.h"
+#include "DownloadMan.h"
 
 namespace dev
 {
@@ -94,6 +95,8 @@ private:
 	std::set<h256> m_knownBlocks;
 	std::set<h256> m_knownTransactions;
 	std::mutex x_knownTransactions;
+
+	DownloadSub m_sub;
 };
 
 }

libp2p/Host.cpp

@@ -34,6 +34,7 @@
 #include <set>
 #include <chrono>
 #include <thread>
+#include <boost/algorithm/string.hpp>
 #include <libdevcore/Common.h>
 #include <libethcore/Exceptions.h>
 #include "Session.h"
@@ -349,12 +350,20 @@ void Host::ensureAccepting()
 	}
 }
 
+string Host::pocHost()
+{
+	vector<string> strs;
+	boost::split(strs, dev::Version, boost::is_any_of("."));
+	return "poc-" + strs[1] + ".ethdev.com";
+}
+
 void Host::connect(std::string const& _addr, unsigned short _port) noexcept
 {
 	try
 	{
-		// TODO: actual DNS lookup.
-		connect(bi::tcp::endpoint(bi::address::from_string(_addr), _port));
+		bi::tcp::resolver r(m_ioService);
+		connect(r.resolve({_addr, toString(_port)})->endpoint());
+//		connect(bi::tcp::endpoint(bi::address::from_string(_addr), _port));
 	}
 	catch (exception const& e)
 	{

libp2p/Host.h

@@ -82,6 +82,7 @@ public:
 	template <class T> std::shared_ptr<T> cap() const { try { return std::static_pointer_cast<T>(m_capabilities.at(T::staticName())); } catch (...) { return nullptr; } }
 
 	/// Connect to a peer explicitly.
+	static std::string pocHost();
 	void connect(std::string const& _addr, unsigned short _port = 30303) noexcept;
 	void connect(bi::tcp::endpoint const& _ep);
 

third/MainWin.cpp

@@ -100,6 +100,7 @@ Main::Main(QWidget *parent) :
 	connect(ui->ourAccounts->model(), SIGNAL(rowsMoved(const QModelIndex &, int, int, const QModelIndex &, int)), SLOT(ourAccountsRowsMoved()));
 
 	m_web3.reset(new WebThreeDirect("Third", getDataDir() + "/Third", false, {"eth", "shh"}));
+	m_web3->connect(Host::pocHost());
 
 	connect(ui->webView, &QWebView::loadStarted, [this]()
 	{