diff --git a/CMakeLists.txt b/CMakeLists.txt index 70d3c7d..5959be9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,8 +143,9 @@ set(LIBRARIES device ${WALLET_CRYPTO} cryptonote_core - cryptonote_protocol cryptonote_basic + cryptonote_format_utils_basic + cryptonote_protocol multisig daemonizer blocks diff --git a/cmake/FindMonero.cmake b/cmake/FindMonero.cmake index f9b73ae..5fdaa6b 100644 --- a/cmake/FindMonero.cmake +++ b/cmake/FindMonero.cmake @@ -67,6 +67,13 @@ if (EXISTS ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a) PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/src/ringct/libringct_basic.a) endif() +if (EXISTS ${MONERO_BUILD_DIR}/src/cryptonote_basic/libcryptonote_format_utils_basic.a) + message(STATUS FindMonero " found libcryptonote_format_utils_basic.a") + add_library(cryptonote_format_utils_basic STATIC IMPORTED) + set_property(TARGET cryptonote_format_utils_basic + PROPERTY IMPORTED_LOCATION ${MONERO_BUILD_DIR}/src/cryptonote_basic/libcryptonote_format_utils_basic.a) +endif() + message(STATUS ${MONERO_SOURCE_DIR}/build) diff --git a/src/page.h b/src/page.h index dbd513f..9a1e400 100644 --- a/src/page.h +++ b/src/page.h @@ -1446,7 +1446,8 @@ show_block_hex(size_t block_height, bool complete_blk) return string {"Failed to obtain complete block data "}; } - std::string complete_block_data_str; + //epee::byte_slice complete_block_data_slice; + std::string complete_block_data_str; if(!epee::serialization::store_t_to_binary( complete_block_data, complete_block_data_str)) @@ -1455,6 +1456,12 @@ show_block_hex(size_t block_height, bool complete_blk) return string {"Failed to obtain complete block data"}; } + //std::string block_data_str( + // complete_block_data_slice.begin(), + // complete_block_data_slice.end()); + + //return epee::string_tools + // ::buff_to_hex_nodelimer(block_data_str); return epee::string_tools ::buff_to_hex_nodelimer(complete_block_data_str); }