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/blockchain_utilities/blockchain_import.cpp | |
parent | Merge pull request #4526 (diff) | |
parent | blocks: use auto-generated .c files instead of 'LD -r -b binary' (diff) | |
download | monero-056a58d13fcb87b3eee8937146643e5e193a2790.tar.xz |
Merge pull request #4536
fd62b6e7 blocks: use auto-generated .c files instead of 'LD -r -b binary' (xiphon)
Diffstat (limited to '')
-rw-r--r-- | src/blockchain_utilities/blockchain_import.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/blockchain_utilities/blockchain_import.cpp b/src/blockchain_utilities/blockchain_import.cpp index 9ec768d26..7f92ecd87 100644 --- a/src/blockchain_utilities/blockchain_import.cpp +++ b/src/blockchain_utilities/blockchain_import.cpp @@ -37,6 +37,7 @@ #include "misc_log_ex.h" #include "bootstrap_file.h" #include "bootstrap_serialization.h" +#include "blocks/blocks.h" #include "cryptonote_basic/cryptonote_format_utils.h" #include "serialization/binary_utils.h" // dump_binary(), parse_binary() #include "serialization/json_utils.h" // dump_json() @@ -758,7 +759,12 @@ int main(int argc, char* argv[]) { core.disable_dns_checkpoints(true); - if (!core.init(vm, NULL)) +#if defined(PER_BLOCK_CHECKPOINT) + const GetCheckpointsCallback& get_checkpoints = blocks::GetCheckpointsData; +#else + const GetCheckpointsCallback& get_checkpoints = nullptr; +#endif + if (!core.init(vm, nullptr, nullptr, get_checkpoints)) { std::cerr << "Failed to initialize core" << ENDL; return 1; |