diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:47:17 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-15 14:47:17 -0500 |
| commit | 51baab2112563a2a6c24078e56ab01f024fcc766 (patch) | |
| tree | 8ef2514afcadad740329c76c7eda523ab3cb55df | |
| parent | Merge pull request #1564 (diff) | |
| parent | core: ensure block size limit is set from the start (diff) | |
| download | monero-51baab2112563a2a6c24078e56ab01f024fcc766.tar.xz | |
Merge pull request #1565
50b230d1 core: ensure block size limit is set from the start (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index f0779dad0..deae72a54 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -375,6 +375,7 @@ bool Blockchain::init(BlockchainDB* db, const bool testnet, const cryptonote::te LOG_PRINT_GREEN("Blockchain initialized. last block: " << m_db->height() - 1 << ", " << epee::misc_utils::get_time_interval_string(timestamp_diff) << " time ago, current difficulty: " << get_difficulty_for_next_block(), LOG_LEVEL_0); m_db->block_txn_stop(); + update_next_cumulative_size_limit(); return true; } //------------------------------------------------------------------ @@ -532,6 +533,7 @@ bool Blockchain::reset_and_set_genesis_block(const block& b) block_verification_context bvc = boost::value_initialized<block_verification_context>(); add_new_block(b, bvc); + update_next_cumulative_size_limit(); return bvc.m_added_to_main_chain && !bvc.m_verifivation_failed; } //------------------------------------------------------------------ |