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

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

Author: chfast

CMakeLists.txt

@@ -47,7 +47,7 @@ set(PROJECT_VERSION 0.14.0rc0)
 
 cable_set_build_type(DEFAULT Release CONFIGURATION_TYPES Release RelWithDebInfo Debug)
 
-# link_directories interprate relative paths with respect to CMAKE_CURRENT_SOURCE_DIR
+# link_directories interprets relative paths with respect to CMAKE_CURRENT_SOURCE_DIR
 cmake_policy(SET CMP0015 NEW)
 
 # let cmake autolink dependencies on windows

cmake/EthCompilerSettings.cmake

@@ -37,8 +37,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 	# disable conversion from 'type1' to 'type2', possible loss of data (4244)
 	# disable forcing value to bool 'true' or 'false' (performance warning) (4800)
 	# declare Windows XP requirement
-	# undefine windows.h MAX && MIN macros cause it cause conflicts with std::min && std::max functions
-	# define miniupnp static library
+	# undefine windows.h MAX & MIN macros because they cause conflicts with std::min & std::max functions
 	add_compile_options(/MP /EHsc /GL /wd4068 /wd4996 /wd4503 /wd4267 /wd4180 /wd4290 /wd4244 /wd4800 -D_WIN32_WINNT=0x0501 /DNOMINMAX)
 	# disable empty object file warning
 	set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /LTCG /ignore:4221")

cmake/cable

@@ -92,7 +92,7 @@ class MinerCLI
 		Stratum
 	};
 
-	MinerCLI() {m_endpoints.reserve(k_max_endpoints);}
+	MinerCLI() {m_endpoints.resize(k_max_endpoints);}
 
 	static void signalHandler(int sig)
 	{
@@ -378,7 +378,7 @@ class MinerCLI
 			}
 			if ((m_mode != OperationMode::None) && (m_mode != mode))
 			{
-				cerr << "Mixed stratum and getwork enpoints not supported." << endl;
+				cerr << "Mixed stratum and getwork endpoints not supported." << endl;
 				BOOST_THROW_EXCEPTION(BadArgument());
 			}
 			m_mode = mode;
@@ -650,7 +650,7 @@ class MinerCLI
 			return false;
 		if (m_legacyParameters && m_newParameters)
 		{
-			cerr << "Deprecated parameters and the -P parameter are imcompatible. Please migrate to using the -P parameter." << endl;
+			cerr << "Deprecated parameters and the -P parameter are incompatible. Please migrate to using the -P parameter." << endl;
 			BOOST_THROW_EXCEPTION(BadArgument());
 		}
 		return true;
@@ -765,7 +765,7 @@ class MinerCLI
 			<< "        1: eth-proxy compatible: dwarfpool, f2pool, nanopool (required for hashrate reporting to work with nanopool)" << endl
 			<< "        2: EthereumStratum/1.0.0: nicehash" << endl
 			<< "    -RH, --report-hashrate Report current hashrate to pool (please only enable on pools supporting this)" << endl
-			<< "    -HWMON [<n>], Displays gpu temp, fan percent and power usage. Note: In linux, the program uses sysfs, which may require running with root priviledges." << endl
+			<< "    -HWMON [<n>], Displays gpu temp, fan percent and power usage. Note: In linux, the program uses sysfs, which may require running with root privileges." << endl
 			<< "        0: Displays only temp and fan percent (default)" << endl
 			<< "        1: Also displays power usage" << endl
 			<< "    --exit Stops the miner whenever an error is encountered" << endl
@@ -821,7 +821,7 @@ class MinerCLI
 			<< "        sync  - Instruct CUDA to block the CPU thread on a synchronization primitive when waiting for the results from the device." << endl
 			<< "    --cuda-devices <0 1 ..n> Select which CUDA GPUs to mine on. Default is to use all" << endl
 			<< "    --cuda-parallel-hash <1 2 ..8> Define how many hashes to calculate in a kernel, can be scaled to achieve better performance. Default=4" << endl
-			<< "    --cuda-noeval  bypass host software re-evalution of GPU solutions." << endl
+			<< "    --cuda-noeval  bypass host software re-evaluation of GPU solutions." << endl
 			<< "        This will trim some milliseconds off the time it takes to send a result to the pool." << endl
 			<< "        Use at your own risk! If GPU generates errored results they WILL be forwarded to the pool" << endl
 			<< "        Not recommended at high overclock." << endl

ethminer/MinerAux.h

