From: Sunny King Date: Fri, 6 Jul 2012 16:17:35 +0000 (+0100) Subject: PPCoin: Fix a startup issue loading blkindex since 90f58617 X-Git-Tag: v0.4.0-unstable~133 X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=1459c6b59d0a20e6b0e042c868461f176d4e75f5 PPCoin: Fix a startup issue loading blkindex since 90f58617 --- diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 14141b3..4447414 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -22,7 +22,7 @@ namespace Checkpoints // static MapCheckpoints mapCheckpoints = boost::assign::map_list_of - ( 0, hashGenesisBlock ) + ( 0, hashGenesisBlockOfficial ) ; // ppcoin: no checkpoint yet; to be created in future releases bool CheckHardened(int nHeight, const uint256& hash) diff --git a/src/main.cpp b/src/main.cpp index 263a9e9..b274071 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,7 +30,7 @@ map mapNextTx; map mapBlockIndex; set > setStakeSeen; -uint256 hashGenesisBlock("0x000000007c82d1f0aa2896b01bf533a8cc26a1f44790be4ceb4ecde7bee24add"); +uint256 hashGenesisBlock = hashGenesisBlockOfficial; static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32); const int nInitialBlockThreshold = 120; // Regard blocks up until N-threshold as "initial download" CBlockIndex* pindexGenesisBlock = NULL; @@ -1770,7 +1770,7 @@ bool LoadBlockIndex(bool fAllowNew) { if (fTestNet) { - hashGenesisBlock = uint256("0x00000007199508e34a9ff81e6ec0c477a4cccff2a4767a8eee39c11db367b008"); + hashGenesisBlock = hashGenesisBlockTestNet; bnProofOfWorkLimit = CBigNum(~uint256(0) >> 28); pchMessageStart[0] = 0xfa; pchMessageStart[1] = 0xbf; diff --git a/src/main.h b/src/main.h index f69c96e..2811ec1 100644 --- a/src/main.h +++ b/src/main.h @@ -46,6 +46,8 @@ static const int fHaveUPnP = true; static const int fHaveUPnP = false; #endif +static const uint256 hashGenesisBlockOfficial("0x000000007c82d1f0aa2896b01bf533a8cc26a1f44790be4ceb4ecde7bee24add"); +static const uint256 hashGenesisBlockTestNet("0x00000007199508e34a9ff81e6ec0c477a4cccff2a4767a8eee39c11db367b008");