diff options
| author | iamsmooth <ec2-user@ip-172-31-27-13.ap-northeast-1.compute.internal> | 2014-09-06 17:59:24 +0000 |
|---|---|---|
| committer | fluffypony <ric@spagni.net> | 2014-09-06 21:56:39 +0200 |
| commit | 0a9f2f5236f4679209db2c4ee5eb4e223f619d24 (patch) | |
| tree | 16d8fcae07e2d617406565e05d96a8e44b6e8d19 | |
| parent | bug fix to checkpoint-on-restore; still fails on 612 (diff) | |
| download | monero-0a9f2f5236f4679209db2c4ee5eb4e223f619d24.tar.xz | |
fix checkpoints
| -rw-r--r-- | src/cryptonote_core/blockchain_storage.cpp | 5 | ||||
| -rw-r--r-- | src/cryptonote_core/checkpoints_create.h | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/cryptonote_core/blockchain_storage.cpp b/src/cryptonote_core/blockchain_storage.cpp index a3c68d64e..c41b50204 100644 --- a/src/cryptonote_core/blockchain_storage.cpp +++ b/src/cryptonote_core/blockchain_storage.cpp @@ -100,11 +100,14 @@ bool blockchain_storage::init(const std::string& config_folder) } // check alt chains + #if 0 + // doesn't work when a checkpoint is added and there are already alt chains. However, the rest of the blockchain code suffers from the same issue, so ignore for now + // see issue #118 BOOST_FOREACH(blocks_ext_by_hash::value_type& alt_block, m_alternative_chains) { CHECK_AND_ASSERT_MES(m_checkpoints.is_alternative_block_allowed(m_blocks.size()-1,alt_block.second.height),false,"stored alternative block not allowed, blockchain.bin invalid"); } - + #endif } else { diff --git a/src/cryptonote_core/checkpoints_create.h b/src/cryptonote_core/checkpoints_create.h index fe77ccd0d..9d65dc243 100644 --- a/src/cryptonote_core/checkpoints_create.h +++ b/src/cryptonote_core/checkpoints_create.h @@ -42,9 +42,9 @@ namespace cryptonote { ADD_CHECKPOINT(29556, "53c484a8ed91e4da621bb2fa88106dbde426fe90d7ef07b9c1e5127fb6f3a7f6"); ADD_CHECKPOINT(50000, "0fe8758ab06a8b9cb35b7328fd4f757af530a5d37759f9d3e421023231f7b31c"); ADD_CHECKPOINT(80000, "a62dcd7b536f22e003ebae8726e9e7276f63d594e264b6f0cd7aab27b66e75e3"); - ADD_CHECKPOINT(202212, "bbd604d2ba11ba27935e006ed39c9bfdd99b76bf4a50654bc1e1e61217962698"); - ADD_CHECKPOINT(202213, "44c921da50148949853df082c16f5f8e603ab2f9d599c8aee0f0a3f4abc4fb09"); // from chainradar; verify this - ADD_CHECKPOINT(202214, "043ce17bab57777d04423a65fd60487d02750cbdef11192dca97f1fa6dae654c"); // from chainradar; verify this + ADD_CHECKPOINT(202612, "bbd604d2ba11ba27935e006ed39c9bfdd99b76bf4a50654bc1e1e61217962698"); + ADD_CHECKPOINT(202613, "e2aa337e78df1f98f462b3b1e560c6b914dec47b610698b7b7d1e3e86b6197c2"); // from chainradar; verify this + ADD_CHECKPOINT(202614, "c29e3dc37d8da3e72e506e31a213a58771b24450144305bcba9e70fa4d6ea6fb"); // from chainradar; verify this ADD_CHECKPOINT(205000, "5d3d7a26e6dc7535e34f03def711daa8c263785f73ec1fadef8a45880fde8063"); // from chainradar; verify this return true; } |