Added "-r" switch to specify reward address in solo mining mode

firoorg · Sep 13, 2021 · f0fee99 · f0fee99
1 parent a24e8a1
commit f0fee99
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/firominer/main.cpp b/firominer/main.cpp
@@ -272,6 +272,9 @@ class MinerCLI
         vector<string> pools;
         app.add_option("-P,--pool", pools, "");
 
+        string rewardAddress;
+        app.add_option("-r,--reward-address", m_PoolSettings.rewardAddress, "");
+
         app.add_option("--failover-timeout", m_PoolSettings.poolFailoverTimeout, "", true)
             ->check(CLI::Range(0, 999));
 
@@ -370,6 +373,8 @@ class MinerCLI
         app.add_option("--tstop", m_FarmSettings.tempStop, "", true)->check(CLI::Range(30, 100));
         app.add_option("--tstart", m_FarmSettings.tempStart, "", true)->check(CLI::Range(30, 100));
 
+        // add reward address option 
+
 
         // Exception handling is held at higher level
         app.parse(argc, argv);

diff --git a/libpoolprotocols/PoolManager.cpp b/libpoolprotocols/PoolManager.cpp
@@ -407,7 +407,7 @@ void PoolManager::rotateConnect()
 
         if (m_Settings.connections.at(m_activeConnectionIdx)->Family() == ProtocolFamily::GETWORK)
             p_client = std::unique_ptr<PoolClient>(
-                new EthGetworkClient(m_Settings.noWorkTimeout, m_Settings.getWorkPollInterval));
+                new EthGetworkClient(m_Settings.noWorkTimeout, m_Settings.getWorkPollInterval, m_Settings.rewardAddress));
         if (m_Settings.connections.at(m_activeConnectionIdx)->Family() == ProtocolFamily::STRATUM)
             p_client = std::unique_ptr<PoolClient>(
                 new EthStratumClient(m_Settings.noWorkTimeout, m_Settings.noResponseTimeout));

diff --git a/libpoolprotocols/PoolManager.h b/libpoolprotocols/PoolManager.h
@@ -32,6 +32,7 @@ struct PoolSettings
     unsigned connectionMaxRetries = 9000;                         // Max number of connection retries
     unsigned benchmarkBlock = 0;  // Block number used by SimulateClient to test performances
     float benchmarkDiff = 1.0;    // Difficulty used by SimulateClient to test performances
+    std::string rewardAddress;    // Reward address in case of solo mining
 };
 
 class PoolManager

diff --git a/libpoolprotocols/getwork/EthGetworkClient.cpp b/libpoolprotocols/getwork/EthGetworkClient.cpp
@@ -11,7 +11,7 @@ using namespace eth;
 
 using boost::asio::ip::tcp;
 
-EthGetworkClient::EthGetworkClient(int worktimeout, unsigned farmRecheckPeriod)
+EthGetworkClient::EthGetworkClient(int worktimeout, unsigned farmRecheckPeriod, const std::string &rewardAddress)
   : PoolClient(),
     m_farmRecheckPeriod(farmRecheckPeriod),
     m_io_strand(g_io_service),
@@ -27,7 +27,12 @@ EthGetworkClient::EthGetworkClient(int worktimeout, unsigned farmRecheckPeriod)
     jGetWork["id"] = unsigned(1);
     jGetWork["jsonrpc"] = "2.0";
     jGetWork["method"] = "getblocktemplate";
-    jGetWork["params"] = Json::Value(Json::arrayValue);
+
+    Json::Value params = Json::Value(Json::arrayValue);
+    params.append(Json::Value(Json::objectValue));
+    params.append(rewardAddress);
+    jGetWork["params"] = params;
+
     m_jsonGetWork = std::string(Json::writeString(m_jSwBuilder, jGetWork));
 }
 

diff --git a/libpoolprotocols/getwork/EthGetworkClient.h b/libpoolprotocols/getwork/EthGetworkClient.h
@@ -19,7 +19,7 @@ using namespace eth;
 class EthGetworkClient : public PoolClient
 {
 public:
-    EthGetworkClient(int worktimeout, unsigned farmRecheckPeriod);
+    EthGetworkClient(int worktimeout, unsigned farmRecheckPeriod, const std::string &rewardAddress);
     ~EthGetworkClient();
 
     void connect() override;