Preparations for key import/export

This commit is contained in:
Pieter Wuille
2011-07-11 21:49:45 +02:00
committed by Pieter Wuille
parent 15a8590ecf
commit 30ab2c9c46
5 changed files with 60 additions and 6 deletions

View File

@@ -516,7 +516,7 @@ bool CTransaction::RemoveFromMemoryPool()
int CMerkleTx::GetDepthInMainChain(int& nHeightRet) const
int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const
{
if (hashBlock == 0 || nIndex == -1)
return 0;
@@ -537,7 +537,7 @@ int CMerkleTx::GetDepthInMainChain(int& nHeightRet) const
fMerkleVerified = true;
}
nHeightRet = pindex->nHeight;
pindexRet = pindex;
return pindexBest->nHeight - pindex->nHeight + 1;
}