diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-10-26 22:20:39 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-10-26 22:20:39 +0200 |
| commit | 056a58d13fcb87b3eee8937146643e5e193a2790 (patch) | |
| tree | 96982bd0eb5499885f2e6b7bf3bb5c43ba1a2e73 /src/cryptonote_core/cryptonote_core.cpp | |
| parent | a91b432591f32a5199a6ddfa59027ea5cee9f9eb (diff) | |
| parent | fd62b6e79f87503bf27a3c8709aaf9cc4ae36146 (diff) | |
| download | monzero-core-056a58d13fcb87b3eee8937146643e5e193a2790.tar.gz monzero-core-056a58d13fcb87b3eee8937146643e5e193a2790.tar.xz monzero-core-056a58d13fcb87b3eee8937146643e5e193a2790.zip | |
Merge pull request #4536
fd62b6e7 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 735309aa9..d8c38bf9e 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"); |