@@ -47,7 +47,7 @@ void help()
 		<< "    -v,--verbosity <0 - 9>  Set the log verbosity from 0 to 9 (default: 5). Set to 9 for switch time logging." << endl
 		<< "    -V,--version  Show the version and exit." << endl
 		<< "    -h,--help  Show this help message and exit." << endl
-		<< " Envionment variables:" << endl
+		<< " Environment variables:" << endl
 		<< "     NO_COLOR - set to any value to disable color output. Unset to re-enable color output." << endl
 		;
 	exit(0);
@@ -75,7 +75,7 @@ int main(int argc, char** argv)
 	{
 		g_useColor = false;
 		// Set output mode to handle virtual terminal sequences
-		// Only works on Windows 10, but most user should use it anyways
+		// Only works on Windows 10, but most users should use it anyway
 		HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE);
 		if (hOut != INVALID_HANDLE_VALUE)
 		{

ethminer/main.cpp

@@ -162,7 +162,7 @@ inline unsigned bytesRequired(T _i)
 	return i;
 }
 
-/// Sets enviromental variable.
+/// Sets environment variable.
 ///
 /// Portable wrapper for setenv / _putenv C library functions.
 bool setenv(const char name[], const char value[], bool override = false);

libdevcore/CommonData.h

@@ -62,7 +62,7 @@ class Worker
 
 	std::string m_name;
 
-	mutable Mutex x_work;						///< Lock for the network existance.
+	mutable Mutex x_work;						///< Lock for the network existence.
 	std::unique_ptr<std::thread> m_work;		///< The network thread.
 	std::atomic<WorkerState> m_state = {WorkerState::Starting};
 };

libdevcore/Worker.h

@@ -1,6 +1,10 @@
 find_package(CUDA REQUIRED)
 
-set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};--disable-warnings;--ptxas-options=-v;-use_fast_math;-lineinfo)
+set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};--ptxas-options=-v;-use_fast_math;-lineinfo)
+
+if (NOT MSVC)
+	list(APPEND CUDA_NVCC_FLAGS "--disable-warnings")
+endif()
 
 list(APPEND CUDA_NVCC_FLAGS_RELEASE -O3)
 list(APPEND CUDA_NVCC_FLAGS_DEBUG -G)

libethash-cuda/CMakeLists.txt

