Merge branch 'MickdeGraaf-master'

Author: mining-visualizer

ethminer/FarmClient.h

@@ -45,7 +45,7 @@ class FarmClient : public jsonrpc::Client
 
 	// Constructor
 	FarmClient(
-		jsonrpc::IClientConnector &conn, 
+		jsonrpc::IClientConnector &conn,
 		OperationMode _opMode,
 		std::string _userAcct,
 		jsonrpc::clientVersion_t type = jsonrpc::JSONRPC_CLIENT_V2
@@ -96,8 +96,8 @@ class FarmClient : public jsonrpc::Client
 		_target = m_target;
 		_difficulty = m_difficulty;
 		_hashingAcct = m_hashingAcct;
-		LogF << "Trace: getWorkPool - challenge:" << toHex(_challenge).substr(0, 8) 
-			<< ", target:" << std::hex << std::setw(16) << std::setfill('0') << upper64OfHash(_target) 
+		LogF << "Trace: getWorkPool - challenge:" << toHex(_challenge).substr(0, 8)
+			<< ", target:" << std::hex << std::setw(16) << std::setfill('0') << upper64OfHash(_target)
 			<< ", difficulty:" << std::dec << _difficulty;
 	}
 
@@ -134,8 +134,8 @@ class FarmClient : public jsonrpc::Client
 	{
 		// challenge
 		Json::Value p;
-		p["from"] = m_userAcct;			
-		p["to"] = m_tokenContract;		
+		p["from"] = m_userAcct;
+		p["to"] = m_tokenContract;
 
 		h256 bMethod = sha3("getChallengeNumber()");
 		std::string sMethod = toHex(bMethod, dev::HexPrefix::Add);
@@ -166,7 +166,7 @@ class FarmClient : public jsonrpc::Client
 		if (result.isString())
 		{
 			_target = h256(result.asString());
-		} 
+		}
 		else
 			throw jsonrpc::JsonRpcException(jsonrpc::Errors::ERROR_CLIENT_INVALID_RESPONSE, result.toStyledString());
 
@@ -235,8 +235,8 @@ class FarmClient : public jsonrpc::Client
 		m_lastSolution.restart();
 		t.nonce = m_txNonce;
 		t.receiveAddress = toAddress(m_tokenContract);
-		t.gas = u256(200000);
 		ProgOpt::Reload();
+		t.gas = atoi(ProgOpt::Get("0xBitcoin", "GasLimit").c_str());
 		m_startGas = atoi(ProgOpt::Get("0xBitcoin", "GasPrice").c_str());
 		m_maxGas = atoi(ProgOpt::Get("0xBitcoin", "MaxGasPrice").c_str());
 		t.gasPrice = RecommendedGasPrice(_challenge);
@@ -272,7 +272,7 @@ class FarmClient : public jsonrpc::Client
 	}
 
 	// this routine runs on a separate thread
-	void txpoolScanner() 
+	void txpoolScanner()
 	{
 		Json::Value data;
 		Json::Value result;
@@ -363,7 +363,7 @@ class FarmClient : public jsonrpc::Client
 		}
 
 		// we've only got the hashes at this point,  so now retrieve each tx
-		for (uint32_t i = 0; i < result.size(); i++) 
+		for (uint32_t i = 0; i < result.size(); i++)
 		{
 			string hash = result[i].asString();
 			data.clear();
@@ -395,7 +395,7 @@ class FarmClient : public jsonrpc::Client
 								}
 							}
 						}
-						LogD << "Miner " << miner.account.substr(0, 10) << " submitted tx " << miner.txHash.substr(0, 10) 
+						LogD << "Miner " << miner.account.substr(0, 10) << " submitted tx " << miner.txHash.substr(0, 10)
 							<< ". gasPrice=" << miner.gasPrice << ", challenge=" << toHex(miner.challenge).substr(0, 8);
 						m_biddingMiners.push_back(miner);
 					}
