dash/blackcoin-more
1
0
Fork 0
Code Issues Pull Requests 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

10
src/main.h
View File

@@ -699,8 +699,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);
@@ -762,6 +762,7 @@ public:
return !(a == b);
}
int GetDepthInMainChain() const;
};
@@ -1267,6 +1268,11 @@ public:
Set((*mi).second);
}
CBlockLocator(const std::vector<uint256>& vHaveIn)
{
vHave = vHaveIn;
}
IMPLEMENT_SERIALIZE
(
if (!(nType & SER_GETHASH))