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

fixed depth function

Browse Source
This commit is contained in:
Evan Duffield 2014-11-18 12:01:18 -07:00
parent 12e66dbdcb
commit f21b1cdcd3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cpp
View File

@ -1216,22 +1216,22 @@ int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const
minConfirms = IsTransactionLocked();
if (hashBlock == 0 || nIndex == -1)
return 0;
return minConfirms;
// Find the block it claims to be in
map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hashBlock);
if (mi == mapBlockIndex.end())
return 0;
return minConfirms;
CBlockIndex* pindex = (*mi).second;
if (!pindex || !pindex->IsInMainChain())
return 0;
return minConfirms;
// Make sure the merkle branch connects to this block
if (!fMerkleVerified)
{
if (CBlock::CheckMerkleBranch(GetHash(), vMerkleBranch, nIndex) != pindex->hashMerkleRoot)
return 0;
return minConfirms;
fMerkleVerified = true;
}