Fix incorrect validations of block transactions

2018-05-07 10:29:43 -07:00
parent b45d65b46c
commit 68334c8dae
3 changed files with 27 additions and 28 deletions
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -792,21 +792,9 @@ void static BitcoinMiner_noeq()
        fprintf(stderr,"Mining %s with %s\n", ASSETCHAINS_SYMBOL, ASSETCHAINS_ALGORITHMS[ASSETCHAINS_ALGO]);
        while (true)
        {
-            if (chainparams.MiningRequiresPeers())
-            {
-                miningTimer.stop();
-                do {
-                    bool fvNodesEmpty;
-                    {
-                        LOCK(cs_vNodes);
-                        fvNodesEmpty = vNodes.empty();
-                    }
-                    if (!fvNodesEmpty )
-                        break;
-                    MilliSleep(1000);
-                } while (true);
-                miningTimer.start();
-            }
+            miningTimer.stop();
+            waitForPeers(chainparams);
+            miningTimer.start();

            // Create new block
            unsigned int nTransactionsUpdatedLast = mempool.GetTransactionsUpdated();