CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex)
{
- if (fTestNet) return NULL;
+ if (fTestNet) {
+ std::map<uint256, CBlockIndex*>::const_iterator t = mapBlockIndex.find(hashGenesisBlock);
+ if (t != mapBlockIndex.end())
+ return t->second;
+ return NULL;
+ }
int64 nResult;
BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, mapCheckpoints)
}
// ppcoin: synchronized checkpoint (centrally broadcasted)
- uint256 hashSyncCheckpoint;
+ uint256 hashSyncCheckpoint = 0;
+ uint256 hashPendingCheckpoint = 0;
CSyncCheckpoint checkpointMessage;
CSyncCheckpoint checkpointMessagePending;
uint256 hashInvalidCheckpoint = 0;
return true;
}
+ bool WriteSyncCheckpoint(const uint256& hashCheckpoint)
+ {
+ CTxDB txdb;
+ txdb.TxnBegin();
+ if (!txdb.WriteSyncCheckpoint(hashCheckpoint))
+ {
+ txdb.TxnAbort();
+ return error("WriteSyncCheckpoint(): failed to write to db sync checkpoint %s", hashCheckpoint.ToString().c_str());
+ }
+ if (!txdb.TxnCommit())
+ return error("WriteSyncCheckpoint(): failed to commit to db sync checkpoint %s", hashCheckpoint.ToString().c_str());
+ txdb.Close();
+
+ Checkpoints::hashSyncCheckpoint = hashCheckpoint;
+ return true;
+ }
+
bool AcceptPendingSyncCheckpoint()
{
CRITICAL_BLOCK(cs_hashSyncCheckpoint)
{
- if ((!checkpointMessagePending.IsNull()) && mapBlockIndex.count(checkpointMessagePending.hashCheckpoint))
+ if (hashPendingCheckpoint != 0 && mapBlockIndex.count(hashPendingCheckpoint))
{
- if (!ValidateSyncCheckpoint(checkpointMessagePending.hashCheckpoint))
+ if (!ValidateSyncCheckpoint(hashPendingCheckpoint))
{
+ hashPendingCheckpoint = 0;
checkpointMessagePending.SetNull();
return false;
}
CTxDB txdb;
- CBlockIndex* pindexCheckpoint = mapBlockIndex[checkpointMessagePending.hashCheckpoint];
+ CBlockIndex* pindexCheckpoint = mapBlockIndex[hashPendingCheckpoint];
if (!pindexCheckpoint->IsInMainChain())
{
txdb.TxnBegin();
if (!Reorganize(txdb, pindexCheckpoint))
{
txdb.TxnAbort();
- hashInvalidCheckpoint = checkpointMessagePending.hashCheckpoint;
- return error("ProcessSyncCheckpoint: Reorganize failed for sync checkpoint %s", checkpointMessagePending.hashCheckpoint.ToString().c_str());
+ hashInvalidCheckpoint = hashPendingCheckpoint;
+ return error("ProcessSyncCheckpoint: Reorganize failed for sync checkpoint %s", hashPendingCheckpoint.ToString().c_str());
}
}
-
- txdb.TxnBegin();
- if (!txdb.WriteSyncCheckpoint(checkpointMessagePending.hashCheckpoint))
- {
- txdb.TxnAbort();
- return error("AcceptPendingSyncCheckpoint() : failed to write to db sync checkpoint %s\n", checkpointMessagePending.hashCheckpoint.ToString().c_str());
- }
- if (!txdb.TxnCommit())
- return error("AcceptPendingSyncCheckpoint() : failed to commit to db sync checkpoint %s\n", checkpointMessagePending.hashCheckpoint.ToString().c_str());
txdb.Close();
- hashSyncCheckpoint = checkpointMessagePending.hashCheckpoint;
+ if (!WriteSyncCheckpoint(hashPendingCheckpoint))
+ return error("AcceptPendingSyncCheckpoint(): failed to write sync checkpoint %s", hashPendingCheckpoint.ToString().c_str());
+ hashPendingCheckpoint = 0;
checkpointMessage = checkpointMessagePending;
checkpointMessagePending.SetNull();
printf("AcceptPendingSyncCheckpoint : sync-checkpoint at %s\n", hashSyncCheckpoint.ToString().c_str());
// relay the checkpoint
- CRITICAL_BLOCK(cs_hashSyncCheckpoint)
+ if (!checkpointMessage.IsNull())
BOOST_FOREACH(CNode* pnode, vNodes)
checkpointMessage.RelayTo(pnode);
return true;
{
CRITICAL_BLOCK(cs_hashSyncCheckpoint)
{
- if (checkpointMessagePending.IsNull())
+ if (hashPendingCheckpoint == 0)
return false;
- if (hashBlock == checkpointMessagePending.hashCheckpoint)
+ if (hashBlock == hashPendingCheckpoint)
return true;
- if (mapOrphanBlocks.count(checkpointMessagePending.hashCheckpoint)
- && hashBlock == WantedByOrphan(mapOrphanBlocks[checkpointMessagePending.hashCheckpoint]))
+ if (mapOrphanBlocks.count(hashPendingCheckpoint)
+ && hashBlock == WantedByOrphan(mapOrphanBlocks[hashPendingCheckpoint]))
return true;
}
return false;
}
- // ppcoin: automatic checkpoint (represented by height of checkpoint)
- int nAutoCheckpoint = 0;
- int nBranchPoint = 0; // branch point to alternative branch
-
- // ppcoin: check automatic checkpoint
- // To pass the check:
- // - All ancestors (including the block itself) have block index already
- // - The immediate ancestor in main chain must not have height less than
- // checkpoint height
- bool CheckAuto(const CBlockIndex *pindex)
+ // ppcoin: reset synchronized checkpoint to last hardened checkpoint
+ bool ResetSyncCheckpoint()
{
- while (pindex)
+ CRITICAL_BLOCK(cs_hashSyncCheckpoint)
{
- if (pindex->IsInMainChain())
+ const uint256& hash = mapCheckpoints.rbegin()->second;
+ if (mapBlockIndex.count(hash) && !mapBlockIndex[hash]->IsInMainChain())
{
- if (pindex->nHeight >= nAutoCheckpoint)
- return true;
- else
+ // checkpoint block accepted but not yet in main chain
+ printf("ResetSyncCheckpoint: Reorganize to hardened checkpoint %s\n", hash.ToString().c_str());
+ CTxDB txdb;
+ txdb.TxnBegin();
+ if (!Reorganize(txdb, mapBlockIndex[hash]))
{
- nBranchPoint = pindex->nHeight;
- return error("Checkpoints: new block on alternative branch at height=%d before auto checkpoint at height=%d", pindex->nHeight, nAutoCheckpoint);
+ txdb.TxnAbort();
+ return error("ResetSyncCheckpoint: Reorganize failed for hardened checkpoint %s", hash.ToString().c_str());
}
+ txdb.Close();
}
- else
- pindex = pindex->pprev;
- }
- return error("Checkpoints: failed to find any ancestor on main chain for the new block - internal error");
- }
-
- // ppcoin: get next chain checkpoint
- int GetNextChainCheckpoint(const CBlockIndex *pindexLast)
- {
- CBigNum bnTarget;
- CBigNum bnTargetMax = 0; // max target of all blocks since checkpoint
- CBigNum bnTargetMin = 0; // min target of all candidate checkpoints
- int nMinTargetHeight = 0; // min target height of candidate checkpoints
- int nCheckpointMin = 0; // minimum candidate checkpoint
- int nCheckpointMax = 0; // maximum candidate checkpoint
- int nDepth = pindexLast->nHeight - pindexLast->nCheckpoint;
- const CBlockIndex *pindex = pindexLast;
- while (nDepth >= 0 && pindex)
- {
- bnTarget.SetCompact(pindex->nBits);
- if (bnTarget > bnTargetMax)
- bnTargetMax = bnTarget;
- if (nCheckpointMax > 0 && bnTarget < bnTargetMin)
+ else if(!mapBlockIndex.count(hash))
{
- bnTargetMin = bnTarget;
- nMinTargetHeight = pindex->nHeight;
+ // checkpoint block not yet accepted
+ hashPendingCheckpoint = hash;
+ checkpointMessagePending.SetNull();
+ printf("ResetSyncCheckpoint: pending for sync-checkpoint %s\n", hashPendingCheckpoint.ToString().c_str());
+ // TODO: when to ask for the checkpoint chain?
}
- if (nCheckpointMax == 0 && pindexLast->GetBlockTime() - pindex->GetBlockTime() > AUTO_CHECKPOINT_MIN_SPAN)
+
+ BOOST_REVERSE_FOREACH(const MapCheckpoints::value_type& i, mapCheckpoints)
{
- nCheckpointMax = pindex->nHeight;
- bnTargetMin.SetCompact(pindex->nBits);
- nMinTargetHeight = pindex->nHeight;
+ const uint256& hash = i.second;
+ if (mapBlockIndex.count(hash) && mapBlockIndex[hash]->IsInMainChain())
+ {
+ if (!WriteSyncCheckpoint(hash))
+ return error("ResetSyncCheckpoint: failed to write sync checkpoint %s", hash.ToString().c_str());
+ printf("ResetSyncCheckpoint: sync-checkpoint reset to %s\n", hashSyncCheckpoint.ToString().c_str());
+ return true;
+ }
}
- if (pindexLast->GetBlockTime() - pindex->GetBlockTime() < AUTO_CHECKPOINT_MAX_SPAN)
- nCheckpointMin = pindex->nHeight;
- pindex = pindex->pprev;
- nDepth--;
- }
-
- assert (nDepth == -1); // arrive at chain checkpoint now
-
- printf("Checkpoints: min=%d max=%d tminheight=%d tmin=0x%08x tmax=0x%08x\n",
- nCheckpointMin, nCheckpointMax, nMinTargetHeight,
- bnTargetMin.GetCompact(), bnTargetMax.GetCompact());
- if (nCheckpointMax == 0) // checkpoint stays if max candidate not found
- return pindexLast->nCheckpoint;
-
- if (bnTargetMin * 100 > bnTargetMax * 90)
- return nCheckpointMax;
- if (bnTarget * 100 > bnTargetMax * 90)
- return nMinTargetHeight;
- else
- return nCheckpointMin;
- }
-
- // ppcoin: get next auto checkpoint from the new chain checkpoint
- int GetNextAutoCheckpoint(int nCheckpoint)
- {
- return (std::max(nAutoCheckpoint, nCheckpoint));
- }
-
- // ppcoin: advance to next automatic checkpoint
- void AdvanceAutoCheckpoint(int nCheckpoint)
- {
- nAutoCheckpoint = GetNextAutoCheckpoint(nCheckpoint);
- printf("Checkpoints: auto checkpoint now at height=%d\n", nAutoCheckpoint);
- }
- // ppcoin: reset auto checkpoint
- bool ResetAutoCheckpoint(int nCheckpoint)
- {
- if (nCheckpoint <= 0 || nCheckpoint > nBestHeight)
- return error("ResetAutoCheckpoint() : new checkpoint invalid");
- if (nCheckpoint >= nAutoCheckpoint)
- return error("ResetAutoCheckpoint() : new checkpoint not earlier than current auto checkpoint");
- CTxDB txdb;
- txdb.TxnBegin();
- if (!txdb.WriteAutoCheckpoint(nCheckpoint, true))
- return error("ResetAutoCheckpoint() : database write failed");
- if (!txdb.TxnCommit())
- return error("ResetAutoCheckpoint() : database commit failed");
- nAutoCheckpoint = nCheckpoint;
- nBranchPoint = 0; // clear branch point
-
- // clear ban list to accept alternative branches
- CRITICAL_BLOCK(cs_vNodes)
- {
- BOOST_FOREACH(CNode* pnode, vNodes)
- pnode->ClearBanned();
+ return false;
}
-
- return true;
}
}
if (!mapBlockIndex.count(hashCheckpoint))
{
// We haven't received the checkpoint chain, keep the checkpoint as pending
+ Checkpoints::hashPendingCheckpoint = hashCheckpoint;
Checkpoints::checkpointMessagePending = *this;
printf("ProcessSyncCheckpoint: pending for sync-checkpoint %s\n", hashCheckpoint.ToString().c_str());
// Ask this guy to fill in what we're missing
return error("ProcessSyncCheckpoint: Reorganize failed for sync checkpoint %s", hashCheckpoint.ToString().c_str());
}
}
-
- txdb.TxnBegin();
- if (!txdb.WriteSyncCheckpoint(hashCheckpoint))
- {
- txdb.TxnAbort();
- return error("ProcessSyncCheckpoint(): failed to write to db sync checkpoint %s", hashCheckpoint.ToString().c_str());
- }
- if (!txdb.TxnCommit())
- return error("ProcessSyncCheckpoint(): failed to commit to db sync checkpoint %s", hashCheckpoint.ToString().c_str());
txdb.Close();
- Checkpoints::hashSyncCheckpoint = hashCheckpoint;
+ if (!Checkpoints::WriteSyncCheckpoint(hashCheckpoint))
+ return error("ProcessSyncCheckpoint(): failed to write sync checkpoint %s", hashCheckpoint.ToString().c_str());
Checkpoints::checkpointMessage = *this;
+ Checkpoints::hashPendingCheckpoint = 0;
Checkpoints::checkpointMessagePending.SetNull();
printf("ProcessSyncCheckpoint: sync-checkpoint at %s\n", hashCheckpoint.ToString().c_str());
}