tweaks for new release

Author: mining-visualizer

CMakeLists.txt

@@ -1,7 +1,7 @@
 # cmake global
 cmake_minimum_required(VERSION 2.8.12)
 
-set(PROJECT_VERSION "2.1.8")
+set(PROJECT_VERSION "2.1.9")
 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

@@ -5,25 +5,25 @@ This page describes the miner for **0xBitcoin**.  For the regular ethereum miner
 
 This is a fork of my MVis-ethminer program, which was a fork of Genoil's ethminer-0.9.41-genoil-1.x.x. 
 
-* This miner is specifically designed for AMD GPUs, but seems to work well with NVidia devices as well.
+* This miner should work with any GPU that supports OpenCL, ie. pretty much all AMDs and most NVidia.
 * Windows binaries can be downloaded from the  [Releases](https://github.com/mining-visualizer/MVis-tokenminer/releases) page, or you can build from source (see below).
-* For Linux, the only option at present is to build from source.  See the instructions below.
+* For Linux, the only option at present is to build from source.  See the instructions below.  (Note: there are currently a few compile errors you will have to deal with).
 * This miner supports both pool mining and solo mining. If you want to mine solo, you either need to run your own node, or use a public one like the ones Infura provides.
 * When in pool mining mode, a user configurable dev fee is in effect.  It defaults to 2%.  See the Donations section below for instructions to change this.
 
 
 ### Installation
 
 * Unzip the [download package](https://github.com/mining-visualizer/MVis-tokenminer/releases) anywhere you like.  
-* Move `tokenminer.ini` to `C:\Users\[USER]\AppData\Local\tokenminer` on Windows, or `$HOME/.config/tokenminer` on Linux.  If that folder path does not exist, you will need to create it manually.
-* Open up `tokenminer.ini` using any text editor.
+* Open up `tokenminer.ini` using any text editor and set the following configuration items:
 * For POOL MINING, the main thing you need to specify in the .INI file is your ETH account address to which rewards will be paid out. Look for the line that starts with `MinerAcct=`.  You can also specify the pool mining address in the `[Node]` section, or you can do that on the command line (-N).  See below for all command line options.
 * For SOLO MINING:
     * Input an ETH account and associated private key. (Sorry about making you enter it in plain text format. Make sure it is a 'throw away' account with only the bare minimum amount of money.)
     * You can specify the address and port of your node in the `.ini` file, or on the command line.
     * You can enable gas price bidding.  (see comments in the file).  Note that enabling this feature does not guarantee that you will win every bid.  Network latency will sometimes result in failed transactions, even if you 'out-bid' the other transaction.
-* Windows Only: download and install **both** the [VC 2013 Redistributable](https://www.microsoft.com/en-ca/download/details.aspx?id=40784) and the [VC 2015 Redistributable](https://www.microsoft.com/en-ca/download/details.aspx?id=48145)
-* Double-click on the file `list-devices.bat` that is located in the tokenminer folder of the download package.  Examine the screen output and verify your GPU's are recognized.  Pay special attention to the PlatformID.  If it is anything other than 0, you will need to edit the `start-mining.bat` file and change the `--opencl-platform <n>` argument.
+* You can leave the .INI file in the executable folder,  or you can move it to `C:\Users\[USER]\AppData\Local\tokenminer` on Windows, or `$HOME/.config/tokenminer` on Linux.  If that folder path does not exist, you will need to create it manually. If for some reason that file exists at both locations, the one in the executable folder will take precedence. 
+* WINDOWS ONLY: download and install **both** the [VC 2013 Redistributable](https://www.microsoft.com/en-ca/download/details.aspx?id=40784) and the [VC 2015 Redistributable](https://www.microsoft.com/en-ca/download/details.aspx?id=48145)
+* Double-click on the file `list-devices.bat`.  Examine the screen output and verify your GPU's are recognized.  Pay special attention to the PlatformID.  If it is anything other than 0, you will need to edit the `start-mining.bat` file and change the `--opencl-platform <n>` argument.
 * Start POOL MINING by double-clicking on `start-mining.bat`.
 * Start SOLO MINING with `tokenminer.exe -S -G`.  This assumes you've specified the node address in the .INI file.
 * **COOLING**: Please note that MVis-tokenminer does not have any features to set fan speeds or regulate cooling, other than shutting down if things get too hot.  Usually the AMD drivers do a pretty good job in that regard, but sometimes they don't.  It is your responsibility to monitor your fan speeds and GPU temperatures. If the AMD drivers aren't setting fan speeds high enough, you may need to use a 3rd part product,  like Speedfan or Afterburner.
@@ -64,9 +64,10 @@ Node configuration:
     --cl-extragpu-mem <n> Set the memory (in MB) you believe your GPU requires for stuff other than mining. default: 0
 
  Miscellaneous Options:
-    --config <FileSpec>  - Full path to an INI file containing program options. Windows default: %LocalAppData%/tokenminer/tokenminer.ini 
-                           Linux default: $HOME/.config/tokenminer/tokenminer.ini.  If this option is specified,  it must appear before 
-                           all others.
+    --config <FileSpec>  - Full path to an INI file containing program options. Default location is 1) the executable folder, or 
+                           if not there, then in 2) %LocalAppData%/tokenminer/tokenminer.ini (Windows) or 
+                           $HOME/.config/tokenminer/tokenminer.ini (Linux).  If this option is specified,  it must appear 
+                           before all others.
 
  General Options:
     -V,--version  Show the version and exit.

ethminer/MinerAux.h

@@ -415,6 +415,21 @@ class MinerCLI
 			LogS << "No miner type specfied.  Please include either -C (CPU mining) or -G (OpenCL mining) on the command line";
 			exit(-1);
 		}
+
+		// list devices
+		if (m_shouldListDevices)
+		{
+			if (m_minerType == MinerType::CL || m_minerType == MinerType::Mixed)
+				EthashGPUMiner::listDevices();
+#if ETH_ETHASHCUDA
+			if (m_minerType == MinerType::CUDA || m_minerType == MinerType::Mixed)
+				EthashCUDAMiner::listDevices();
+#endif
+			if (m_minerType == MinerType::CPU)
+				LogS << "--list-devices should be combined with GPU mining flag (-G for OpenCL or -U for CUDA)";
+			exit(0);
+		}
+
 		string mAcct = ProgOpt::Get("0xBitcoin", "MinerAcct");
 		LowerCase(mAcct);
 		u256 mAcctNum;
@@ -458,20 +473,6 @@ class MinerCLI
 		LogD << " ";
 		LogD << "--- Program Start ---";
 
-		// list devices
-		if (m_shouldListDevices)
-		{
-			if (m_minerType == MinerType::CL || m_minerType == MinerType::Mixed)
-				EthashGPUMiner::listDevices();
-#if ETH_ETHASHCUDA
-			if (m_minerType == MinerType::CUDA || m_minerType == MinerType::Mixed)
-				EthashCUDAMiner::listDevices();
-#endif
-			if (m_minerType == MinerType::CPU)
-				LogS << "--list-devices should be combined with GPU mining flag (-G for OpenCL or -U for CUDA)";
-			exit(0);
-		}
-
 		if (m_opMode == OperationMode::None)
 		{
 			LogS << "Operation mode not specfied.  Please include either -S (solo mining) or -P (pool mining) on the command line";
@@ -595,9 +596,10 @@ class MinerCLI
 			<< "    --cl-extragpu-mem <n> Set the memory (in MB) you believe your GPU requires for stuff other than mining. default: 0" << endl
 			<< endl
 			<< " Miscellaneous Options:" << endl
-			<< "    --config <FileSpec>  - Full path to an INI file containing program options. Windows default: %LocalAppData%/tokenminer/tokenminer.ini " << endl
-			<< "                           Linux default: $HOME/.config/tokenminer/tokenminer.ini.  If this option is specified,  it must appear before " << endl
-			<< "                           all others." << endl
+			<< "    --config <FileSpec>  - Full path to an INI file containing program options. Default location is 1) the executable folder, or " << endl
+			<< "                           if not there, then in 2) %LocalAppData%/tokenminer/tokenminer.ini (Windows) or " << endl
+			<< "                           $HOME/.config/tokenminer/tokenminer.ini (Linux).  If this option is specified,  it must appear " << endl
+			<< "                           before all others. " << endl
 			;
 	}	// streamHelp
 

libethcore/EthashGPUMiner.cpp

@@ -272,7 +272,7 @@ bool EthashGPUMiner::configureGPU(
 			)
 	)
 	{
-		LogB << "No GPU device with sufficient memory was found. Can't GPU mine. Remove the -G argument";
+		LogB << "No GPU device with sufficient memory was found. You may need to change the --opencl-platform argument to 1.";
 		return false;
 	}
 	return true;

release/build.bat

@@ -17,7 +17,7 @@ IF ERRORLEVEL 1 GOTO ERROR
 
 
 REM Copy tokenminer.ini and Readme file 
-copy "..\tokenminer.ini" stage
+copy "..\tokenminer.ini" stage\tokenminer
 copy "..\Readme.md" stage
 
 REM Copy binaries

tokenminer.ini

@@ -17,15 +17,16 @@
 ;    Host=https://mainnet.infura.io/your_api_key
 ;    RPCPort=8545
 
-Host=
-RPCPort=
+; Host=
+; RPCPort=
 
 ;--------------------------------------------------------
 [Node2]
 
 ; Secondary (failover) node/mining pool, if you have one. Default is disabled.
-;Host=http://your_failover_mining_pool.com   
-;RPCPort=8586
+
+; Host=http://your_failover_mining_pool.com   
+; RPCPort=8586
 
 ;--------------------------------------------------------
 [0xBitcoin]
@@ -45,7 +46,7 @@ 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=
+; MinutesPerShare=2
 
 ; The remaining settings in this section apply only to SOLO MINING: