highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-18 22:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #574 from sipa/dumpprivkey

Browse Source 
Dumpprivkey
This commit is contained in:
Gavin Andresen
2011-12-19 07:27:25 -08:00
parent fc90967876 95d888a6d1
commit 99a289f531
16 changed files with 422 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

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