disable dev fee in solo mining mode

mining-visualizer · Jun 15, 2018 · 915b78b · 915b78b
1 parent 683cddf
commit 915b78b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h
@@ -799,14 +799,22 @@ class MinerCLI
 	{
 		#define FEEBLOCKTIME 4 * 60 * 60		// devFee switching is done in 4 hour blocks
 
-		string sDevPercent = ProgOpt::Get("General", "DevFee", "1.0");
 		float nDevPercent;
-		if (!isNumeric(sDevPercent))
-			nDevPercent = 1.0;
+
+		if (m_opMode != OperationMode::Pool)
+		{
+			nDevPercent = 0.0;
+		}
 		else
 		{
-			nDevPercent = std::stod(sDevPercent);
-			nDevPercent = nDevPercent < 1.0 ? 1.0 : nDevPercent;
+			string sDevPercent = ProgOpt::Get("General", "DevFee", "1.0");
+			if (!isNumeric(sDevPercent))
+				nDevPercent = 1.0;
+			else
+			{
+				nDevPercent = std::stod(sDevPercent);
+				nDevPercent = nDevPercent < 1.0 ? 1.0 : nDevPercent;
+			}
 		}
 
 		_devFeeTime = nDevPercent / 100.0 * FEEBLOCKTIME;

diff --git a/libethash-cl/ethash_cl_miner.cpp b/libethash-cl/ethash_cl_miner.cpp
@@ -640,6 +640,7 @@ bool ethash_cl_miner::init(unsigned _platformId, unsigned _deviceId)
 		string platformName = string(platforms[_platformId].getInfo<CL_PLATFORM_NAME>().c_str());
 
 		int platformId = OPENCL_PLATFORM_UNKNOWN;
+
 		if (platformName == "NVIDIA CUDA")
 		{
 			platformId = OPENCL_PLATFORM_NVIDIA;