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

add cs_main lock to GetCollateralAge

Browse Source
This commit is contained in:
UdjinM6 2016-09-12 21:06:59 +03:00
parent 57eb2e1842
commit 0534632d2b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/masternode.cpp
View File

@ -205,18 +205,23 @@ void CMasternode::Check(bool forceCheck)
int CMasternode::GetCollateralAge()
{
if (chainActive.Height() < 0) return -1;
int nHeight;
{
TRY_LOCK(cs_main, lockMain);
if(!lockMain || !chainActive.Tip()) return -1;
nHeight = chainActive.Height();
}
if (nCacheCollateralBlock == 0) {
int nInputAge = GetInputAge(vin);
if(nInputAge > 0) {
nCacheCollateralBlock = chainActive.Height() - nInputAge;
nCacheCollateralBlock = nHeight - nInputAge;
} else {
return nInputAge;
}
}
return chainActive.Height() - nCacheCollateralBlock;
return nHeight - nCacheCollateralBlock;
}
void CMasternode::UpdateLastPaid(const CBlockIndex *pindex, int nMaxBlocksToScanBack)