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

updated to current monero master

This commit is contained in:
moneroexamples 2019-09-26 10:54:58 +08:00
parent e0b47695c0
commit 7dd08632c9
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

8
cmake/FindMonero.cmake
View File

@ -30,7 +30,8 @@
set(LIBS common;blocks;cryptonote_basic;cryptonote_core;multisig; set(LIBS common;blocks;cryptonote_basic;cryptonote_core;multisig;
cryptonote_protocol;daemonizer;mnemonics;epee;lmdb;device; cryptonote_protocol;daemonizer;mnemonics;epee;lmdb;device;
blockchain_db;ringct;wallet;cncrypto;easylogging;version;checkpoints) blockchain_db;ringct;wallet;cncrypto;easylogging;version;
checkpoints;randomx;hardforks)
set(Xmr_INCLUDE_DIRS "${CPP_MONERO_DIR}") set(Xmr_INCLUDE_DIRS "${CPP_MONERO_DIR}")
@ -44,7 +45,7 @@ foreach (l ${LIBS})
find_library(Xmr_${L}_LIBRARY find_library(Xmr_${L}_LIBRARY
NAMES ${l} NAMES ${l}
PATHS ${CMAKE_LIBRARY_PATH} 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 NO_DEFAULT_PATH
) )
@ -71,7 +72,8 @@ message(STATUS ${MONERO_SOURCE_DIR}/build)
include_directories( include_directories(
${MONERO_SOURCE_DIR}/src ${MONERO_SOURCE_DIR}/src
${MONERO_SOURCE_DIR}/external ${MONERO_SOURCE_DIR}/external
${MONERO_SOURCE_DIR}/external/randomx/src
${MONERO_SOURCE_DIR}/build ${MONERO_SOURCE_DIR}/build
${MONERO_SOURCE_DIR}/external/easylogging++ ${MONERO_SOURCE_DIR}/external/easylogging++
${MONERO_SOURCE_DIR}/contrib/epee/include ${MONERO_SOURCE_DIR}/contrib/epee/include
${MONERO_SOURCE_DIR}/external/db_drivers/liblmdb) ${MONERO_SOURCE_DIR}/external/db_drivers/liblmdb)

2
src/page.h
View File

@ -1292,7 +1292,7 @@ show_block(uint64_t _blk_height)
// initalise page tempate map with basic info about blockchain // initalise page tempate map with basic info about blockchain
string blk_pow_hash_str = pod_to_hex(get_block_longhash(blk, _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); cryptonote::difficulty_type blk_difficulty = core_storage->get_db().get_block_difficulty(_blk_height);
mstch::map context { mstch::map context {