miner auto-selects difficulty

Author: mining-visualizer

CMakeLists.txt

@@ -1,7 +1,7 @@
 # cmake global
 cmake_minimum_required(VERSION 2.8.12)
 
-set(PROJECT_VERSION "2.1.5")
+set(PROJECT_VERSION "2.1.6")
 if (${CMAKE_VERSION} VERSION_GREATER 3.0)
 	cmake_policy(SET CMP0042 OLD) 	# fix MACOSX_RPATH
 	cmake_policy(SET CMP0048 NEW) 	# allow VERSION argument in project()

README.md

@@ -75,8 +75,6 @@ Node configuration:
 #### INI File Settings
 
 ```
-
-
 [General]
 
 ;--------------------------------------------------------
@@ -109,9 +107,9 @@ RPCPort=
 [0xBitcoin]
 
 ; POOL MINING: Your ETH account, to which payouts will be made. THE PRIVATE
-;   KEY IS NOT REQUIRED.
-; SOLO MINING: Your ETH account and private key.  Note the acct starts with 0x, but
-;   not the PK.  Mining rewards will be deposited to this account.  Transaction
+;   KEY IS NOT REQUIRED.  Note the acct should start with 0x.
+; SOLO MINING: Your ETH account and private key.  Note the PK does NOT start
+;   with 0x.  Mining rewards will be deposited to this account.  Transaction
 ;   fees will be DRAWN from this account.  Make sure you have enough funds!!
 ;   If you have multiple mining rigs, make sure each rig is running under a 
 ;   separate ETH account, to prevent nonce collisions if they happen to submit
@@ -120,6 +118,10 @@ RPCPort=
 MinerAcct=0x........................................
 AcctPK=................................................................
 
+; Desired average minutes between shares.  Defaults to 2. Miner will
+; auto-adjust difficulty based on your hash rate. You can also specify
+; 'Pool' to use the difficulty assigned by your mining pool.
+MinutesPerShare=
 
 ; The remaining settings in this section apply only to SOLO MINING:
 
@@ -164,7 +166,6 @@ ThrottleTemp=80
 ; remain at or above ThrottleTemp.
 ShutDown=20
 
-
 ```
 
 ### Building on Windows

ethminer/FarmClient.h

@@ -75,7 +75,7 @@ class FarmClient : public jsonrpc::Client
 		data.append(userAcct);
 		result = CallMethod("getMinimumShareTarget", data);
 		m_target = u256(result.asString());
-
+		
 		if (s_lastFetch.elapsedSeconds() > 20 || m_hashingAcct == "")
 		{
 			// no reason to retrieve this stuff every time.
@@ -134,22 +134,14 @@ class FarmClient : public jsonrpc::Client
 
 	}
 
-	void submitWork(h256 _nonce, bytes _hash, bytes _challenge)
-	{
-		if (m_opMode == OperationMode::Solo)
-			submitWorkSolo(_nonce, _hash, _challenge);
-		else
-			submitWorkPool(_nonce, _hash, _challenge);
-	}
-
-	void submitWorkPool(h256 _nonce, bytes _hash, bytes _challenge)
+	void submitWorkPool(h256 _nonce, bytes _hash, bytes _challenge, uint64_t _difficulty)
 	{
 
 		Json::Value data;
 		data.append("0x" + _nonce.hex());
 		data.append(devFeeMining ? DonationAddress : userAcct);
 		data.append("0x" + toHex(_hash));
-		data.append(m_difficulty);
+		data.append(_difficulty);
 		data.append("0x" + toHex(_challenge));
 		Json::Value result = CallMethod("submitShare", data);
 		string res = result.asString();

ethminer/MinerAux.h

@@ -437,6 +437,22 @@ class MinerCLI
 			LogS << "Invalid 'MinerAcct' in tokenminer.ini";
 			exit(0);
 		}
+
+		string mps = ProgOpt::Get("0xBitcoin", "MinutesPerShare","2");
+		LowerCase(mps);
+		if (mps == "pool")
+			m_minutesPerShare = -1;
+		else
+		{
+			m_minutesPerShare = atoi(mps.c_str());
+			if (m_minutesPerShare < 1)
+			{
+				LogS << "Invalid 'MinutesPerShare' in tokenminer.ini. Defaulting to 2";
+				m_minutesPerShare = 2;
+			}
+		}
+
+
 		LogD << " ";
 		LogD << "--- Program Start ---";
 
@@ -712,6 +728,45 @@ class MinerCLI
 		}
 	}
 
