Merge branch 'syncbug' into dev

Conflicts: src/metrics.cpp
2020-12-11 00:35:14 -05:00
parent b58c15b9fb b7b8890381
commit 7aacd3dfce
21 changed files with 238 additions and 327 deletions
--- a/src/hush.h
+++ b/src/hush.h
@@ -562,7 +562,7 @@ int32_t komodo_voutupdate(bool fJustCheck,int32_t *isratificationp,int32_t notar
            *specialtxp = 1;
            //printf(">>>>>>>> ");
        }
-        else if ( komodo_chosennotary(&nid,height,scriptbuf + 1,timestamp) >= 0 )
+        else if ( hush_chosennotary(&nid,height,scriptbuf + 1,timestamp) >= 0 )
        {
            //printf("found notary.k%d\n",k);
            if ( notaryid < 64 )