Drop GetWork support, better Standard Benchmark

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

Author: Pttn

Makefile

@@ -4,7 +4,7 @@ LIBS   = -pthread -ljansson -lcurl -lgmp -lgmpxx -lcrypto
 
 all: rieMiner
 
-rieMiner: main.o miner.o stratumclient.o gbtclient.o gwclient.o client.o tools.o
+rieMiner: main.o miner.o stratumclient.o gbtclient.o client.o tools.o
 	$(CXX) $(CFLAGS) -o rieMiner $^ $(LIBS)
 
 main.o: main.cpp
@@ -19,9 +19,6 @@ stratumclient.o: stratumclient.cpp
 gbtclient.o: gbtclient.cpp
 	$(CXX) $(CFLAGS) -c -o gbtclient.o gbtclient.cpp $(LIBS)
 
-gwclient.o: gwclient.cpp
-	$(CXX) $(CFLAGS) -c -o gwclient.o gwclient.cpp $(LIBS)
-
 client.o: client.cpp
 	$(CXX) $(CFLAGS) -c -o client.o client.cpp $(LIBS)
 

README.md

@@ -1,17 +1,13 @@
-# rieMiner 0.9β1
+# rieMiner 0.9β1.5
 
 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).
 
-Solo mining is done using the GetWork or the GetBlockTemplate protocol, while pooled mining is via the Stratum protocol.
-
-A benchmark mode is also proposed to compare more easily the performance between different computers.
+Solo mining is done using the GetBlockTemplate protocol, while pooled mining is via the Stratum protocol. A benchmark mode is also proposed to compare more easily the performance between different computers.
 
 Official binaries will be distributed when the stable 0.9 code is out (which will not until Riecoin Core is officially updated).
 
 This README also serves as manual for rieMiner. I hope that this program will be useful for you! Happy mining!
 
