Merge branch 'dev' into FSM

# Conflicts: # src/assetchains.old
2019-03-13 22:55:52 -11:00
parent 912cecf630 0fe3a71428
commit e713c31ada
5 changed files with 14 additions and 7 deletions
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -1623,7 +1623,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_
                fprintf(stderr,"ht.%d isPoS.%d utxo not validated -> must be PoW fake\n",height,isPoS);
                isPoS = 0;
            }
-            else
+            else if ( ASSETCHAINS_STAKED != 100 )
            {
                if ( bhash < POWTarget )
                {