Merge remote-tracking branch 'origin/release/0.14'

# Conflicts:
#	.bumpversion.cfg
#	CMakeLists.txt

Author: chfast

ethminer/MinerAux.h

@@ -775,12 +775,14 @@ class MinerCLI
 			<< "    -SE, --stratum-email <s> Email address used in eth-proxy (optional)" << endl
 			<< "    --farm-recheck <n>  Leave n ms between checks for changed work (default: 500). When using stratum, use a high value (i.e. 2000) to get more stable hashrate output" << endl
 			<< "    -P URL Specify a pool URL. Can be used multiple times. The 1st for for the primary pool, and the 2nd for the failover pool." << endl
-			<< "        URL takes the form: scheme://user[:password]@hostname:port." << endl
+			<< "        URL takes the form: scheme://user[:password]@hostname:port[/emailaddress]." << endl
 			<< "        for getwork use one of the following schemes:" << endl
 			<< "          " << URI::KnownSchemes(ProtocolFamily::GETWORK) << endl
 			<< "        for stratum use one of the following schemes: "<< endl
 			<< "          " << URI::KnownSchemes(ProtocolFamily::STRATUM) << endl
-			<< "        Example: stratum+ssl://0x012345678901234567890234567890123.miner1@ethermine.org:5555" << endl
+			<< "        Example 1 : stratum+ssl://0x012345678901234567890234567890123.miner1@ethermine.org:5555" << endl
+			<< "        Example 2 : stratum1+tcp://0x012345678901234567890234567890123.miner1@nanopool.org:9999/john.doe@gmail.com" << endl
+			<< "        Example 3 : stratum1+tcp://0x012345678901234567890234567890123@nanopool.org:9999/miner1/john.doe@gmail.com" << endl
 			<< endl
 			<< "Benchmarking mode:" << endl
 			<< "    -M [<n>],--benchmark [<n>] Benchmark for mining and exit; Optionally specify block number to benchmark against specific DAG." << endl

libethcore/Farm.h

@@ -192,18 +192,15 @@ class Farm: public FarmFace
         p.ms = std::chrono::duration_cast<std::chrono::milliseconds>(now - m_lastStart).count();
         m_lastStart = now;
 
-        // Collect
+        // Collect & Reset
         for (auto const& i : m_miners)
         {
             uint64_t minerHashCount = i->hashCount();
+			i->resetHashCount();
             p.hashes += minerHashCount;
             p.minersHashes.push_back(minerHashCount);
         }
 
-        // Reset
-        for (auto const& i : m_miners)
-            i->resetHashCount();
-
         if (p.hashes > 0)
             m_lastProgresses.push_back(p);
 

libpoolprotocols/PoolManager.cpp

@@ -15,7 +15,7 @@ static string diffToDisplay(double diff)
 		diff = diff / 1000.0;
 	}
 	stringstream ss;
-	ss << fixed << setprecision(4) << diff << ' ' << k[i]; 
+	ss << fixed << setprecision(2) << diff << ' ' << k[i]; 
 	return ss.str();
 }
 
