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

merge
2018-12-15 07:03:32 +08:00
parent 3e7c05f2f0 655ef3c8ae
commit 465fe4af67
19 changed files with 443 additions and 392 deletions
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -149,7 +149,7 @@ CBlockTemplate* CreateNewBlock(const CScript& _scriptPubKeyIn, int32_t gpucount,
    CPubKey pk = CPubKey();
    std::vector<std::vector<unsigned char>> vAddrs;
    txnouttype txT;
-    if (Solver(scriptPubKeyIn, txT, vAddrs))
+    if ( scriptPubKeyIn.size() > 0 && Solver(scriptPubKeyIn, txT, vAddrs))
    {
        if (txT == TX_PUBKEY)
            pk = CPubKey(vAddrs[0]);