From 44e17ab3ed44474eddcbba3767a72b909e0bad1d Mon Sep 17 00:00:00 2001 From: miketout Date: Sat, 28 Apr 2018 20:20:21 -0700 Subject: [PATCH] Fixed overflow on localsolps and changed sol to hash on mining info --- src/metrics.h | 2 +- src/rpcmining.cpp | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/metrics.h b/src/metrics.h index 2d60d30ca..65d88ce84 100644 --- a/src/metrics.h +++ b/src/metrics.h @@ -21,7 +21,7 @@ struct AtomicCounter { --value; } - int get() const { + uint64_t get() const { return value.load(); } }; diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index f2fdc1415..852a1b689 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -32,6 +32,8 @@ using namespace std; +extern int32_t ASSETCHAINS_ALGO, ASSETCHAINS_EQUIHASH; + /** * Return average network hashes per second based on the last 'lookup' blocks, * or over the difficulty averaging window if 'lookup' is nonpositive. @@ -366,8 +368,15 @@ UniValue getmininginfo(const UniValue& params, bool fHelp) obj.push_back(Pair("difficulty", (double)GetNetworkDifficulty())); obj.push_back(Pair("errors", GetWarnings("statusbar"))); obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); - obj.push_back(Pair("localsolps" , getlocalsolps(params, false))); - obj.push_back(Pair("networksolps", getnetworksolps(params, false))); + if (ASSETCHAINS_ALGO == ASSETCHAINS_EQUIHASH) + { + obj.push_back(Pair("localsolps" , getlocalsolps(params, false))); + obj.push_back(Pair("networksolps", getnetworksolps(params, false))); + } + else + { + obj.push_back(Pair("localhashps" , getlocalsolps(params, false))); + } obj.push_back(Pair("networkhashps", getnetworksolps(params, false))); obj.push_back(Pair("pooledtx", (uint64_t)mempool.size())); obj.push_back(Pair("testnet", Params().TestnetToBeDeprecatedFieldRPC()));