nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update new blockchain to build with new changes

Browse Source 
Still need to add in the new checkpointing functionality, as well as
touch up a few things, but is okay for now.
This commit is contained in:
Thomas Winget 2014-10-13 00:31:21 -04:00 committed by warptangent
parent 1ffbeb2d2e
commit 07733f98c0
2 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/cryptonote_core/blockchain.cpp
View File

@ -218,7 +218,7 @@ uint64_t Blockchain::get_current_blockchain_height()
//------------------------------------------------------------------ //------------------------------------------------------------------
//FIXME: possibly move this into the constructor, to avoid accidentally //FIXME: possibly move this into the constructor, to avoid accidentally
// dereferencing a null BlockchainDB pointer // dereferencing a null BlockchainDB pointer
bool Blockchain::init(const std::string& config_folder) bool Blockchain::init(const std::string& config_folder, bool testnet)
{ {
CRITICAL_REGION_LOCAL(m_blockchain_lock); CRITICAL_REGION_LOCAL(m_blockchain_lock);
@ -248,15 +248,29 @@ bool Blockchain::init(const std::string& config_folder)
// if the blockchain is new, add the genesis block // if the blockchain is new, add the genesis block
// this feels kinda kludgy to do it this way, but can be looked at later. // this feels kinda kludgy to do it this way, but can be looked at later.
// TODO: add function to create and store genesis block,
// taking testnet into account
if(!m_db->height()) if(!m_db->height())
{ {
LOG_PRINT_L0("Blockchain not loaded, generating genesis block."); LOG_PRINT_L0("Blockchain not loaded, generating genesis block.");
block bl = boost::value_initialized<block>(); block bl = boost::value_initialized<block>();
block_verification_context bvc = boost::value_initialized<block_verification_context>(); block_verification_context bvc = boost::value_initialized<block_verification_context>();
generate_genesis_block(bl); if (testnet)
{
generate_genesis_block(bl, config::testnet::GENESIS_TX, config::testnet::GENESIS_NONCE);
}
else
{
generate_genesis_block(bl, config::GENESIS_TX, config::GENESIS_NONCE);
}
add_new_block(bl, bvc); add_new_block(bl, bvc);
CHECK_AND_ASSERT_MES(!bvc.m_verifivation_failed, false, "Failed to add genesis block to blockchain"); CHECK_AND_ASSERT_MES(!bvc.m_verifivation_failed, false, "Failed to add genesis block to blockchain");
} }
// TODO: if blockchain load successful, verify blockchain against both
// hard-coded and runtime-loaded (and enforced) checkpoints.
else
{
}
// check how far behind we are // check how far behind we are
uint64_t top_block_timestamp = m_db->get_top_block_timestamp(); uint64_t top_block_timestamp = m_db->get_top_block_timestamp();
@ -576,14 +590,12 @@ difficulty_type Blockchain::get_difficulty_for_next_block()
// This function removes blocks from the blockchain until it gets to the // This function removes blocks from the blockchain until it gets to the
// position where the blockchain switch started and then re-adds the blocks // position where the blockchain switch started and then re-adds the blocks
// that had been removed. // that had been removed.
bool Blockchain::rollback_blockchain_switching(std::list<block>& original_chain) bool Blockchain::rollback_blockchain_switching(std::list<block>& original_chain, uint64_t rollback_height)
{ {
CRITICAL_REGION_LOCAL(m_blockchain_lock); CRITICAL_REGION_LOCAL(m_blockchain_lock);
// remove blocks from blockchain until we get back to where we were. // remove blocks from blockchain until we get back to where we should be.
// Conveniently, that's until our top block's hash == the parent block of while (m_db->height() != rollback_height)
// the first block we need to add back.
while (m_db->top_block_hash() != original_chain.front().prev_id)
{ {
pop_block_from_blockchain(); pop_block_from_blockchain();
} }
@ -596,6 +608,11 @@ bool Blockchain::rollback_blockchain_switching(std::list<block>& original_chain)
CHECK_AND_ASSERT_MES(r && bvc.m_added_to_main_chain, false, "PANIC!!! failed to add (again) block while chain switching during the rollback!"); CHECK_AND_ASSERT_MES(r && bvc.m_added_to_main_chain, false, "PANIC!!! failed to add (again) block while chain switching during the rollback!");
} }
LOG_PRINT_L1("Rollback to height " << rollback_height << " was successful.");
if (original_chain.size())
{
LOG_PRINT_L1("Restoration to previous blockchain successful as well.");
}
return true; return true;
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
@ -640,7 +657,11 @@ bool Blockchain::switch_to_alternative_blockchain(std::list<blocks_ext_by_hash::
if(!r || !bvc.m_added_to_main_chain) if(!r || !bvc.m_added_to_main_chain)
{ {
LOG_PRINT_L0("Failed to switch to alternative blockchain"); LOG_PRINT_L0("Failed to switch to alternative blockchain");
rollback_blockchain_switching(disconnected_chain);
// rollback_blockchain_switching should be moved to two different
// functions: rollback and apply_chain, but for now we pretend it is
// just the latter (because the rollback was done above).
rollback_blockchain_switching(disconnected_chain, m_db->height());
// FIXME: Why do we keep invalid blocks around? Possibly in case we hear // FIXME: Why do we keep invalid blocks around? Possibly in case we hear
// about them again so we can immediately dismiss them, but needs some // about them again so we can immediately dismiss them, but needs some
@ -1823,7 +1844,8 @@ uint64_t Blockchain::get_adjusted_time()
return time(NULL); return time(NULL);
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
bool Blockchain::check_block_timestamp(const std::vector<uint64_t>& timestamps, const block& b) //TODO: revisit, has changed a bit on upstream
bool Blockchain::check_block_timestamp(std::vector<uint64_t>& timestamps, const block& b)
{ {
uint64_t median_ts = epee::misc_utils::median(timestamps); uint64_t median_ts = epee::misc_utils::median(timestamps);

7
src/cryptonote_core/blockchain.h
View File

@ -81,8 +81,7 @@ namespace cryptonote
Blockchain(tx_memory_pool& tx_pool); Blockchain(tx_memory_pool& tx_pool);
bool init() { return init(tools::get_default_data_dir()); } bool init(const std::string& config_folder, bool testnet = false);
bool init(const std::string& config_folder);
bool deinit(); bool deinit();
void set_checkpoints(checkpoints&& chk_pts) { m_checkpoints = chk_pts; } void set_checkpoints(checkpoints&& chk_pts) { m_checkpoints = chk_pts; }
@ -189,7 +188,7 @@ namespace cryptonote
bool prevalidate_miner_transaction(const block& b, uint64_t height); bool prevalidate_miner_transaction(const block& b, uint64_t height);
bool validate_miner_transaction(const block& b, size_t cumulative_block_size, uint64_t fee, uint64_t& base_reward, uint64_t already_generated_coins); bool validate_miner_transaction(const block& b, size_t cumulative_block_size, uint64_t fee, uint64_t& base_reward, uint64_t already_generated_coins);
bool validate_transaction(const block& b, uint64_t height, const transaction& tx); bool validate_transaction(const block& b, uint64_t height, const transaction& tx);
bool rollback_blockchain_switching(std::list<block>& original_chain); bool rollback_blockchain_switching(std::list<block>& original_chain, uint64_t rollback_height);
bool add_transaction_from_block(const transaction& tx, const crypto::hash& tx_id, const crypto::hash& bl_id, uint64_t bl_height); bool add_transaction_from_block(const transaction& tx, const crypto::hash& tx_id, const crypto::hash& bl_id, uint64_t bl_height);
bool push_transaction_to_global_outs_index(const transaction& tx, const crypto::hash& tx_id, std::vector<uint64_t>& global_indexes); bool push_transaction_to_global_outs_index(const transaction& tx, const crypto::hash& tx_id, std::vector<uint64_t>& global_indexes);
bool pop_transaction_from_global_index(const transaction& tx, const crypto::hash& tx_id); bool pop_transaction_from_global_index(const transaction& tx, const crypto::hash& tx_id);
@ -199,7 +198,7 @@ namespace cryptonote
bool add_block_as_invalid(const block& bl, const crypto::hash& h); bool add_block_as_invalid(const block& bl, const crypto::hash& h);
bool add_block_as_invalid(const block_extended_info& bei, const crypto::hash& h); bool add_block_as_invalid(const block_extended_info& bei, const crypto::hash& h);
bool check_block_timestamp(const block& b); bool check_block_timestamp(const block& b);
bool check_block_timestamp(const std::vector<uint64_t>& timestamps, const block& b); bool check_block_timestamp(std::vector<uint64_t>& timestamps, const block& b);
uint64_t get_adjusted_time(); uint64_t get_adjusted_time();
bool complete_timestamps_vector(uint64_t start_height, std::vector<uint64_t>& timestamps); bool complete_timestamps_vector(uint64_t start_height, std::vector<uint64_t>& timestamps);
bool update_next_cumulative_size_limit(); bool update_next_cumulative_size_limit();