EthereumStratum/1.0.0 by default and only option

Author: nicehashdev

ethminer/MinerAux.h

@@ -188,7 +188,7 @@ class MinerCLI
 			if (p + 1 <= userpass.length())
 				m_pass = userpass.substr(p+1);
 		}
-		else if ((arg == "-SV" || arg == "--stratum-version") && i + 1 < argc)
+		/*else if ((arg == "-SV" || arg == "--stratum-version") && i + 1 < argc)
 		{
 			try {
 				m_stratumClientVersion = atoi(argv[++i]);
@@ -200,11 +200,11 @@ class MinerCLI
 				cerr << "Bad " << arg << " option: " << argv[i] << endl;
 				BOOST_THROW_EXCEPTION(BadArgument());
 			}
-		}
-		else if (arg == "-ES" || arg == "--ethereum-stratum")
-		{
-			m_ethereumStratum = true;
-		}
+		}*/
+		//else if (arg == "-ES" || arg == "--ethereum-stratum")
+		//{
+		//	m_ethereumStratum = true;
+		//}
 		else if ((arg == "-FO" || arg == "--failover-userpass") && i + 1 < argc)
 		{
 			string userpass = string(argv[++i]);
@@ -620,8 +620,8 @@ class MinerCLI
 			<< "    -O, --userpass <username.workername:password> Stratum login credentials" << endl
 			<< "    -FO, --failover-userpass <username.workername:password> Failover stratum login credentials (optional, will use normal credentials when omitted)" << endl
 			<< "    --work-timeout <n> reconnect/failover after n seconds of working on the same (stratum) job. Defaults to 180. Don't set lower than max. avg. block time" << endl
-			<< "    -SV, --stratum-version <n>  Stratum client version. Defaults to 1 (async client). Use 2 to test new synchronous client." << endl
-			<< "    -ES, --ethereum-stratum  Use EthereumStratum/1.0.0 mode." << endl
+			//<< "    -SV, --stratum-version <n>  Stratum client version. Defaults to 1 (async client). Use 2 to test new synchronous client." << endl
+			//<< "    -ES, --ethereum-stratum  Use EthereumStratum/1.0.0 mode." << endl
 #endif
 #if ETH_JSONRPC || ETH_STRATUM || !ETH_TRUE
 			<< "    --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
@@ -1092,7 +1092,7 @@ class MinerCLI
 
 			GenericFarm<EthashProofOfWork> f;
 
-			EthStratumClientV2 client(&f, m_minerType, m_farmURL, m_port, m_user, m_pass, m_maxFarmRetries, m_worktimeout, m_ethereumStratum);
+			EthStratumClientV2 client(&f, m_minerType, m_farmURL, m_port, m_user, m_pass, m_maxFarmRetries, m_worktimeout, true);
 			if (m_farmFailOverURL != "")
 			{
 				if (m_fuser != "")

libstratum/EthStratumClient.cpp

@@ -471,9 +471,11 @@ bool EthStratumClient::submit(EthashProofOfWork::Solution solution) {
 	x_current.unlock();
 
 	cnote << "Solution found; Submitting to" << p_active->host << "...";
-	string minernonce = solution.nonce.hex().substr(m_extraNonceHexSize, 16 - m_extraNonceHexSize);
+	string minernonce;
 	if (!m_ethereumStratum)
 		cnote << "  Nonce:" << "0x" + solution.nonce.hex();
+	else
+		minernonce = solution.nonce.hex().substr(m_extraNonceHexSize, 16 - m_extraNonceHexSize);
 
 	if (EthashAux::eval(tempWork.seedHash, tempWork.headerHash, solution.nonce).value < tempWork.boundary)
 	{

libstratum/EthStratumClientV2.cpp

@@ -413,9 +413,11 @@ bool EthStratumClientV2::submit(EthashProofOfWork::Solution solution) {
 	x_current.unlock();
 
 	cnote << "Solution found; Submitting to" << p_active->host << "...";
-	string minernonce = solution.nonce.hex().substr(m_extraNonceHexSize, 16 - m_extraNonceHexSize);
+	string minernonce;
 	if (!m_ethereumStratum)
 		cnote << "  Nonce:" << "0x" + solution.nonce.hex();
+	else
+		minernonce = solution.nonce.hex().substr(m_extraNonceHexSize, 16 - m_extraNonceHexSize);
 
 	if (EthashAux::eval(tempWork.seedHash, tempWork.headerHash, solution.nonce).value < tempWork.boundary)
 	{