d0s3t3ch
/
onion-wownero-blockchain-explorer
mirror of https://git.wownero.com/wownero/onion-wownero-blockchain-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' into randomx

This commit is contained in:
moneroexamples 2019-09-26 13:50:14 +08:00
parent dc642db809 7dd08632c9
commit 2e4086ba74
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -140,6 +140,7 @@ set(LIBRARIES
checkpoints
version
epee
hardforks
randomx
sodium
${Boost_LIBRARIES}

4
cmake/FindMonero.cmake
View File

@ -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
)

8
src/page.h
View File

@ -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},