CBlockIndex* pindexCheckpoint = mapBlockIndex[hashPendingCheckpoint];
if (!pindexCheckpoint->IsInMainChain())
{
- txdb.TxnBegin();
- if (!Reorganize(txdb, pindexCheckpoint))
+ CBlock block;
+ if (!block.ReadFromDisk(pindexCheckpoint))
+ return error("AcceptPendingSyncCheckpoint: ReadFromDisk failed for sync checkpoint %s", hashPendingCheckpoint.ToString().c_str());
+ if (!block.SetBestChain(txdb, pindexCheckpoint))
{
- txdb.TxnAbort();
hashInvalidCheckpoint = hashPendingCheckpoint;
- return error("AcceptPendingSyncCheckpoint: Reorganize failed for sync checkpoint %s", hashPendingCheckpoint.ToString().c_str());
+ return error("AcceptPendingSyncCheckpoint: SetBestChain failed for sync checkpoint %s", hashPendingCheckpoint.ToString().c_str());
}
}
txdb.Close();
// Select the last proof-of-work block
const CBlockIndex *pindex = GetLastBlockIndex(pindexBest, false);
// Search forward for a block within max span and maturity window
- while (pindex->pnext && (pindex->GetBlockTime() + CHECKPOINT_MAX_SPAN <= pindexBest->GetBlockTime() || pindex->nHeight + COINBASE_MATURITY <= pindexBest->nHeight))
+ while (pindex->pnext && (pindex->GetBlockTime() + CHECKPOINT_MAX_SPAN <= pindexBest->GetBlockTime() || pindex->nHeight + std::min(6, nCoinbaseMaturity - 20) <= pindexBest->nHeight))
pindex = pindex->pnext;
return pindex->GetBlockHash();
}
if (mapBlockIndex.count(hash) && !mapBlockIndex[hash]->IsInMainChain())
{
// checkpoint block accepted but not yet in main chain
- printf("ResetSyncCheckpoint: Reorganize to hardened checkpoint %s\n", hash.ToString().c_str());
+ printf("ResetSyncCheckpoint: SetBestChain to hardened checkpoint %s\n", hash.ToString().c_str());
CTxDB txdb;
- txdb.TxnBegin();
- if (!Reorganize(txdb, mapBlockIndex[hash]))
+ CBlock block;
+ if (!block.ReadFromDisk(mapBlockIndex[hash]))
+ return error("ResetSyncCheckpoint: ReadFromDisk failed for hardened checkpoint %s", hash.ToString().c_str());
+ if (!block.SetBestChain(txdb, mapBlockIndex[hash]))
{
- txdb.TxnAbort();
- return error("ResetSyncCheckpoint: Reorganize failed for hardened checkpoint %s", hash.ToString().c_str());
+ return error("ResetSyncCheckpoint: SetBestChain failed for hardened checkpoint %s", hash.ToString().c_str());
}
txdb.Close();
}
return error("SendSyncCheckpoint: Unable to sign checkpoint, check private key?");
if(!checkpoint.ProcessSyncCheckpoint(NULL))
- return error("SendSyncCheckpoint: Failed to process checkpoint.");
+ {
+ printf("WARNING: SendSyncCheckpoint: Failed to process checkpoint.\n");
+ return false;
+ }
+
// Relay checkpoint
{
LOCK(cs_vNodes);
}
return true;
}
+
+ // Is the sync-checkpoint outside maturity window?
+ bool IsMatureSyncCheckpoint()
+ {
+ LOCK(cs_hashSyncCheckpoint);
+ // sync-checkpoint should always be accepted block
+ assert(mapBlockIndex.count(hashSyncCheckpoint));
+ const CBlockIndex* pindexSync = mapBlockIndex[hashSyncCheckpoint];
+ return (nBestHeight >= pindexSync->nHeight + nCoinbaseMaturity ||
+ pindexSync->GetBlockTime() + nStakeMinAge < GetAdjustedTime());
+ }
}
// ppcoin: sync-checkpoint master key
-const std::string CSyncCheckpoint::strMasterPubKey = "0424f20205e5da98ba632bbd278a11a6499585f62bfb2c782377ef59f0251daab8085fc31471bcb8180bc75ed0fa41bb50c7c084511d54015a3a5241d645c7268a";
+const std::string CSyncCheckpoint::strMasterPubKey = "04c0c707c28533fd5c9f79d2d3a2d80dff259ad8f915241cd14608fb9bc07c74830efe8438f2b272a866b4af5e0c2cc2a9909972aefbd976937e39f46bb38c277c";
std::string CSyncCheckpoint::strMasterPrivKey = "";
if (!pindexCheckpoint->IsInMainChain())
{
// checkpoint chain received but not yet main chain
- txdb.TxnBegin();
- if (!Reorganize(txdb, pindexCheckpoint))
+ CBlock block;
+ if (!block.ReadFromDisk(pindexCheckpoint))
+ return error("ProcessSyncCheckpoint: ReadFromDisk failed for sync checkpoint %s", hashCheckpoint.ToString().c_str());
+ if (!block.SetBestChain(txdb, pindexCheckpoint))
{
- txdb.TxnAbort();
Checkpoints::hashInvalidCheckpoint = hashCheckpoint;
- return error("ProcessSyncCheckpoint: Reorganize failed for sync checkpoint %s", hashCheckpoint.ToString().c_str());
+ return error("ProcessSyncCheckpoint: SetBestChain failed for sync checkpoint %s", hashCheckpoint.ToString().c_str());
}
}
txdb.Close();