@@ -348,7 +348,7 @@ bool CUDAMiner::cuda_init(
 		cudalog << "Set Device to current";
 		if(dagSize128 != m_dag_size || !m_dag)
 		{
-			//Check whether the current device has sufficient memory everytime we recreate the dag
+			//Check whether the current device has sufficient memory every time we recreate the dag
 			if (device_props.totalGlobalMem < dagSize)
 			{
 				cudalog <<  "CUDA device " << string(device_props.name) << " has insufficient GPU memory." << device_props.totalGlobalMem << " bytes of memory found < " << dagSize << " bytes of memory required";
@@ -360,7 +360,7 @@ bool CUDAMiner::cuda_init(
 			CUDA_SAFE_CALL(cudaSetDeviceFlags(s_scheduleFlag));
 			CUDA_SAFE_CALL(cudaDeviceSetCacheConfig(cudaFuncCachePreferL1));
 			//We need to reset the light and the Dag for the following code to reallocate
-			//since cudaDeviceReset() free's all previous allocated memory
+			//since cudaDeviceReset() frees all previous allocated memory
 			m_light[m_device_num] = nullptr;
 			m_dag = nullptr; 
 		}
@@ -384,7 +384,7 @@ bool CUDAMiner::cuda_init(
 		if(dagSize128 != m_dag_size || !dag)
 		{
 			// create mining buffers
-			cudalog << "Generating mining buffers"; //TODO whats up with this?
+			cudalog << "Generating mining buffers";
 			for (unsigned i = 0; i != s_numStreams; ++i)
 			{
 				CUDA_SAFE_CALL(cudaMallocHost(&m_search_buf[i], sizeof(search_results)));

libethash-cuda/CUDAMiner.cpp

@@ -65,7 +65,7 @@ __device__ __forceinline__ bool compute_hash(
 			uint2 shuffle[4];
 			uint32_t thread_mix = fnv_reduce(mix[p]);
 
-			// update mix accross threads
+			// update mix across threads
 			shuffle[0].x = __shfl_sync(0xFFFFFFFF,thread_mix, 0, THREADS_PER_HASH);
 			shuffle[0].y = __shfl_sync(0xFFFFFFFF,thread_mix, 1, THREADS_PER_HASH);
 			shuffle[1].x = __shfl_sync(0xFFFFFFFF,thread_mix, 2, THREADS_PER_HASH);

libethash-cuda/dagger_shuffled.cuh

@@ -324,7 +324,7 @@ class Farm: public FarmFace
         {
             p.ms += cp.ms;
             p.hashes += cp.hashes;
-            for (unsigned int i = 0; i < cp.minersHashes.size(); i++)
+            for (unsigned int i = 0; i < cp.minersHashes.size() && i < p.minersHashes.size(); i++)
             {
                 p.minersHashes.at(i) += cp.minersHashes.at(i);
             }

libethcore/Farm.h

@@ -12,7 +12,7 @@ void *wrap_dlsym(void *h, const char *sym) {
 	return (void *)GetProcAddress((HINSTANCE)h, sym);
 }
 int wrap_dlclose(void *h) {
-	/* FreeLibrary returns nonzero on success */
+	/* FreeLibrary returns non-zero on success */
 	return (!FreeLibrary((HINSTANCE)h));
 }
 #else

libhwmon/wraphelper.cpp

@@ -111,7 +111,7 @@ int wrap_nvml_get_fanpcnt(wrap_nvml_handle *nvmlh,
                           int gpuindex, unsigned int *fanpcnt);
 
 /* 
- * Query the current GPU power usage in millwatts from the CUDA device ID
+ * Query the current GPU power usage in milliwatts from the CUDA device ID
  *
  * This feature is only available on recent GPU generations and may be
  * limited in some cases only to Tesla series GPUs.

libhwmon/wrapnvml.h

@@ -1,6 +1,3 @@
-#ifndef POOL_CLIENT_H_
-#define POOL_CLIENT_H_
-
 #pragma once
 
 #include <boost/asio/ip/address.hpp>
@@ -45,7 +42,7 @@ namespace dev
 
 		private:
 			// Normally we'd replace the following with a single URI variable
-			// But URI attributes are read only, and to support legacy arameters
+			// But URI attributes are read only, and to support legacy parameters
 			// we need to update these connection attributes individually.
 		        string m_host;
 			unsigned short m_port = 0;
@@ -99,6 +96,3 @@ namespace dev
 		};
 	}
 }
-
-#endif
-

libpoolprotocols/PoolClient.h

@@ -198,7 +198,7 @@ void PoolManager::tryReconnect()
 		cnote << "Retrying in " << i << "... \r";
 	}
 
-	// We do not need awesome logic here, we jst have one connection anyways
+	// We do not need awesome logic here, we just have one connection anyway
 	if (m_connections.size() == 1) {
 		p_client->connect();
 		return;

libpoolprotocols/PoolManager.cpp

@@ -1,6 +1,3 @@
-#ifndef POOL_MANAGER_H_
-#define POOL_MANAGER_H_
-
 #pragma once
 
 #include <iostream>
@@ -51,6 +48,3 @@ namespace dev
 		};
 	}
 }
-
-#endif
-

libpoolprotocols/PoolManager.h

@@ -1,6 +1,7 @@
 #include <map>
 #include <boost/optional/optional_io.hpp>
 #include <boost/algorithm/string.hpp>
+#include <network/uri/detail/decode.hpp>
 #include <libpoolprotocols/PoolURI.h>
 
 using namespace dev;
@@ -47,20 +48,23 @@ bool URI::KnownScheme()
 ProtocolFamily URI::ProtoFamily() const
 {
 	std::string s(*m_uri.scheme());
+	s = network::detail::decode(s);
 	boost::trim(s);
 	return s_schemes[s].family;
 }
 
 unsigned URI::ProtoVersion() const
 {
 	std::string s(*m_uri.scheme());
+	s = network::detail::decode(s);
 	boost::trim(s);
 	return s_schemes[s].version;
 }
 
 SecureLevel URI::ProtoSecureLevel() const
 {
 	std::string s(*m_uri.scheme());
+	s = network::detail::decode(s);
 	boost::trim(s);
 	return s_schemes[s].secure;
 }
@@ -78,13 +82,15 @@ std::string URI::KnownSchemes(ProtocolFamily family)
 std::string URI::Scheme() const
 {
 	std::string s(*m_uri.scheme());
+	s = network::detail::decode(s);
 	boost::trim(s);
 	return s;
 }
 
 std::string URI::Host() const
 {
 	std::string s(*m_uri.host());
+	s = network::detail::decode(s);
 	boost::trim(s);
 	if (s == "--")
 		return "";
@@ -94,6 +100,7 @@ std::string URI::Host() const
 unsigned short URI::Port() const
 {
 	std::string s(*m_uri.port());
+	s = network::detail::decode(s);
 	boost::trim(s);
 	if (s == "--")
 		return 0;
@@ -103,6 +110,7 @@ unsigned short URI::Port() const
 std::string URI::User() const
 {
 	std::string s(*m_uri.user_info());
+	s = network::detail::decode(s);
 	boost::trim(s);
 	if (s == "--")
 		return "";
@@ -115,6 +123,7 @@ std::string URI::User() const
 std::string URI::Pswd() const
 {
 	std::string s(*m_uri.user_info());
+	s = network::detail::decode(s);
 	boost::trim(s);
 	if (s == "--")
 		return "";

libpoolprotocols/PoolURI.cpp

@@ -1,9 +1,9 @@
 #pragma once
 
-#include <network/uri.hpp>
 #include <string>
+#include <network/uri.hpp>
 
-// A simple URI parser specifically for mining pool enpoints
+// A simple URI parser specifically for mining pool endpoints
 namespace dev
 {
 

libpoolprotocols/PoolURI.h

@@ -1,6 +1,3 @@
-#ifndef ETH_GETWORK_CLIENT_H_
-#define ETH_GETWORK_CLIENT_H_
-
 #pragma once
 
 #include <jsonrpccpp/client/connectors/httpclient.h>
@@ -38,6 +35,3 @@ class EthGetworkClient : public PoolClient, Worker
 	JsonrpcGetwork *p_client;
 	WorkPackage m_prevWorkPackage;
 };
-
-#endif
-

libpoolprotocols/getwork/EthGetworkClient.h

@@ -48,12 +48,6 @@ EthStratumClient::EthStratumClient(int const & worktimeout, string const & email
 
 	m_submit_hashrate = submitHashrate;
 	m_submit_hashrate_id = h256::random().hex();
-
-	// This timer is set to never expire. This is intentional since
-	// boost asio does not support events, this timer will
-	// serve an equivalent role when cancelled.
-	m_hashrate_event.expires_at(boost::posix_time::pos_infin);
-	m_hashrate_event.async_wait(boost::bind(&EthStratumClient::hashrate_event_handler, this, boost::asio::placeholders::error));
 }
 
 EthStratumClient::~EthStratumClient()
@@ -271,7 +265,7 @@ void EthStratumClient::connect_handler(const boost::system::error_code& ec, tcp:
 					cwarn << "* Root certs are either not installed or not found";
 					cwarn << "* Pool uses a self-signed certificate";
 					cwarn << "Possible fixes:";
-					cwarn << "* Make sure the file '/etc/ssl/certs/ca-certificates.crt' exists and is accessable";
+					cwarn << "* Make sure the file '/etc/ssl/certs/ca-certificates.crt' exists and is accessible";
 					cwarn << "* Export the correct path via 'export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt' to the correct file";
 					cwarn << "  On most systems you can install the 'ca-certificates' package";
 					cwarn << "  You can also get the latest file here: https://curl.haxx.se/docs/caextract.html";
@@ -599,9 +593,7 @@ void EthStratumClient::processReponse(Json::Value& responseObject)
 
 void EthStratumClient::hashrate_event_handler(const boost::system::error_code& ec)
 {
-	(void)ec;
-
-	if (!m_submit_hashrate || m_linkdown) {
+	if (ec || m_linkdown) {
 		return;
 	}
 
@@ -616,8 +608,6 @@ void EthStratumClient::hashrate_event_handler(const boost::system::error_code& e
 	else
 		async_write(*m_socket, m_requestBuffer,
 			boost::bind(&EthStratumClient::handleHashrateResponse, this, boost::asio::placeholders::error));
-	m_hashrate_event.expires_at(boost::posix_time::pos_infin);
-	m_hashrate_event.async_wait(boost::bind(&EthStratumClient::hashrate_event_handler, this, boost::asio::placeholders::error));
 }
 
 void EthStratumClient::work_timeout_handler(const boost::system::error_code& ec) {
@@ -635,11 +625,14 @@ void EthStratumClient::response_timeout_handler(const boost::system::error_code&
 }
 
 void EthStratumClient::submitHashrate(string const & rate) {
-	// Called by the pool manager thread.
-	// We cancel the timer that will serve as event
-	// to the stratum client.
+	if (!m_submit_hashrate || m_linkdown) {
+		return;
+	}
+
 	m_rate = rate;
 	m_hashrate_event.cancel();
+	m_hashrate_event.expires_from_now(boost::posix_time::milliseconds(100));
+	m_hashrate_event.async_wait(boost::bind(&EthStratumClient::hashrate_event_handler, this, boost::asio::placeholders::error));
 }
 
 void EthStratumClient::submitSolution(Solution solution) {