-**Warning**: rieMiner 0.9β1 is the last version officially supporting the 0.10.2 wallet. It might work in future versions, but only the upcoming new Riecoin wallet will be tested for solo mining. GetWork support will also be removed.
-
 ![rieMiner just found a block](https://pttn.me/medias/bildoj/alia/rieMiner1.png)
 
 ## Compile this program
@@ -114,14 +110,15 @@ It is case sensitive, but spaces and invalid lines are ignored. If an option or
 * Port : port of the Riecoin wallet/server or pool. Default: 28332 (default port for Riecoin-Qt);
 * User : username used to connect in the server (rpcuser for solo mining). Includes the worker name (user.worker) if using Stratum. Default: nothing;
 * Pass : password used to connect in the server (rpcpassword for solo mining). Default: nothing;
-* Protocol : protocol to use: GetBlockTemplate or GetWork for solo mining, Stratum for pooled mining, Benchmark for testing. Default: Benchmark;
+* Protocol : protocol to use: GetBlockTemplate for solo mining, Stratum for pooled mining, Benchmark for testing. Default: Benchmark;
 * Address : custom payout address for solo mining (GetBlockTemplate only). Default: a donation address;
 * Threads : number of threads used for mining. Default: 8;
 * Sieve : size of the sieve table used for mining. Use a bigger number if you have more RAM, as you will obtain better results: this will usually reduce the ratio between the n-tuple and n+1-tuples counts. It can go up to 2^64 - 1, but setting this at more than a few billions will be too much and decrease performance. Default: 2^30;
 * Tuples : for solo mining, submit not only blocks (6-tuples) but also k-tuples of at least the given length. Its use will be explained later. Default: 6;
 * Refresh : refresh rate of the stats in seconds. 0 to disable them; will only notify when a k-tuple or share (k > 4) is found, or when the network finds a block. Default: 30;
 * TestDiff : only for Benchmark, sets the testing difficulty (must be from 265 to 32767). Default: 1600;
-* TestTime : only for Benchmark, sets the testing duration in s. Default: 21600 (6 hours).
+* TestTime : only for Benchmark, sets the testing duration in s. 0 for no time limit. Default: 0;
+* Test3t : only for Benchmark, stops testing after finding this number of 3-tuples. 0 for no limit. Default: 1000.
 
 You can finally run the newly created rieMiner executable using
 
@@ -151,7 +148,7 @@ These results were obtained with a Ryzen R7 2700X at 3.7 GHz, and you can use th
 
 For pooled mining, the number of primes "non consecutive tuples" are shown instead, and there is an estimation of how much RIC/day you are earning. If you want to compare the performance with fastrie, multiply the speeds by 4.096. The performance should be the same as fastrie's, as rieMiner uses the same algorithm.
 
-rieMiner will also notify if it found a k-tuple (k > 3) in solo mining or a share in pooled mining, and if the network found a new block. If it finds a block or a share, it will show the full submission and tell if it was accepted (solo mining only) or not. For solo mining, if the block was accepted, the reward will be generated and sent to a new random address which is included in your wallet (when using GetWork), or the one specified (for GetBlockTemplate). You can then spend it after 100 confirmations.
+rieMiner will also notify if it found a k-tuple (k > 3) in solo mining or a share in pooled mining, and if the network found a new block. If it finds a block or a share, it will tell if the submission was accepted (solo mining only) or not. For solo mining, if the block was accepted, the reward will be generated for the address specified in the options. You can then spend it after 100 confirmations.
 
 ## Solo mining specific information
 
@@ -238,24 +235,24 @@ To compare two different platforms, you must absolutely test with the same diffi
 * Standard Benchmark
   * Difficulty of 1600;
   * Sieve of 2^30 = 1073741824;
-  * Test during 6 hours;
+  * Stop after finding 1000 3-tuples or more;
   * The computer must not do anything else during testing;
-  * Imprecise for slow computers but more like the real mining conditions;
-  * The precision will be about 3 digits for the 2 and 3-tuples/s metrics, and 2 for the 4-tuples/s one, for computers finding at least 0.1 3-tuple/s;
-  * 5 and 6-tuples find rates should be discarded as they are too rare;
-  * 6 hours are needed to get a reproductible enough result, but you could also do execute the Standard Benchmark for a few minutes if you only want an order of magnitude of your computer speed.
+  * Very long for slow computers, but like the real mining conditions;
+  * The precision will be 2 solid digits for the 2-tuples/s metric, and almost 2 digits for the 3-tuples/s one (the 2nd will still vary a bit). That said, you can share your result with 3 significant digits for each;
+  * It would not be enough to even obtain just one solid digit for the 4-tuples/s metric, so 4, 5 and 6-tuples find rates should be discarded.
 
-If you do not want to test during 6 hours, or have a slow computer, other testing parameters are suggested:
+Testing a few times longer will not really improve the precision. You would need to find tens if not hundreds times more tuples to gain another significant digit for each metric, which would be really unpractical. In the other direction, if you have a slow computer or want a very fast test, you can reduce the difficulty to find tuples much faster with these parameters:
 
-* Simplified Benchmark
+* Easy Benchmark
   * Difficulty of 800;
   * Sieve of 2^27 = 134217728;
-  * Test during 30 minutes;
-  * The computer should not do anything else during testing, and must not do any other heavy tasks;
+  * Stop after finding 1000 3-tuples or more;
+  * The computer must not do anything else during testing;
   * Not adapted for powerful computers;
-  * The precision will be about 3 digits for the 2 and 3-tuples/s metrics, and 2 for the 4-tuples/s one, for computers finding at least 1 3-tuple/s;
-  * 5 and 6-tuples find rates should be discarded;
-  * Note that the results will be completely different to the ones provided by the standard benchmark.
+  * The precision will be similar to Standard Benchmark, but note that the results will be completely different to the ones provided by the standard benchmark;
+  * 4, 5 and 6-tuples find rates should also be discarded.
+
+In all cases, the system must not swap. Else, the result would not make much sense. Ensure that you have enough memory when trying to benchmark.
 
 ## Miscellaneous
 
@@ -285,6 +282,5 @@ Donations welcome:
 * [Get the Riecoin wallet](http://riecoin.org/download.html)
 * [Fast prime cluster search - or building a fast Riecoin miner (part 1)](https://da-data.blogspot.ch/2014/03/fast-prime-cluster-search-or-building.html), nice article by dave-andersen explaining how Riecoin works and how to build an efficient miner and the algorithms. Unfortunately, he never published part 2...
 * [Riecoin FAQ](http://riecoin.org/faq.html) and [technical aspects](http://riecoin.org/about.html#tech)
-* [Bitcoin Wiki - Getwork](https://en.bitcoin.it/wiki/Getwork)
 * [Bitcoin Wiki - Getblocktemplate](https://en.bitcoin.it/wiki/Getblocktemplate)
 * [Bitcoin Wiki - Stratum](https://en.bitcoin.it/wiki/Stratum_mining_protocol)

gwclient.cpp

@@ -3,7 +3,6 @@
 #include "main.h"
 #include "client.h"
 #include "miner.h"
-#include "gwclient.h"
 #include "gbtclient.h"
 #include "stratumclient.h"
 #include "tools.h"
@@ -30,12 +29,10 @@ WorkManager::WorkManager() {
 void WorkManager::init() {
 	_options.loadConf();
 	std::cout << "-----------------------------------------------------------" << std::endl;
-	if (_options.protocol() == "GetWork")
-		_client = std::unique_ptr<Client>(new GWClient(shared_from_this()));
+	if (_options.protocol() == "GetBlockTemplate")
+		_client = std::unique_ptr<Client>(new GBTClient(shared_from_this()));
 	else if (_options.protocol() == "Stratum")
 		_client = std::unique_ptr<Client>(new StratumClient(shared_from_this()));
-	else if (_options.protocol() == "GetBlockTemplate")
-		_client = std::unique_ptr<Client>(new GBTClient(shared_from_this()));
 	else _client = std::unique_ptr<Client>(new BMClient(shared_from_this()));
 
 	_miner = std::unique_ptr<Miner>(new Miner(shared_from_this()));
@@ -76,8 +73,13 @@ void WorkManager::manage() {
 		std::chrono::time_point<std::chrono::system_clock> timer;
 		while (true) {
 			if (_options.protocol() == "Benchmark" && _miningStarted) {
-				if (timeSince(_stats.miningStartTp()) > _options.testTime()) {
-					std::cout << _options.testTime() << " s elapsed, test finished. Version: " << minerVersionString << std::endl;
+				if (timeSince(_stats.miningStartTp()) > _options.testTime() && _options.testTime() != 0) {
+					std::cout << _options.testTime() << " s elapsed, test finished. " << minerVersionString << ", diff " << _options.testDiff() << ", sieve " << _options.sieve() << std::endl;
+					_stats.printTuplesStats();
+					_exit(0);
+				}
+				if (_stats.tuplesCount()[3] >= _options.test3t() && _options.test3t() != 0) {
+					std::cout << _options.test3t() << " 3-tuples found, test finished. Version: " << minerVersionString << ", difficulty " << _options.testDiff() << ", sieve " << _options.sieve() << std::endl;
 					_stats.printTuplesStats();
 					_exit(0);
 				}
@@ -190,7 +192,7 @@ void Options::loadConf() {
 					catch (...) {_refresh = 10;}
 				}
 				else if (key == "Protocol") {
-					if (value == "GetWork" || value == "GetBlockTemplate" || value == "Stratum" || value == "Benchmark") {
+					if (value == "GetBlockTemplate" || value == "Stratum" || value == "Benchmark") {
 						_protocol = value;
 					}
 					else std::cout << "Invalid Protocol" << std::endl;
@@ -206,7 +208,11 @@ void Options::loadConf() {
 				}
 				else if (key == "TestTime") {
 					try {_testTime = std::stoll(value);}
-					catch (...) {_testTime = 60;}
+					catch (...) {_testTime = 0;}
+				}
+				else if (key == "Test3t") {
+					try {_test3t = std::stoll(value);}
+					catch (...) {_test3t = 1000;}
 				}
 				else if (key == "Error")
 					std::cout << "Ignoring invalid line" << std::endl;
@@ -230,7 +236,8 @@ void Options::loadConf() {
 		std::cout << "Payout address = " << _address << std::endl;
 	else if (_protocol == "Benchmark") {
 		std::cout << "Test difficulty = " << _testDiff << std::endl;
-		std::cout << "Test duration   = " << _testTime << std::endl;
+		if (_testTime != 0) std::cout << "Will stop after " << _testTime << " s" << std::endl;
+		if (_test3t   != 0) std::cout << "Will stop after finding " << _test3t << " 3-tuples" << std::endl;
 	}
 	std::cout << "Threads = " << _threads << std::endl;
 	std::cout << "Sieve max = " << _sieve << std::endl;

gwclient.h

@@ -3,7 +3,7 @@
 #ifndef HEADER_GLOBAL_H
 #define HEADER_GLOBAL_H
 
-#define minerVersionString	"rieMiner 0.9-beta1"
+#define minerVersionString	"rieMiner 0.9-beta1.5"
 #define BITS	64
 
 #include <unistd.h>
@@ -82,6 +82,7 @@ class Stats {
 	uint32_t heightAtDiffChange() const {return _heightAtDiffChange;}
 
 	std::chrono::time_point<std::chrono::system_clock> miningStartTp() const {return _miningStartTp;}
+	std::array<uint32_t, 7> tuplesCount() const {return _tuples;}
 
 	void printTime() const {
 		double elapsedSecs(timeSince(_miningStartTp));
@@ -140,14 +141,13 @@ class Options {
 	std::string _host, _user, _pass, _protocol, _address;
 	uint8_t _tuples;
 	uint16_t _port, _threads;
-	uint32_t _refresh, _testDiff;
+	uint32_t _refresh, _testDiff, _testTime, _test3t;
 	uint64_t _sieve;
-	double _testTime;
 
 	void parseLine(std::string, std::string&, std::string&) const;
 
 	public:
-	Options() { // Default options: standard benchmark
+	Options() { // Default options: Standard Benchmark with 8 threads
 		_user     = "";
 		_pass     = "";
 		_host     = "127.0.0.1";
@@ -159,7 +159,8 @@ class Options {
 		_tuples   = 6;
 		_refresh  = 30;
 		_testDiff = 1600;
-		_testTime = 21600;
+		_testTime = 0;
+		_test3t   = 1000;
 	}
 
 	void loadConf();
@@ -176,6 +177,7 @@ class Options {
 	uint32_t refresh() const {return _refresh;}
 	uint32_t testDiff() const {return _testDiff;}
 	uint32_t testTime() const {return _testTime;}
+	uint32_t test3t() const {return _test3t;}
 };
 
 class WorkManager : public std::enable_shared_from_this<WorkManager> {

main.cpp

@@ -7,7 +7,6 @@
 #include <math.h>
 #include "main.h"
 #include "client.h"
-#include "gwclient.h"
 #include "tools.h"
 #include "tsqueue.hpp"
 

main.h

@@ -4,7 +4,8 @@ User     =
 Pass     = 
 Protocol = Benchmark
 TestDiff = 1600
-TestTime = 21600
+TestTime = 0
+Test3t   = 1000
 Threads  = 8
 Sieve    = 1073741824
 Tuples   = 6