diff --git a/CMakeLists.txt b/CMakeLists.txt index 0bd8569..b70f0d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,6 +140,7 @@ set(LIBRARIES checkpoints version epee + hardforks randomx sodium ${Boost_LIBRARIES} diff --git a/cmake/FindMonero.cmake b/cmake/FindMonero.cmake index 67e8110..c65ecb3 100644 --- a/cmake/FindMonero.cmake +++ b/cmake/FindMonero.cmake @@ -31,7 +31,7 @@ set(LIBS common;blocks;cryptonote_basic;cryptonote_core;multisig; cryptonote_protocol;daemonizer;mnemonics;epee;lmdb;device; blockchain_db;ringct;wallet;cncrypto;easylogging;version; - checkpoints;randomx) + checkpoints;randomx;hardforks) set(Xmr_INCLUDE_DIRS "${CPP_MONERO_DIR}") @@ -45,7 +45,7 @@ foreach (l ${LIBS}) find_library(Xmr_${L}_LIBRARY NAMES ${l} PATHS ${CMAKE_LIBRARY_PATH} - PATH_SUFFIXES "/src/${l}" "/src/" "/external/db_drivers/lib${l}" "/lib" "/src/crypto" "/contrib/epee/src" "/external/easylogging++/" "/external/${l}" + PATH_SUFFIXES "/src/${l}" "/src/" "/external/db_drivers/lib${l}" "/lib" "/src/crypto" "/contrib/epee/src" "/external/easylogging++/" "/external/${l}" NO_DEFAULT_PATH ) diff --git a/src/page.h b/src/page.h index e71677a..8e5dfa9 100644 --- a/src/page.h +++ b/src/page.h @@ -1297,12 +1297,8 @@ show_block(uint64_t _blk_height) // initalise page tempate map with basic info about blockchain - string blk_pow_hash_str = pod_to_hex(get_block_longhash( - core_storage, blk, _blk_height, 0)); - - cryptonote::difficulty_type blk_difficulty - = core_storage->get_db().get_block_difficulty(_blk_height); - + string blk_pow_hash_str = pod_to_hex(get_block_longhash(core_storage, blk, _blk_height, 0)); + cryptonote::difficulty_type blk_difficulty = core_storage->get_db().get_block_difficulty(_blk_height); mstch::map context { {"testnet" , testnet},