@ -1939,6 +1939,7 @@ enum FlushStateMode {
@@ -1939,6 +1939,7 @@ enum FlushStateMode {
* or always and in all cases if we ' re in prune mode and are deleting files .
*/
bool static FlushStateToDisk ( CValidationState & state , FlushStateMode mode ) {
const CChainParams & chainparams = Params ( ) ;
LOCK2 ( cs_main , cs_LastBlockFile ) ;
static int64_t nLastWrite = 0 ;
static int64_t nLastFlush = 0 ;
@ -1947,7 +1948,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {
@@ -1947,7 +1948,7 @@ bool static FlushStateToDisk(CValidationState &state, FlushStateMode mode) {
bool fFlushForPrune = false ;
try {
if ( fPruneMode & & fCheckForPruning & & ! fReindex ) {
FindFilesToPrune ( setFilesToPrune ) ;
FindFilesToPrune ( setFilesToPrune , chainparams . PruneAfterHeight ( ) ) ;
fCheckForPruning = false ;
if ( ! setFilesToPrune . empty ( ) ) {
fFlushForPrune = true ;
@ -2147,8 +2148,8 @@ static int64_t nTimePostConnect = 0;
@@ -2147,8 +2148,8 @@ static int64_t nTimePostConnect = 0;
* Connect a new block to chainActive . pblock is either NULL or a pointer to a CBlock
* corresponding to pindexNew , to bypass loading it again from disk .
*/
bool static ConnectTip ( CValidationState & state , CBlockIndex * pindexNew , const CBlock * pblock ) {
const CChainParams & chainparams = Params ( ) ;
bool static ConnectTip ( CValidationState & state , const CChainParams & chainparams , CBlockIndex * pindexNew , const CBlock * pblock )
{
assert ( pindexNew - > pprev = = chainActive . Tip ( ) ) ;
mempool . check ( pcoinsTip ) ;
// Read block from disk.
@ -2280,8 +2281,8 @@ static void PruneBlockIndexCandidates() {
@@ -2280,8 +2281,8 @@ static void PruneBlockIndexCandidates() {
* Try to make some progress towards making pindexMostWork the active block .
* pblock is either NULL or a pointer to a CBlock corresponding to pindexMostWork .
*/
static bool ActivateBestChainStep ( CValidationState & state , CBlockIndex * pindexMostWork , const CBlock * pblock ) {
const CChainParams & chainparams = Params ( ) ;
static bool ActivateBestChainStep ( CValidationState & state , const CChainParams & chainparams , CBlockIndex * pindexMostWork , const CBlock * pblock )
{
AssertLockHeld ( cs_main ) ;
bool fInvalidFound = false ;
const CBlockIndex * pindexOldTip = chainActive . Tip ( ) ;
@ -2314,7 +2315,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
@@ -2314,7 +2315,7 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
// Connect new blocks.
BOOST_REVERSE_FOREACH ( CBlockIndex * pindexConnect , vpindexToConnect ) {
if ( ! ConnectTip ( state , pindexConnect , pindexConnect = = pindexMostWork ? pblock : NULL ) ) {
if ( ! ConnectTip ( state , chainparams , pindexConnect , pindexConnect = = pindexMostWork ? pblock : NULL ) ) {
if ( state . IsInvalid ( ) ) {
// The block violates a consensus rule.
if ( ! state . CorruptionPossible ( ) )
@ -2355,10 +2356,10 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
@@ -2355,10 +2356,10 @@ static bool ActivateBestChainStep(CValidationState &state, CBlockIndex *pindexMo
* or an activated best chain . pblock is either NULL or a pointer to a block
* that is already loaded ( to avoid loading it again from disk ) .
*/
bool ActivateBestChain ( CValidationState & state , const CBlock * pblock ) {
bool ActivateBestChain ( CValidationState & state , const CChainParams & chainparams , const CBlock * pblock )
{
CBlockIndex * pindexNewTip = NULL ;
CBlockIndex * pindexMostWork = NULL ;
const CChainParams & chainparams = Params ( ) ;
do {
boost : : this_thread : : interruption_point ( ) ;
@ -2371,7 +2372,7 @@ bool ActivateBestChain(CValidationState &state, const CBlock *pblock) {
@@ -2371,7 +2372,7 @@ bool ActivateBestChain(CValidationState &state, const CBlock *pblock) {
if ( pindexMostWork = = NULL | | pindexMostWork = = chainActive . Tip ( ) )
return true ;
if ( ! ActivateBestChainStep ( state , pindexMostWork , pblock & & pblock - > GetHash ( ) = = pindexMostWork - > GetBlockHash ( ) ? pblock : NULL ) )
if ( ! ActivateBestChainStep ( state , chainparams , pindexMostWork , pblock & & pblock - > GetHash ( ) = = pindexMostWork - > GetBlockHash ( ) ? pblock : NULL ) )
return false ;
pindexNewTip = chainActive . Tip ( ) ;
@ -2850,9 +2851,9 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
@@ -2850,9 +2851,9 @@ static bool AcceptBlockHeader(const CBlockHeader& block, CValidationState& state
return true ;
}
bool AcceptBlock ( const CBlock & block , CValidationState & state , CBlockIndex * * ppindex , bool fRequested , CDiskBlockPos * dbp )
/** Store block on disk. If dbp is non-NULL, the file is known to already reside on disk */
static bool AcceptBlock ( const CBlock & block , CValidationState & state , const CChainParams & chainparams , CBlockIndex * * ppindex , bool fRequested , CDiskBlockPos * dbp )
{
const CChainParams & chainparams = Params ( ) ;
AssertLockHeld ( cs_main ) ;
CBlockIndex * & pindex = * ppindex ;
@ -2942,7 +2943,7 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, c
@@ -2942,7 +2943,7 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, c
// Store to disk
CBlockIndex * pindex = NULL ;
bool ret = AcceptBlock ( * pblock , state , & pindex , fRequested , dbp ) ;
bool ret = AcceptBlock ( * pblock , state , chainparams , & pindex , fRequested , dbp ) ;
if ( pindex & & pfrom ) {
mapBlockSource [ pindex - > GetBlockHash ( ) ] = pfrom - > GetId ( ) ;
}
@ -2951,7 +2952,7 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, c
@@ -2951,7 +2952,7 @@ bool ProcessNewBlock(CValidationState& state, const CChainParams& chainparams, c
return error ( " %s: AcceptBlock FAILED " , __func__ ) ;
}
if ( ! ActivateBestChain ( state , pblock ) )
if ( ! ActivateBestChain ( state , chainparams , pblock ) )
return error ( " %s: ActivateBestChain failed " , __func__ ) ;
return true ;
@ -3041,13 +3042,13 @@ void UnlinkPrunedFiles(std::set<int>& setFilesToPrune)
@@ -3041,13 +3042,13 @@ void UnlinkPrunedFiles(std::set<int>& setFilesToPrune)
}
/* Calculate the block/rev files that should be deleted to remain under target*/
void FindFilesToPrune ( std : : set < int > & setFilesToPrune )
void FindFilesToPrune ( std : : set < int > & setFilesToPrune , uint64_t nPruneAfterHeight )
{
LOCK2 ( cs_main , cs_LastBlockFile ) ;
if ( chainActive . Tip ( ) = = NULL | | nPruneTarget = = 0 ) {
return ;
}
if ( chainActive . Tip ( ) - > nHeight < = Params ( ) . PruneAfterHeight ( ) ) {
if ( chainActive . Tip ( ) - > nHeight < = n PruneAfterHeight) {
return ;
}
@ -3275,9 +3276,8 @@ CVerifyDB::~CVerifyDB()
@@ -3275,9 +3276,8 @@ CVerifyDB::~CVerifyDB()
uiInterface . ShowProgress ( " " , 100 ) ;
}
bool CVerifyDB : : VerifyDB ( CCoinsView * coinsview , int nCheckLevel , int nCheckDepth )
bool CVerifyDB : : VerifyDB ( const CChainParams & chainparams , CCoinsView * coinsview , int nCheckLevel , int nCheckDepth )
{
const CChainParams & chainparams = Params ( ) ;
LOCK ( cs_main ) ;
if ( chainActive . Tip ( ) = = NULL | | chainActive . Tip ( ) - > pprev = = NULL )
return true ;
@ -3393,9 +3393,8 @@ bool LoadBlockIndex()
@@ -3393,9 +3393,8 @@ bool LoadBlockIndex()
return true ;
}
bool InitBlockIndex ( ) {
const CChainParams & chainparams = Params ( ) ;
bool InitBlockIndex ( const CChainParams & chainparams )
{
LOCK ( cs_main ) ;
// Initialize global variables that cannot be constructed at startup.
@ -3413,7 +3412,7 @@ bool InitBlockIndex() {
@@ -3413,7 +3412,7 @@ bool InitBlockIndex() {
// Only add the genesis block if not reindexing (in which case we reuse the one already on disk)
if ( ! fReindex ) {
try {
CBlock & block = const_cast < CBlock & > ( Params ( ) . GenesisBlock ( ) ) ;
CBlock & block = const_cast < CBlock & > ( chainparams . GenesisBlock ( ) ) ;
// Start new block file
unsigned int nBlockSize = : : GetSerializeSize ( block , SER_DISK , CLIENT_VERSION ) ;
CDiskBlockPos blockPos ;
@ -3425,7 +3424,7 @@ bool InitBlockIndex() {
@@ -3425,7 +3424,7 @@ bool InitBlockIndex() {
CBlockIndex * pindex = AddToBlockIndex ( block ) ;
if ( ! ReceivedBlockTransactions ( block , state , pindex , blockPos ) )
return error ( " LoadBlockIndex() : genesis block not accepted " ) ;
if ( ! ActivateBestChain ( state , & block ) )
if ( ! ActivateBestChain ( state , chainparams , & block ) )
return error ( " LoadBlockIndex() : genesis block cannot be activated " ) ;
// Force a chainstate write so that when we VerifyDB in a moment, it doesn't check stale data
return FlushStateToDisk ( state , FLUSH_STATE_ALWAYS ) ;
@ -3437,11 +3436,8 @@ bool InitBlockIndex() {
@@ -3437,11 +3436,8 @@ bool InitBlockIndex() {
return true ;
}
bool LoadExternalBlockFile ( FILE * fileIn , CDiskBlockPos * dbp )
bool LoadExternalBlockFile ( const CChainParams & chainparams , FILE * fileIn , CDiskBlockPos * dbp )
{
const CChainParams & chainparams = Params ( ) ;
// Map of disk positions for blocks with unknown parent (only used for reindex)
static std : : multimap < uint256 , CDiskBlockPos > mapBlocksUnknownParent ;
int64_t nStart = GetTimeMillis ( ) ;
@ -3461,10 +3457,10 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)
@@ -3461,10 +3457,10 @@ bool LoadExternalBlockFile(FILE* fileIn, CDiskBlockPos *dbp)
try {
// locate a header
unsigned char buf [ MESSAGE_START_SIZE ] ;
blkdat . FindByte ( Params ( ) . MessageStart ( ) [ 0 ] ) ;
blkdat . FindByte ( chainparams . MessageStart ( ) [ 0 ] ) ;
nRewind = blkdat . GetPos ( ) + 1 ;
blkdat > > FLATDATA ( buf ) ;
if ( memcmp ( buf , Params ( ) . MessageStart ( ) , MESSAGE_START_SIZE ) )
if ( memcmp ( buf , chainparams . MessageStart ( ) , MESSAGE_START_SIZE ) )
continue ;
// read size
blkdat > > nSize ;
@ -3858,7 +3854,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
@@ -3858,7 +3854,7 @@ void static ProcessGetData(CNode* pfrom, const Consensus::Params& consensusParam
// best equivalent proof of work) than the best header chain we know about.
send = mi - > second - > IsValid ( BLOCK_VALID_SCRIPTS ) & & ( pindexBestHeader ! = NULL ) & &
( pindexBestHeader - > GetBlockTime ( ) - mi - > second - > GetBlockTime ( ) < nOneMonth ) & &
( GetBlockProofEquivalentTime ( * pindexBestHeader , * mi - > second , * pindexBestHeader , Params ( ) . GetConsensus ( ) ) < nOneMonth ) ;
( GetBlockProofEquivalentTime ( * pindexBestHeader , * mi - > second , * pindexBestHeader , consensusParams ) < nOneMonth ) ;
if ( ! send ) {
LogPrintf ( " %s: ignoring request from peer=%i for old block that isn't in the main chain \n " , __func__ , pfrom - > GetId ( ) ) ;
}
@ -4701,7 +4697,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
@@ -4701,7 +4697,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
uint256 alertHash = alert . GetHash ( ) ;
if ( pfrom - > setKnown . count ( alertHash ) = = 0 )
{
if ( alert . ProcessAlert ( Params ( ) . AlertKey ( ) ) )
if ( alert . ProcessAlert ( chainparams . AlertKey ( ) ) )
{
// Relay
pfrom - > setKnown . insert ( alertHash ) ;