@@ -427,8 +427,8 @@ class FarmClient : public jsonrpc::Client
 
 	uint64_t tokenBalance() {
 		Json::Value p;
-		p["from"] = m_userAcct;			
-		p["to"] = m_tokenContract;			
+		p["from"] = m_userAcct;
+		p["to"] = m_tokenContract;
 
 		h256 bMethod = sha3("balanceOf(address)");
 		std::string sMethod = toHex(bMethod, dev::HexPrefix::Add);
@@ -530,22 +530,22 @@ class FarmClient : public jsonrpc::Client
 			{
 				needsDeleting.push_back(t.challenge);
 				LogB << "Tx " << t.txHash.substr(0, 10) << " failed, gasPrice = " << t.gasPrice / 1000000000 << "  :(";
-			} 
+			}
 			else if (status == Waiting)
 			{
 				// adjust gas price if necessary
 				u256 recommended = RecommendedGasPrice(t.challenge);
 				if (t.gasPrice < recommended)
 				{
 					// increase gas price and resend
-					// but first make a copy of existing tx.  we can't be sure if the old one will get replaced 
+					// but first make a copy of existing tx.  we can't be sure if the old one will get replaced
 					// by the new one, before one or the other gets mined.
 					t.gasPrice = recommended;
 					txSignSend(t);
 					m_pendingTxs.push_back(t);
 					LogB << "Adjusting gas price to " << t.gasPrice / 1000000000 << ", new tx hash=" << t.txHash;
 				}
-			} 
+			}
 		}
 
 		for (auto challenge : needsDeleting)
@@ -566,7 +566,7 @@ class FarmClient : public jsonrpc::Client
 		ss = std::stringstream();
 		ss << "0x" << toHex(t.rlp());
 
-		// submit to the node 
+		// submit to the node
 		Json::Value p;
 		p.append(ss.str());
 		Json::Value result = CallMethod("eth_sendRawTransaction", p);
@@ -579,7 +579,7 @@ class FarmClient : public jsonrpc::Client
 		std::vector<byte> mix(84);
 		std::ostringstream ss;
 		Json::Value p;
-		p["from"] = _sender;        
+		p["from"] = _sender;
 		p["to"] = m_tokenContract;        // 0xbitcoin contract address
 
 		// function signature

tokenminer.ini

@@ -5,12 +5,12 @@
 [Node]
 
 ; If you are pool mining, set the Host and Port to that of your mining pool.
-; If you are solo mining, set the Host and Port to that of your node. You can 
+; If you are solo mining, set the Host and Port to that of your node. You can
 ; also set these with the -N command line paramater.  The command line overrides
 ; settings specified here
 ;
 ; Examples, POOL MINING:
-;    Host=http://your_mining_pool.com   
+;    Host=http://your_mining_pool.com
 ;    RPCPort=8586
 ; Examples, SOLO MINING:
 ;    Host=127.0.0.1
@@ -25,7 +25,7 @@ RPCPort=8586
 
 ; Secondary (failover) node/mining pool, if you have one. Default is disabled.
 
-; Host=http://your_failover_mining_pool.com   
+; Host=http://your_failover_mining_pool.com
 ; RPCPort=8586
 
 ;--------------------------------------------------------
@@ -37,14 +37,14 @@ RPCPort=8586
 ; 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 
+;   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
-;   txs at nearly the same time. 
+;   txs at nearly the same time.
 
 MinerAcct=0x........................................
 AcctPK=................................................................
 
-; Difficulty assignment.  Defaults to Pool assigned.  You can also 
+; Difficulty assignment.  Defaults to Pool assigned.  You can also
 ; specify a value in minutes to have the miner self-assign a difficulty
 ; level to target an average number of minutes per share.
 ; Currently, no mining pools support self-assigned difficulty.
@@ -55,7 +55,7 @@ TokenContract=0xb6ed7644c69416d67b522e20bc294a9a9b405b31
 
 ; THE REMAINING SETTINGS IN THIS SECTION APPLY ONLY TO SOLO MINING:
 
-; when your miner finds a solution, transactions will be submitted with this 
+; when your miner finds a solution, transactions will be submitted with this
 ; amount of gas (gwei).  You can change this setting 'on the fly' (without having
 ; to restart the miner).  All other setting changes require the miner to be restarted.
 GasPrice=5
@@ -70,6 +70,9 @@ GasPriceBidding=0
 ; max gas price you're willing to bid up to
 MaxGasPrice=35
 
+; gas limit used when submitting solution
+GasLimit=200000
+
 ; the # of gwei to top the highest bidder
 BidTop=2