Merge pull request #3474
aec55a0
"getnetworkhashps" with defaults was yielding "0", the hashrate is not 0. (Gregory Maxwell)
This commit is contained in:
commit
16403b4275
1 changed files with 4 additions and 1 deletions
|
@ -55,7 +55,10 @@ void ShutdownRPCMining()
|
||||||
// or from the last difficulty change if 'lookup' is nonpositive.
|
// or from the last difficulty change if 'lookup' is nonpositive.
|
||||||
// If 'height' is nonnegative, compute the estimate at the time when a given block was found.
|
// If 'height' is nonnegative, compute the estimate at the time when a given block was found.
|
||||||
Value GetNetworkHashPS(int lookup, int height) {
|
Value GetNetworkHashPS(int lookup, int height) {
|
||||||
CBlockIndex *pb = chainActive[height];
|
CBlockIndex *pb = chainActive.Tip();
|
||||||
|
|
||||||
|
if (height >= 0 && height < chainActive.Height())
|
||||||
|
pb = chainActive[height];
|
||||||
|
|
||||||
if (pb == NULL || !pb->nHeight)
|
if (pb == NULL || !pb->nHeight)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue