Support Proxy Connections.

Requested Feature, though I don't use Proxies myself so untested...
But I don't see why it would not work...

Also remove Http Prefix for GetBlockTemplate so something else could be used... Omitting it will fallback to Http so it should not affect existing Configuration Files.

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

Author: Pttn

Client.hpp

@@ -72,7 +72,7 @@ class NetworkedClient : public Client {
 class GBTClient : public NetworkedClient {
 	// Options
 	const std::vector<std::string> _rules;
-	const std::string _host, _url, _cookie;
+	const std::string _host, _url, _proxy, _cookie;
 	std::string _credentials;
 	const std::vector<uint8_t> _scriptPubKey;
 	// Client State Variables
@@ -103,7 +103,8 @@ class GBTClient : public NetworkedClient {
 	GBTClient(const Options &options) :
 		_rules(options.rules),
 		_host(options.host),
-		_url("http://" + options.host + ":" + std::to_string(options.port) + "/"),
+		_url(options.host + ":" + std::to_string(options.port)),
+		_proxy(options.proxy),
 		_cookie(options.cookie),
 		_credentials(options.username + ":" + options.password),
 		_scriptPubKey(bech32ToScriptPubKey(options.payoutAddress)),
@@ -121,7 +122,7 @@ class GBTClient : public NetworkedClient {
 // Client for the Stratum protocol (pooled mining), working for the current Riecoin pools
 class StratumClient : public NetworkedClient {
 	// Options
-	const std::string _username, _password, _host;
+	const std::string _username, _password, _host, _proxy;
 	const uint16_t _port;
 	// Client State Variables
 	CURL *_curl;
@@ -152,7 +153,7 @@ class StratumClient : public NetworkedClient {
 
 	void _processMessage(const std::string&); // Processes a message received from the pool
 public:
-	StratumClient(const Options &options) : _username(options.username), _password(options.password), _host(options.host), _port(options.port), _curl(curl_easy_init()) {}
+	StratumClient(const Options &options) : _username(options.username), _password(options.password), _host(options.host), _proxy(options.proxy), _port(options.port), _curl(curl_easy_init()) {}
 	void connect(); // Also sends mining.subscribe
 	void process(); // Get messages from the server and calls _processMessage to handle them
 	std::optional<ClientInfo> info() const;

GBTClient.cpp

@@ -118,6 +118,8 @@ nlohmann::json GBTClient::_sendRequestToWallet(const std::string &method, const
 		const nlohmann::json request{{"jsonrpc", "2.0"}, {"method", method}, {"params", params}, {"id", id++}};
 		const std::string requestStr(request.dump());
 		curl_easy_setopt(_curl, CURLOPT_URL, _url.c_str());
+		if (_proxy != "")
+			curl_easy_setopt(_curl, CURLOPT_PROXY, _proxy.c_str());
 		curl_easy_setopt(_curl, CURLOPT_POSTFIELDSIZE, requestStr.size());
 		curl_easy_setopt(_curl, CURLOPT_POSTFIELDS, requestStr.c_str());
 		curl_easy_setopt(_curl, CURLOPT_WRITEFUNCTION, curlWriteCallback);

README.md

@@ -199,8 +199,9 @@ rieMiner proposes the following Modes depending on what you want to do. Use the
 
 ### Solo and Pooled Mining options
 
-* `Host`: IP of the Riecoin server. Default: 127.0.0.1 (your computer);
+* `Host`: URL of the Riecoin server. Default: 127.0.0.1 (your computer);
 * `Port`: port of the Riecoin server (same as rpcport in riecoin.conf for solo mining). Default: 28332 (default RPC port for Riecoin Core);
+* `Proxy`: URL of a Proxy (can be suffixed by the port, example `socks5://example.com:1080` - see [Curl Documentation](https://curl.se/libcurl/c/CURLOPT_PROXY.html)), optional. Default: none;
 * `Username`: username used to connect to the server (same as rpcuser in riecoin.conf for solo mining). Default: empty;
 * `Password`: password used to connect to the server (same as rpcpassword in riecoin.conf for solo mining). Default: empty;
 * `Cookie`: for solo mining, cookie file containing the credentials, overriding `Username` and `Password`. Default: empty/none;

StratumClient.cpp

@@ -248,6 +248,8 @@ void StratumClient::connect() {
 			return;
 		}
 		curl_easy_setopt(_curl, CURLOPT_URL, (_host + ":" + std::to_string(_port) + "/").c_str());
+		if (_proxy != "")
+			curl_easy_setopt(_curl, CURLOPT_PROXY, _proxy.c_str());
 		curl_easy_setopt(_curl, CURLOPT_CONNECT_ONLY, 1L);
 		CURLcode cc(curl_easy_perform(_curl));
 		if (cc != CURLE_OK) {

main.cpp

@@ -105,6 +105,7 @@ bool Configuration::parse(const int argc, char** argv, std::string &parsingMessa
 			try {_options.port = std::stoi(value);}
 			catch (...) {_options.port = 28332;}
 		}
+		else if (key == "Proxy") _options.proxy = value;
 		else if (key == "Username") _options.username = value;
 		else if (key == "Password") _options.password = value;
 		else if (key == "Cookie") _options.cookie = value;
@@ -343,6 +344,8 @@ int main(int argc, char** argv) {
 		else
 			logger.log("Pooled mining"s);
 		logger.log(" via host "s + configuration.options().host + ", port "s + std::to_string(configuration.options().port) + "\n"s);
+		if (configuration.options().proxy != "")
+			logger.log("Using Proxy: "s + configuration.options().proxy + "\n"s);
 		if (configuration.options().mode == "Solo" && configuration.options().cookie != "")
 			logger.log("Cookie: "s + configuration.options().cookie + "\n"s);
 		else {

main.hpp

@@ -38,7 +38,7 @@ extern std::string confPath;
 struct Options {
 	Stella::Configuration stellaConfig;
 	uint16_t tupleLengthMin{0U};
-	std::string host{"127.0.0.1"}, username{""}, password{""}, cookie{""}, mode{"Benchmark"}, payoutAddress{"ric1pstellap55ue6keg3ta2qwlxr0h58g66fd7y4ea78hzkj3r4lstrsk4clvn"}, tuplesFile{"Tuples.txt"};
+	std::string host{"127.0.0.1"}, proxy{""}, username{""}, password{""}, cookie{""}, mode{"Benchmark"}, payoutAddress{"ric1pstellap55ue6keg3ta2qwlxr0h58g66fd7y4ea78hzkj3r4lstrsk4clvn"}, tuplesFile{"Tuples.txt"};
 	uint64_t filePrimeTableLimit{0ULL};
 	uint16_t port{28332U};
 	double refreshInterval{30.}, difficulty{1024.}, benchmarkBlockInterval{150.}, benchmarkTimeLimit{960.};