+	h256 targetFromDiff(uint64_t _difficulty)
+	{
+		// 2^234
+		u256 pow_2_234 = u256("0x040000000000000000000000000000000000000000000000000000000000");
+		return pow_2_234 / _difficulty;
+	}
+
+	uint64_t diffFromTarget(h256 _target)
+	{
+		// 2^234
+		u256 pow_2_234 = u256("0x040000000000000000000000000000000000000000000000000000000000");
+		u256 t = pow_2_234 / u256(_target);
+		return static_cast<uint64_t>(t);
+	}
+
+	void calcFinalTarget(GenericFarm<EthashProofOfWork>& f, h256& _target, uint64_t& _difficulty)
+	{
+		static float s_lastRate = 0;
+
+		float currentRate;
+
+		// if we're going by the pool difficulty, do nothing
+		if (m_minutesPerShare == -1) return;
+
+		currentRate = f.hashRates().farmRate();
+		if (s_lastRate == 0 || currentRate == 0)
+			currentRate = f.minerCount() * 500;	// assume 500 MH/s per gpu
+
+		// only recalculate if change is > 10%
+		if (abs(s_lastRate - currentRate) / s_lastRate > 0.1)
+			s_lastRate = currentRate;
+
+		double divisor = s_lastRate * 1000000.0 * m_minutesPerShare * 60;
+		uint64_t target64 = (divisor == 0) ? 0 : ~uint64_t(0) / divisor;
+		u256 target256 = target64;
+		_target = target256 << 192;
+		_difficulty = diffFromTarget(_target);
+	}
+
 
 	/*-----------------------------------------------------------------------------------
 	* doFarm
@@ -825,6 +880,8 @@ class MinerCLI
 							workRPC.getWorkSolo(_challenge, _target);
 						lastGetWork.restart();
 
+						calcFinalTarget(f, _target, difficulty);
+
 						if (!connectedToNode)
 						{
 							connectedToNode = true;
@@ -894,10 +951,15 @@ class MinerCLI
 				keccak256_0xBitcoin(challenge, sender, solution, hash);
 				if (h256(hash) < target) {
 					if (m_opMode == OperationMode::Pool)
+					{
 						LogS << "Solution found; Submitting to pool" << ((nextDevFeeSwitch >= 0) ? "" : " on the dev account");
+						workRPC.submitWorkPool(solution, hash, challenge, difficulty);
+					}
 					else
+					{
 						LogB << "Solution found; Submitting to node";
-					workRPC.submitWork(solution, hash, challenge);
+						workRPC.submitWorkSolo(solution, hash, challenge);
+					}
 					f.solutionFound(SolutionState::Accepted, false, solutionMiner);
 				} else {
 					LogB << "Solution found, but invalid.  Possibly stale.";
@@ -975,6 +1037,7 @@ class MinerCLI
 	/// Mining options
 	MinerType m_minerType = MinerType::Undefined;
 	OperationMode m_opMode = OperationMode::None;
+	int m_minutesPerShare = 2;	  // set to -1 to use pool difficulty
 	unsigned m_openclPlatform = 0;
 	unsigned m_openclDevice = 0;
 	unsigned m_miningThreads = UINT_MAX;

libethcore/Farm.h

@@ -200,7 +200,9 @@ class GenericFarm
 	*----------------------------------------------------------------------------------*/
 	void setWork_token(bytes _challenge, h256 _target)
 	{
-		LogF << "Trace: GenericFarm::setWork, challenge=" << toHex(_challenge).substr(0, 8);
+		
+		LogF << "Trace: GenericFarm::setWork, challenge=" << toHex(_challenge).substr(0, 8)
+			<< ", target=" << std::hex << std::setw(16) << std::setfill('0') << upper64OfHash(_target);
 		if (m_onSetWork)
 			m_onSetWork(upper64OfHash(_target));
 

tokenminer.ini

@@ -31,9 +31,9 @@ RPCPort=
 [0xBitcoin]
 
 ; POOL MINING: Your ETH account, to which payouts will be made. THE PRIVATE
-;   KEY IS NOT REQUIRED.
-; SOLO MINING: Your ETH account and private key.  Note the acct starts with 0x, but
-;   not the PK.  Mining rewards will be deposited to this account.  Transaction
+;   KEY IS NOT REQUIRED.  Note the acct should start with 0x.
+; SOLO MINING: Your ETH account and private key.  Note the PK does NOT start
+;   with 0x.  Mining rewards will be deposited to this account.  Transaction
 ;   fees will be DRAWN from this account.  Make sure you have enough funds!!
 ;   If you have multiple mining rigs, make sure each rig is running under a 
 ;   separate ETH account, to prevent nonce collisions if they happen to submit
@@ -42,6 +42,10 @@ RPCPort=
 MinerAcct=0x........................................
 AcctPK=................................................................
 
+; Desired average minutes between shares.  Defaults to 2. Miner will
+; auto-adjust difficulty based on your hash rate. You can also specify
+; 'Pool' to use the difficulty assigned by your mining pool.
+MinutesPerShare=
 
 ; The remaining settings in this section apply only to SOLO MINING: