aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/blockchain_storage.cpp
diff options
context:
space:
mode:
authoriamsmooth <ec2-user@ip-172-31-27-13.ap-northeast-1.compute.internal>2014-09-06 17:59:24 +0000
committerfluffypony <ric@spagni.net>2014-09-06 21:56:39 +0200
commit0a9f2f5236f4679209db2c4ee5eb4e223f619d24 (patch)
tree16d8fcae07e2d617406565e05d96a8e44b6e8d19 /src/cryptonote_core/blockchain_storage.cpp
parentbug fix to checkpoint-on-restore; still fails on 612 (diff)
downloadmonero-0a9f2f5236f4679209db2c4ee5eb4e223f619d24.tar.xz
fix checkpoints
Diffstat (limited to 'src/cryptonote_core/blockchain_storage.cpp')
-rw-r--r--src/cryptonote_core/blockchain_storage.cpp5
1 files changed, 4 insertions, 1 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
{