d0s3t3ch/onion-wownero-blockchain-explorer
1
0
Fork 0
mirror of https://git.wownero.com/wownero/onion-wownero-blockchain-explorer.git synced 2024-08-15 00:33:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' into randomx

Browse source
This commit is contained in:
moneroexamples 2019-09-26 13:50:14 +08:00
commit 2e4086ba74
3 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

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

2
cmake/FindMonero.cmake
View file

@ -31,7 +31,7 @@
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; blockchain_db;ringct;wallet;cncrypto;easylogging;version;
checkpoints;randomx) checkpoints;randomx;hardforks)
set(Xmr_INCLUDE_DIRS "${CPP_MONERO_DIR}") set(Xmr_INCLUDE_DIRS "${CPP_MONERO_DIR}")

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 // initalise page tempate map with basic info about blockchain
string blk_pow_hash_str = pod_to_hex(get_block_longhash( string blk_pow_hash_str = pod_to_hex(get_block_longhash(core_storage, blk, _blk_height, 0));
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 {
{"testnet" , testnet}, {"testnet" , testnet},