Merge branch 'new_staker' into mastertest

2019-01-23 17:46:36 +08:00
parent 292edfb284 0c2aa0a649
commit bf726a2c03
17 changed files with 301 additions and 236 deletions
--- a/src/metrics.cpp
+++ b/src/metrics.cpp
@@ -136,7 +136,7 @@ int64_t GetUptime()

 double GetLocalSolPS()
 {
-    if (ASSETCHAINS_ALGO == ASSETCHAINS_VERUSHASH)
+    if (ASSETCHAINS_ALGO == ASSETCHAINS_VERUSHASH || ASSETCHAINS_ALGO == ASSETCHAINS_VERUSHASHV2)
    {
        return miningTimer.rate(nHashCount);
    }