Added a configuration assistant, rieMiner.conf no longer provided

Signed-off-by: Pttn <28868425+Pttn@users.noreply.github.com>

Author: Pttn

README.md

@@ -1,4 +1,4 @@
-# rieMiner 0.9β1.5
+# rieMiner 0.9β2
 
 rieMiner is a Riecoin miner supporting both solo and pooled mining, and using the latest known mining algorithm. It was originally adapted and refactored from gatra's cpuminer-rminerd (https://github.com/gatra/cpuminer-rminerd) and dave-andersen's fastrie (https://github.com/dave-andersen/fastrie).
 
@@ -98,13 +98,15 @@ Then, follow the instructions for 64 bits systems. If you do not do this, the co
 
 ## Run this program
 
-First of all, open or create a file named "rieMiner.conf" next to the executable, in order to provide options to the miner. The rieMiner.conf syntax is very simple: each option is given by a line such
+If no "rieMiner.conf" next to the executable was found, you will be assisted to configure rieMiner. Answer to its questions to start mining. If there is a "rieMiner.conf" file next to the executable with incorrect information, you can delete this to get the assisted configuration.
+
+Alternatively, you can create or edit this "rieMiner.conf" file next to the executable, in order to provide options to the miner. The rieMiner.conf syntax is very simple: each option is given by a line such
 
 ```
 Option type = Option value
 ```
 
-It is case sensitive, but spaces and invalid lines are ignored. If an option or the file is missing, the default value(s) will be used. If there are duplicate lines, the last one will be used. The available options are:
+It is case sensitive, but spaces and invalid lines are ignored. **Do not put ; at the end or use other delimiters than =** for each line, and **do not confuse rieMiner.conf with riecoin.conf**! If an option or the file is missing, the default value(s) will be used. If there are duplicate lines, the last one will be used. The available options are:
 
 * Host : IP of the Riecoin wallet/server or pool. Default: 127.0.0.1 (your computer);
 * Port : port of the Riecoin wallet/server or pool. Default: 28332 (default port for Riecoin-Qt);
@@ -159,6 +161,7 @@ Note that other ways for solo mining (protocol proxies,...) were never tested wi
 To solo mine with the official Riecoin-Qt wallet, you have to configure it.
 
 * Find the riecoin.conf configuration file. It should be located in /home/username/.riecoin or equivalent in Windows;
+* **Do not confuse this file with the rieMiner.conf**!
 * An example of riecoin.conf content suitable for mining is
 
 ```

gbtclient.cpp

@@ -62,10 +62,10 @@ void GetBlockTemplateData::coinBaseGen() {
 	// Output Count [s + 4]
 	coinbase.push_back(1);
 	// Output Value [s + 5 -> s + 12]
-	uint64_t coinbasevalue2(coinbasevalue);
+	uint64_t reward(coinbasevalue);
 	for (uint32_t i(0) ; i < 8 ; i++) {
-		coinbase.push_back(coinbasevalue2 % 256);
-		coinbasevalue2 /= 256;
+		coinbase.push_back(reward % 256);
+		reward /= 256;
 	}
 	coinbase.push_back(25); // Output Length [s + 13]
 	coinbase.push_back(0x76); // OP_DUP [s + 14]

main.cpp

@@ -110,6 +110,7 @@ void WorkManager::manage() {
 					if (!_miningStarted && _client->workData().height != 0) {
 						_stats.startTimer();
 						_stats.updateHeight(_client->workData().height - 1);
+						std::cout << "-----------------------------------------------------------" << std::endl;
 						std::cout << "[0000:00:00] Started mining at block " << _client->workData().height << std::endl;
 						_miningStarted = true;
 					}
@@ -157,6 +158,125 @@ void Options::parseLine(std::string line, std::string& key, std::string& value)
 	}
 }
 
+void Options::askConf() {
+	std::string value;
+	std::ofstream file("rieMiner.conf");
+	if (file) {
+		std::cout << "Solo mining (solo), pooled mining (pool), or benchmarking (benchmark)? ";
+		std::cin >> value;
+		if (value == "solo") {
+			file << "Protocol = GetBlockTemplate" << std::endl;
+			_protocol = "GetBlockTemplate";
+		}
+		else if (value == "pool") {
+			file << "Protocol = Stratum" << std::endl;
+			_protocol = "Stratum";
+		}
+		else if (value == "benchmark") {
+			file << "Protocol = Benchmark" << std::endl;
+			_protocol = "Benchmark";
+		}
+		else {
+			std::cerr << "Invalid choice! Please answer solo, pool, or benchmark." << std::endl;
+			std::remove("rieMiner.conf");
+			exit(0);
+		}
+		
+		if (_protocol != "Benchmark") {
+			if (_protocol == "GetBlockTemplate") {
+				std::cout << "Riecoin Core (wallet) IP: ";
+				std::cin >> value;
+#ifndef _WIN32
+				struct sockaddr_in sa;
+				if (inet_pton(AF_INET, value.c_str(), &(sa.sin_addr)) != 1) {
+					std::cerr << "Invalid IP address!" << std::endl;
+					std::remove("rieMiner.conf");
+					exit(0);
+				}
+				else {
+					file << "Host = " << value << std::endl;
+					_host = value;
+				}
+#else
+				file << "Host = " << value << std::endl;
+				_host = value;
+#endif
+				std::cout << "RPC port: ";
+			}
+			else {
+				std::cout << "Current pools " << std::endl;
+				std::cout << "     XPoolX: mining.xpoolx.com:5000" << std::endl;
+				std::cout << "    riePool: riepool.ovh:8000" << std::endl;
+				std::cout << "   Block.it: mine.ublock.it:5000" << std::endl;
+				std::cout << "Pool address (without port): ";
+				std::cin >> value;
+				file << "Host = " << value << std::endl;
+				_host = value;
+				std::cout << "Pool port (example: 5000): ";
+			}
+			
+			std::cin >> value;
+			try {
+				_port = std::stoi(value);
+				file << "Port = " << value << std::endl;
+			}
+			catch (...) {
+				std::cerr << "Invalid port !" << std::endl;
+				std::remove("rieMiner.conf");
+				exit(0);
+			}
+			
+			if (_protocol == "GetBlockTemplate") std::cout << "RPC username: ";
+			else std::cout << "Pool username.worker: ";
+			
+			std::cin >> value;
+			file << "User = " << value << std::endl;
+			_user = value;
+			
+			if (_protocol == "GetBlockTemplate") std::cout << "RPC password: ";
+			else std::cout << "Worker password: ";
+			
+			std::cin >> value;
+			file << "Pass = " << value << std::endl;
+			_pass = value;
+			
+			if (_protocol == "GetBlockTemplate") {
+				uint8_t scriptPubKeyTest[20];
+				std::cout << "Payout address: ";
+				std::cin >> value;
+				if (!addrToScriptPubKey(value, scriptPubKeyTest)) {
+					std::cerr << "Invalid payout address!" << std::endl;
+					std::remove("rieMiner.conf");
+					exit(0);
+				}
+				else {
+					file << "Address = " << value << std::endl;
+					_address = value;
+				}
+			}
+		}
+		else std::cout << "Standard Benchmark values loaded. Edit the rieMiner.conf file if needed." << std::endl;
+		
+		std::cout << "Number of threads: ";
+		std::cin >> value;
+		try {
+			_threads = std::stoi(value);
+			file << "Threads = " << value << std::endl;
+		}
+		catch (...) {
+			std::cerr << "Invalid thread number!" << std::endl;
+			std::remove("rieMiner.conf");
+			exit(0);
+		}
+		
+		if (_protocol != "Benchmark") std::cout << "Thank you, happy mining :D !" << std::endl;
+		else std::cout << "Thank you :D !" << std::endl;
+		std::cout << "-----------------------------------------------------------" << std::endl;
+		file.close();
+	}
+	else std::cerr << "Unable to create rieMiner.conf :|, values for standard benchmark loaded." << std::endl;
+}
+
 void Options::loadConf() {
 	std::ifstream file("rieMiner.conf", std::ios::in);
 	std::cout << "Opening rieMiner.conf..." << std::endl;
@@ -222,8 +342,10 @@ void Options::loadConf() {
 		}
 		file.close();
 	}
-	else
-		std::cerr << "rieMiner.conf not found or unreadable, values for standard benchmark loaded." << std::endl;
+	else {
+		std::cerr << "rieMiner.conf not found or unreadable, please configure rieMiner now." << std::endl;
+		askConf();
+	}
 
 	std::cout << "Host = " << _host << std::endl;
 	std::cout << "Port = " << _port << std::endl;

main.h

@@ -3,7 +3,7 @@
 #ifndef HEADER_GLOBAL_H
 #define HEADER_GLOBAL_H
 
-#define minerVersionString	"rieMiner 0.9-beta1.5"
+#define minerVersionString	"rieMiner 0.9-beta2"
 #define BITS	64
 
 #include <unistd.h>
@@ -164,6 +164,7 @@ class Options {
 	}
 
 	void loadConf();
+	void askConf();
 
 	std::string host() const {return _host;}
 	uint16_t port() const {return _port;}

rieMiner.conf

@@ -3,7 +3,7 @@
 #include "main.h"
 #include "stratumclient.h"
 
-#define USER_AGENT "rieMiner/0.9b1"
+#define USER_AGENT "rieMiner/0.9b2"
 
 void StratumData::merkleRootGen() {
 	std::vector<uint8_t> coinbase;