From 36d8ef6b7b1e0da771c475c7ad2ab7fab60bcb2e Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Sat, 2 Jun 2018 23:01:58 -0700 Subject: [PATCH 1/2] Fix "setgenerate true 0" to properly stake --- src/rpcmining.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index c9bbd967d..f475a4258 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -32,7 +32,7 @@ using namespace std; -extern int32_t ASSETCHAINS_ALGO, ASSETCHAINS_EQUIHASH; +extern int32_t ASSETCHAINS_ALGO, ASSETCHAINS_EQUIHASH, ASSETCHAINS_LWMAPOS; /** * Return average network hashes per second based on the last 'lookup' blocks, @@ -320,7 +320,7 @@ UniValue setgenerate(const UniValue& params, bool fHelp) if (params.size() > 1) { nGenProcLimit = params[1].get_int(); - if (nGenProcLimit == 0) + if (ASSETCHAINS_LWMAPOS == 0 && nGenProcLimit == 0) fGenerate = false; } From cf98848cd4dc24436493a8a1f37919945df780b2 Mon Sep 17 00:00:00 2001 From: Michael Toutonghi Date: Sun, 3 Jun 2018 09:19:41 -0700 Subject: [PATCH 2/2] return 0 for hash rate rather than stale value when not generating --- src/rpcmining.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index f475a4258..d80996b8b 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -375,12 +375,12 @@ UniValue getmininginfo(const UniValue& params, bool fHelp) obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); if (ASSETCHAINS_ALGO == ASSETCHAINS_EQUIHASH) { - obj.push_back(Pair("localsolps" , getlocalsolps(params, false))); - obj.push_back(Pair("networksolps", getnetworksolps(params, false))); + 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("localhashps" , GetBoolArg("-gen", false) ? getlocalsolps(params, false) : (double)0.0)); } obj.push_back(Pair("networkhashps", getnetworksolps(params, false))); obj.push_back(Pair("pooledtx", (uint64_t)mempool.size()));