Merge branch 'FSM' of https://github.com/jl777/komodo

fix
2018-12-13 12:40:53 +08:00
parent 5ced63c9c9 e719e66630
commit 7349a49641
34 changed files with 874 additions and 1875 deletions
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -762,7 +762,7 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey, int32_t nHeight,
        scriptPubKey = CScript() << ParseHex(NOTARY_PUBKEY) << OP_CHECKSIG;
    } else
    {
-        if (!isStake || ASSETCHAINS_STAKED != 0)
+        //if ( !isStake || ASSETCHAINS_STAKED != 0 )
        {
            if (!reservekey.GetReservedKey(pubkey))
            {