DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
Asher Dawes
2018-06-03 12:15:25 -07:00
parent f948fb8b3e cf98848cd4
commit 9f66917629
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpcmining.cpp
View File

@@ -32,7 +32,7 @@
using namespace std; 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, * 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) if (params.size() > 1)
{ {
nGenProcLimit = params[1].get_int(); nGenProcLimit = params[1].get_int();
if (nGenProcLimit == 0) if (ASSETCHAINS_LWMAPOS == 0 && nGenProcLimit == 0)
fGenerate = false; fGenerate = false;
} }
@@ -375,12 +375,12 @@ UniValue getmininginfo(const UniValue& params, bool fHelp)
obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1)));
if (ASSETCHAINS_ALGO == ASSETCHAINS_EQUIHASH) if (ASSETCHAINS_ALGO == ASSETCHAINS_EQUIHASH)
{ {
obj.push_back(Pair("localsolps" , getlocalsolps(params, false))); obj.push_back(Pair("localsolps" , getlocalsolps(params, false)));
obj.push_back(Pair("networksolps", getnetworksolps(params, false))); obj.push_back(Pair("networksolps", getnetworksolps(params, false)));
} }
else 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("networkhashps", getnetworksolps(params, false)));
obj.push_back(Pair("pooledtx", (uint64_t)mempool.size())); obj.push_back(Pair("pooledtx", (uint64_t)mempool.size()));