From de73d22d3175d4a7e1c1c4bc20456fbc2f3ff2fb Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Sun, 19 May 2019 12:26:53 +0800 Subject: [PATCH] compile against randomx --- CMakeLists.txt | 1 + cmake/FindMonero.cmake | 7 ++++--- src/page.h | 7 +++++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2833d93..92c8179 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,6 +128,7 @@ set(LIBRARIES checkpoints version epee + randomx sodium ${Boost_LIBRARIES} pthread diff --git a/cmake/FindMonero.cmake b/cmake/FindMonero.cmake index dac1cbb..044ea9e 100644 --- a/cmake/FindMonero.cmake +++ b/cmake/FindMonero.cmake @@ -30,7 +30,8 @@ set(LIBS common;blocks;cryptonote_basic;cryptonote_core;multisig; cryptonote_protocol;daemonizer;mnemonics;epee;lmdb;device; - blockchain_db;ringct;wallet;cncrypto;easylogging;version;checkpoints) + blockchain_db;ringct;wallet;cncrypto;easylogging;version; + checkpoints;randomx) set(Xmr_INCLUDE_DIRS "${CPP_MONERO_DIR}") @@ -44,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++/" + PATH_SUFFIXES "/src/${l}" "/src/" "/external/db_drivers/lib${l}" "/lib" "/src/crypto" "/contrib/epee/src" "/external/easylogging++/" "/external/${l}" NO_DEFAULT_PATH ) @@ -74,4 +75,4 @@ include_directories( ${MONERO_SOURCE_DIR}/build ${MONERO_SOURCE_DIR}/external/easylogging++ ${MONERO_SOURCE_DIR}/contrib/epee/include - ${MONERO_SOURCE_DIR}/external/db_drivers/liblmdb) \ No newline at end of file + ${MONERO_SOURCE_DIR}/external/db_drivers/liblmdb) diff --git a/src/page.h b/src/page.h index a148821..9dbbedc 100644 --- a/src/page.h +++ b/src/page.h @@ -1290,8 +1290,11 @@ 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(blk, _blk_height)); - 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},