sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 20:12:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted locking change in miner.

Browse Source 
This should have been done in the original PR but was overlooked.
This commit is contained in:
Tim Flynn 2016-08-16 23:37:30 -04:00
parent c4dfc7a1e2
commit 63c3580a7d
1 changed files with 129 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/miner.cpp
View File

@ -123,7 +123,7 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& s
CAmount nFees = 0;
{
LOCK(cs_main);
LOCK2(cs_main, mempool.cs);
CBlockIndex* pindexPrev = chainActive.Tip();
const int nHeight = pindexPrev->nHeight + 1;
pblock->nTime = GetAdjustedTime();
@ -144,8 +144,6 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& s
: pblock->GetBlockTime();
{
LOCK(mempool.cs);
bool fPriorityBlock = nBlockPrioritySize > 0;
if (fPriorityBlock) {
vecPriority.reserve(mempool.mapTx.size());
@ -276,10 +274,7 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const CScript& s
}
}
}
}
// DASH : Masternode and general budget payments
DBG( printf("CreateNewBlock 1\n"); );
// Masternode and general budget payments
FillBlockPayee(txNew, nFees);
// Make payee