fixed potential deadlock in CSuperblockManager::IsSuperblockTriggered (…

…#1536) governance.cs -> mempool.cs: `CGovernanceManager::ProcessMessage - LOCK2(cs_main, governance.cs) -> GetTransaction -> lookup - LOCK(mempool.cs)` mempool.cs -> governance.cs: `CreateNewBlock - LOCK2(cs_main, mempool.cs) -> FillBlockPayments -> IsSuperblockTriggered - LOCK(governance.cs)`
dashpay · Jul 18, 2017 · 6cb3fdd · 6cb3fdd
1 parent 290fb3b
commit 6cb3fdd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -13,6 +13,7 @@
 #include "consensus/consensus.h"
 #include "consensus/merkle.h"
 #include "consensus/validation.h"
+#include "governance-classes.h"
 #include "hash.h"
 #include "main.h"
 #include "net.h"
@@ -124,7 +125,8 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& s
     CAmount nFees = 0;
 
     {
-        LOCK2(cs_main, mempool.cs);
+        LOCK2(cs_main, governance.cs);
+        LOCK(mempool.cs);
         CBlockIndex* pindexPrev = chainActive.Tip();
         const int nHeight = pindexPrev->nHeight + 1;
         pblock->nTime = GetAdjustedTime();