[RPC][Mining] Extract last Hashspeed calculation

Author: CaveSpectre11

src/miner.cpp

@@ -843,6 +843,20 @@ CCriticalSection cs_nonce;
 static int32_t nNonce_base = 0;
 static arith_uint256 nHashes = 0;
 static int32_t nTimeStart = 0;
+static int32_t nTimeDuration = 0;
+
+double GetHashSpeed() {
+    LOCK(cs_nonce);
+    if (!nTimeDuration) return 0;
+    return arith_uint256(nHashes/nTimeDuration).getdouble();
+}
+
+void ClearHashSpeed() {
+    LOCK(cs_nonce);
+    nHashes = 0;
+    nTimeStart = 0;
+    nTimeDuration = 0;
+}
 
 void BitcoinMiner(std::shared_ptr<CReserveScript> coinbaseScript, bool fProofOfStake = false, bool fProofOfFullNode = false) {
     LogPrintf("Veil Miner started\n");
@@ -1001,12 +1015,16 @@ void BitcoinMiner(std::shared_ptr<CReserveScript> coinbaseScript, bool fProofOfS
                 return;
             }
 
-            LOCK(cs_nonce);
-            nHashes += nTries;
-            int32_t nTimeDuration = GetTime() - nTimeStart;
-            if (!nTimeDuration) nTimeDuration = 1;
-            LogPrint(BCLog::BLOCKCREATION, "%s: PoW Hashspeed %d kh/s\n", __func__,
-                     arith_uint256(nHashes/1000/nTimeDuration).getdouble());
+            double nHashSpeed = 0;
+            {
+                LOCK(cs_nonce);
+                nHashes += nTries;
+                nTimeDuration = GetTime() - nTimeStart;
+                if (!nTimeDuration) nTimeDuration = 1;
+                nHashSpeed = arith_uint256(nHashes/1000/nTimeDuration).getdouble();
+            }
+            LogPrint(BCLog::BLOCKCREATION, "%s: PoW Hashspeed %d kh/s\n", __func__, nHashSpeed);
+
             if (nTries == nInnerLoopCount) {
                 continue;
             }
@@ -1114,13 +1132,15 @@ void BitcoinRandomXMiner(std::shared_ptr<CReserveScript> coinbaseScript, int vm_
             }
         }
 
-        int32_t nTimeDuration = GetTime() - nTimeStart;
         double nHashSpeed = 0;
-        if (!nTimeDuration) nTimeDuration = 1;
         {
             LOCK(cs_nonce);
-            nHashes += nTries;
-            nHashSpeed = arith_uint256(nHashes/nTimeDuration).getdouble();
+            nTimeDuration = GetTime() - nTimeStart;
+            if (!nTimeDuration) nTimeDuration = 1;
+            {
+                nHashes += nTries;
+                nHashSpeed = arith_uint256(nHashes/nTimeDuration).getdouble();
+            }
         }
         LogPrint(BCLog::BLOCKCREATION, "%s: RandomX PoW Hashspeed %d hashes/s\n", __func__, nHashSpeed);
 

src/miner.h

@@ -49,6 +49,8 @@ static std::string GetMiningType(int nPoWType, bool fProofOfStake = false, bool
     return "Unknown";
 }
 
+double GetHashSpeed();
+void ClearHashSpeed();
 int GetMiningAlgorithm();
 bool SetMiningAlgorithm(const std::string& algo, bool fSet = true);
 

src/rpc/mining.cpp

@@ -349,6 +349,7 @@ static UniValue getmininginfo(const JSONRPCRequest& request)
             "  \"algorithm\": \"xxxx\",        (string) Algorithm set to mine (progpow, randomx, sha256d)\n"
             "  \"difficulty\": xxx.xxxxx    (numeric) The current difficulty\n"
             "  \"networkhashps\": nnn,      (numeric) The network hashes per second\n"
+            "  \"hashspeed\": nnn,          (numeric) The system hashes per second\n"
             "  \"pooledtx\": n              (numeric) The size of the mempool\n"
             "  \"chain\": \"xxxx\",           (string) current network name as defined in BIP70 (main, test, regtest)\n"
             "  \"warnings\": \"...\"          (string) any network and blockchain warnings\n"
@@ -379,6 +380,7 @@ static UniValue getmininginfo(const JSONRPCRequest& request)
     obj.pushKV("algorithm",        sMiningAlgo);
     obj.pushKV("difficulty",       (double)nDiff);
     obj.pushKV("networkhashps",    getnetworkhashps(request));
+    obj.pushKV("hashspeed",        GetHashSpeed());
     obj.pushKV("pooledtx",         (uint64_t)mempool.size());
     obj.pushKV("chain",            Params().NetworkIDString());
     obj.pushKV("warnings",         GetWarnings("statusbar"));
@@ -390,7 +392,7 @@ static UniValue setminingalgo(const JSONRPCRequest& request)
     if (request.fHelp || request.params.size() != 1)
         throw std::runtime_error(
             "setminingalgo algorithm\n"
-            "\nChanges your mining algorithm to [algorithm].  Note that mining must be turned off when command is used.\n"
+            "\nChanges your mining algorithm to [algorithm].  Note that mining must be turned off when command is used.  This will also have the side effect of clearing your mining statistics.\n"
             "\nArguments:\n"
             "1. algorithm   (string, required) Algorithm to mine [progpow, randomx, sha256d].\n"
             "\nResult:\n"
@@ -412,6 +414,7 @@ static UniValue setminingalgo(const JSONRPCRequest& request)
     if (!SetMiningAlgorithm(sNewAlgo)) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%s is not a supported mining type", sNewAlgo));
     }
+    ClearHashSpeed();
     UniValue result(UniValue::VOBJ);
     result.pushKV("success", true);
     result.pushKV("message", strprintf("Mining algorithm changed from %s to %s", sOldAlgo, sNewAlgo));