diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-05 23:13:31 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-05 23:13:32 +0200 |
| commit | 79d46c4d551a9b1261801960095bf4d24967211a (patch) | |
| tree | 084c67e8d2f93ed6ee6fa5629e997d8f7d56ddda /src/cryptonote_core/cryptonote_core.cpp | |
| parent | c9fc61dbb56cca442c775faa2554a7460879b637 (diff) | |
| parent | 02d3ef7bdae7d1dd7a9a6f4fee24631cf9403278 (diff) | |
| download | monzero-core-79d46c4d551a9b1261801960095bf4d24967211a.tar.gz monzero-core-79d46c4d551a9b1261801960095bf4d24967211a.tar.xz monzero-core-79d46c4d551a9b1261801960095bf4d24967211a.zip | |
Merge pull request #4472
02d3ef7b blocks: use auto-generated .c files instead of 'LD -r -b binary' (xiphon)
Diffstat (limited to 'src/cryptonote_core/cryptonote_core.cpp')
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 69e3c708b..3882a14ae 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -389,7 +389,7 @@ namespace cryptonote return m_blockchain_storage.get_alternative_blocks_count(); } //----------------------------------------------------------------------------------------------- - bool core::init(const boost::program_options::variables_map& vm, const char *config_subdir, const cryptonote::test_options *test_options) + bool core::init(const boost::program_options::variables_map& vm, const char *config_subdir, const cryptonote::test_options *test_options, const GetCheckpointsCallback get_checkpoints/* = nullptr */) { start_time = std::time(nullptr); @@ -567,7 +567,7 @@ namespace cryptonote regtest_hard_forks }; const difficulty_type fixed_difficulty = command_line::get_arg(vm, arg_fixed_difficulty); - r = m_blockchain_storage.init(db.release(), m_nettype, m_offline, regtest ? ®test_test_options : test_options, fixed_difficulty); + r = m_blockchain_storage.init(db.release(), m_nettype, m_offline, regtest ? ®test_test_options : test_options, fixed_difficulty, get_checkpoints); r = m_mempool.init(max_txpool_weight); CHECK_AND_ASSERT_MES(r, false, "Failed to initialize memory pool"); |
