fixed hash rate reporting error when more than one miner

Author: mining-visualizer

ethminer/FarmClient.h

@@ -112,7 +112,7 @@ class FarmClient : public jsonrpc::Client
 						tx = CallMethod("eth_getTransactionReceipt", data);
 						if (!tx.isNull())
 						{
-							string bidStatus = tx["status"].asString() == "0x1" ? " WON" : (tx["status"].asString() == "0x0" ? " LOST" : " ???");
+							string bidStatus = tx["status"].asString() == "0x1" ? " won" : (tx["status"].asString() == "0x0" ? " lost" : " ???");
 							LogD << "Miner " << miner.account.substr(0, 10) << bidStatus << ", block: "
 								<< HexToInt(tx["blockNumber"].asString()) << ", tx=" << miner.txHash.substr(0, 10);
 							m_biddingMiners.erase(m_biddingMiners.begin() + i);
@@ -233,12 +233,17 @@ class FarmClient : public jsonrpc::Client
 		data.append(p);
 		data.append("latest");
 
-		Json::Value result = CallMethod("eth_call", data);
-		u256 balance = u256(result.asString()) / 100000000;
-		if (result.isString()) {
+		try
+		{
+			Json::Value result = CallMethod("eth_call", data);
+			u256 balance = u256(result.asString()) / 100000000;
 			return static_cast<uint64_t>(balance);
-		} else
-			throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
+		}
+		catch (std::exception& e)
+		{
+			LogB << "Error in routine tokenBalance: " << e.what();
+			return 0;
+		}
 	}
 
 	Json::Value eth_getWork() throw (jsonrpc::JsonRpcException) {

ethminer/MinerAux.h

@@ -760,6 +760,7 @@ class MinerCLI
 		unsigned farmRetries = 0;
 		int maxRetries = failOverAvailable() ? m_maxFarmRetries : c_StopWorkAt;
 		bool connectedToNode = false;
+		string gasPriceBidding = ProgOpt::Get("0xBitcoin", "GasPriceBidding", "0");
 
 		LogS << "Connecting to node at " << _nodeURL + ":" + _rpcPort << " ...";
 		jsonrpc::HttpClient client(_nodeURL + ":" + _rpcPort);
@@ -843,6 +844,10 @@ class MinerCLI
 									recentChallenges.pop_back();
 								challenge = _challenge;
 								target = _target;
+
+								//target = h256(0x0000000080000000);	// easy target for testing
+								//target = (u256) target << 192;
+
 								LogB << "New challenge : " << toHex(_challenge).substr(0, 8);
 								f.setWork_token(challenge, target);
 								rpc.setChallenge(challenge);
@@ -854,7 +859,8 @@ class MinerCLI
 					if (lastCheckTx.elapsedMilliseconds() > 1000)
 					{
 						rpc.checkPendingTransactions();
-						rpc.txpoolScanner();
+						if (gasPriceBidding == "1")
+							rpc.txpoolScanner();
 						lastCheckTx.restart();
 					}
 

libethash-cl/ethash_cl_miner.cpp

@@ -239,8 +239,8 @@ bool ethash_cl_miner::configureGPU(
 			_device.getInfo(CL_DEVICE_GLOBAL_MEM_SIZE, &result);
 			if (result >= requiredSize)
 			{
-				std::string s = string(_device.getInfo<CL_DEVICE_NAME>().c_str());
-				LogS << "Found suitable OpenCL device [" << s << "] with " << result << " bytes of GPU memory";
+				//std::string s = string(_device.getInfo<CL_DEVICE_NAME>().c_str());
+				//LogS << "Found suitable OpenCL device [" << s << "] with " << result << " bytes of GPU memory";
 				return true;
 			}
 

libethcore/EthashGPUMiner.cpp

@@ -186,11 +186,8 @@ void EthashGPUMiner::workLoop()
 		uint64_t startN = 0;
 		if (w.exSizeBits >= 0)
 			startN = w.startNonce | ((uint64_t)index() << (64 - 4 - w.exSizeBits)); // this can support up to 16 devices
-		uint64_t threshold = upper64OfHash(target);
 
-		//threshold = 0x0000000080000000;	// about right
-		//threshold = 0x0000040000000000;	// ETC
-		//m_miner->testHashes();
+		uint64_t threshold = upper64OfHash(target);
 
 		m_miner->search(challenge, threshold, *m_hook);
 	}

libethcore/Miner.h

@@ -468,32 +468,30 @@ template <class PoW> class GenericMiner
 	*/
 	void accumulateHashes(unsigned _n, int _batchCount)
 	{
-		static Timer s_timer;
-		static uint64_t s_hashCount = 0;
 
 		if (_batchCount < 2)
 		{
 			// we ignore the first few batches.  when cl_miner.search() starts out, after a new
 			// work package has arrived, it experiences an extra delay because it has to wait for 
 			// the last kernel run from the previous work package to finish.
-			s_hashCount = 0;
-			s_timer.restart();
+			m_hashCount = 0;
+			m_hashTimer.restart();
 			return;
 		}
-		s_hashCount += _n;
-		uint64_t elapsed = s_timer.elapsedMicroseconds();
+		m_hashCount += _n;
+		uint64_t elapsed = m_hashTimer.elapsedMicroseconds();
 		// we'll accumulate hashes for awhile and then update our exponential moving average.
 		if (elapsed / 1000 > 700)
 		{
-			double batchRate = (double) s_hashCount / elapsed;
+			double batchRate = (double) m_hashCount / elapsed;
 			m_hashRate.newVal(batchRate);
-			s_hashCount = 0;
-			s_timer.restart();
+			m_hashCount = 0;
+			m_hashTimer.restart();
 			LogF << "accumulateHashes.update: batch rate = " << batchRate << ", hash rate = " << m_hashRate.value();
 		}
 		else
 		{
-			LogF << "accumulateHashes.accumulate: hashes = " << s_hashCount << ", time = " << elapsed / 1000;
+			LogF << "accumulateHashes.accumulate: hashes = " << m_hashCount << ", time = " << elapsed / 1000;
 		}
 	}	// accumulateHashes
 
@@ -573,6 +571,8 @@ template <class PoW> class GenericMiner
 
 private:
 
+	uint64_t m_hashCount = 0;
+	Timer m_hashTimer;
 	mutable SharedMutex x_hashRates;
 	EMA m_hashRate = EMA(4);
 	// start time of hash rate accumulation period