From 7dd08632c920c3647b68327e5a73e1dfb0b11ea5 Mon Sep 17 00:00:00 2001
From: moneroexamples <moneroexamples@tuta.io>
Date: Thu, 26 Sep 2019 10:54:58 +0800
Subject: [PATCH] updated to current monero master

---
 CMakeLists.txt         | 2 ++
 cmake/FindMonero.cmake | 8 +++++---
 src/page.h             | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 16c85ce..b70f0d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,6 +140,8 @@ set(LIBRARIES
         checkpoints
         version
         epee
+        hardforks
+        randomx
         sodium
         ${Boost_LIBRARIES}
         pthread
diff --git a/cmake/FindMonero.cmake b/cmake/FindMonero.cmake
index dac1cbb..c38265a 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;hardforks)
 
 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
 	)
 
@@ -71,7 +72,8 @@ message(STATUS ${MONERO_SOURCE_DIR}/build)
 include_directories(
 		${MONERO_SOURCE_DIR}/src
 		${MONERO_SOURCE_DIR}/external
+        ${MONERO_SOURCE_DIR}/external/randomx/src
 		${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 f885276..dad2ba0 100644
--- a/src/page.h
+++ b/src/page.h
@@ -1292,7 +1292,7 @@ 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));
+    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 {