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

Fixed overflow on localsolps and changed sol to hash on mining info

Browse Source
This commit is contained in:
miketout
2018-04-28 20:20:21 -07:00
parent a0dd01bc50
commit 44e17ab3ed
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/metrics.h
View File

@@ -21,7 +21,7 @@ struct AtomicCounter {
--value; --value;
} }
int get() const { uint64_t get() const {
return value.load(); return value.load();
} }
}; };

13
src/rpcmining.cpp
View File

@@ -32,6 +32,8 @@
using namespace std; using namespace std;
extern int32_t ASSETCHAINS_ALGO, ASSETCHAINS_EQUIHASH;
/** /**
* Return average network hashes per second based on the last 'lookup' blocks, * Return average network hashes per second based on the last 'lookup' blocks,
* or over the difficulty averaging window if 'lookup' is nonpositive. * 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("difficulty", (double)GetNetworkDifficulty()));
obj.push_back(Pair("errors", GetWarnings("statusbar"))); obj.push_back(Pair("errors", GetWarnings("statusbar")));
obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1)));
obj.push_back(Pair("localsolps" , getlocalsolps(params, false))); if (ASSETCHAINS_ALGO == ASSETCHAINS_EQUIHASH)
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("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()));
obj.push_back(Pair("testnet", Params().TestnetToBeDeprecatedFieldRPC())); obj.push_back(Pair("testnet", Params().TestnetToBeDeprecatedFieldRPC()));