@@ -89,14 +89,28 @@ PoolManager::PoolManager(PoolClient * client, Farm &farm, MinerType const & mine
 
 	m_farm.onSolutionFound([&](Solution sol)
 	{
-		m_submit_time = std::chrono::steady_clock::now();
+		// Solution should passthrough only if client is
+		// properly connected. Otherwise we'll have the bad behavior
+		// to log nonce submission but receive no response
 
-		if (sol.stale)
-			cnote << string(EthYellow "Stale nonce 0x") + toHex(sol.nonce);
-		else
-			cnote << string("Nonce 0x") + toHex(sol.nonce);
+		if (p_client->isConnected()) {
+
+			m_submit_time = std::chrono::steady_clock::now();
+
+			if (sol.stale)
+				cnote << string(EthYellow "Stale nonce 0x") + toHex(sol.nonce);
+			else
+				cnote << string("Nonce 0x") + toHex(sol.nonce);
+
+			p_client->submitSolution(sol);
+
+		}
+		else {
+
+			cnote << string(EthRed "Nonce 0x") + toHex(sol.nonce) << "wasted. Waiting for connection ...";
+
+		}
 
-		p_client->submitSolution(sol);
 		return false;
 	});
 	m_farm.onMinerRestart([&]() {

libpoolprotocols/stratum/EthStratumClient.cpp

@@ -210,11 +210,13 @@ void EthStratumClient::disconnect()
 	m_subscribed.store(false, std::memory_order_relaxed);
 	m_authorized.store(false, std::memory_order_relaxed);
 
-	if (m_onDisconnected) { m_onDisconnected();	}
-
 	// Release locking flag and set connection status
 	m_connected.store(false, std::memory_order_relaxed);
 	m_disconnecting.store(false, std::memory_order::memory_order_relaxed);
+
+	// Trigger handlers
+	if (m_onDisconnected) { m_onDisconnected();	}
+
 }
 
 void EthStratumClient::resolve_handler(const boost::system::error_code& ec, tcp::resolver::iterator i)
@@ -367,13 +369,17 @@ void EthStratumClient::connect_handler(const boost::system::error_code& ec, tcp:
 		jReq["params"] = Json::Value(Json::arrayValue);
 
 		p = m_conn.User().find_first_of(".");
-		user = m_conn.User().substr(0, p);
-		if (p + 1 <= m_conn.User().length())
-			m_worker = m_conn.User().substr(p + 1);
-		else
-			// Some marketing ?
-			m_worker = "ethminer " + std::string(ethminer_get_buildinfo()->project_version);
+		if (p != string::npos) {
 
+			user = m_conn.User().substr(0, p);
+			if (p + 1 <= m_conn.User().length())
+				m_worker = m_conn.User().substr(p + 1);
+			else
+				m_worker.clear();
+
+		}
+		
+		
 		switch (m_conn.Version()) {
 
 			case EthStratumClient::STRATUM:
@@ -386,8 +392,8 @@ void EthStratumClient::connect_handler(const boost::system::error_code& ec, tcp:
 
 
 				jReq["method"] = "eth_submitLogin";
-				jReq["worker"] = m_worker;
-				jReq["params"].append(user);
+				if (m_worker.length()) jReq["worker"] = m_worker;
+				jReq["params"].append(m_conn.User() + m_conn.Path());
 				if (!m_email.empty()) jReq["params"].append(m_email);
 
 				break;
@@ -627,9 +633,10 @@ void EthStratumClient::processReponse(Json::Value& responseObject)
 					jReq["jsonrpc"] = "2.0";
 					jReq["method"] = "mining.authorize";
 					jReq["params"] = Json::Value(Json::arrayValue);
-					jReq["params"].append(m_conn.User());
+					jReq["params"].append(m_conn.User() + m_conn.Path());
 					jReq["params"].append(m_conn.Pass());
 
+
 				}
 
 				break;
@@ -687,7 +694,7 @@ void EthStratumClient::processReponse(Json::Value& responseObject)
 					// Eventually request authorization
 					jReq["id"] = unsigned(3);
 					jReq["method"] = "mining.authorize";
-					jReq["params"].append(m_conn.User());
+					jReq["params"].append(m_conn.User() + m_conn.Path());
 					jReq["params"].append(m_conn.Pass());
 
 				}
@@ -769,15 +776,15 @@ void EthStratumClient::processReponse(Json::Value& responseObject)
 
 			if (!_isSuccess) {
 
-				if (!m_authorized && !m_subscribed) {
+				if (!m_subscribed) {
 
 					// Subscription pending
 					cnote << "Subscription failed:" << _errReason;
 					disconnect();
 					return;
 
 				}
-				else if (m_authorized && !m_subscribed) {
+				else if (m_subscribed && !m_authorized) {
 
 					// Authorization pending
 					cnote << "Worker not authorized:" << _errReason;
@@ -991,7 +998,7 @@ void EthStratumClient::submitHashrate(string const & rate) {
 	Json::Value jReq;
 	jReq["id"] = unsigned(9);
 	jReq["jsonrpc"] = "2.0";
-	jReq["worker"] = m_worker;
+	if (m_worker.length()) jReq["worker"] = m_worker;
 	jReq["method"] = "eth_submitHashrate";
 	jReq["params"] = Json::Value(Json::arrayValue);
 	jReq["params"].append(m_rate);
@@ -1025,7 +1032,7 @@ void EthStratumClient::submitSolution(Solution solution) {
 			jReq["params"].append("0x" + nonceHex);
 			jReq["params"].append("0x" + solution.work.header.hex());
 			jReq["params"].append("0x" + solution.mixHash.hex());
-			jReq["worker"] = m_worker;
+			if (m_worker.length()) jReq["worker"] = m_worker;
 
 			break;
 
@@ -1035,7 +1042,7 @@ void EthStratumClient::submitSolution(Solution solution) {
 			jReq["params"].append("0x" + nonceHex);
 			jReq["params"].append("0x" + solution.work.header.hex());
 			jReq["params"].append("0x" + solution.mixHash.hex());
-			jReq["worker"] = m_worker;
+			if (m_worker.length()) jReq["worker"] = m_worker;
 
 			break;