highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-13 15:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Preparations for key import/export

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.h
View File

@@ -695,8 +695,8 @@ public:
int SetMerkleBranch(const CBlock* pblock=NULL);
int GetDepthInMainChain(int& nHeightRet) const;
int GetDepthInMainChain() const { int nHeight; return GetDepthInMainChain(nHeight); }
int GetDepthInMainChain(CBlockIndex* &pindexRet) const;
int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
bool IsInMainChain() const { return GetDepthInMainChain() > 0; }
int GetBlocksToMaturity() const;
bool AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs=true);
@@ -758,6 +758,7 @@ public:
return !(a == b);
}
int GetDepthInMainChain() const;
};
@@ -1263,6 +1264,11 @@ public:
Set((*mi).second);
}
CBlockLocator(const std::vector<uint256>& vHaveIn)
{
vHave = vHaveIn;
}
IMPLEMENT_SERIALIZE
(
if (!(nType & SER_GETHASH))