From 605c6caf281e2f8c2f6a7bfd21634b510d1d1e9f Mon Sep 17 00:00:00 2001 From: moneroexamples Date: Mon, 5 Mar 2018 08:07:27 +0800 Subject: [PATCH] fix: compile with new device monero functionality --- CMakeLists.txt | 3 +++ cmake/FindMonero.cmake | 4 ++-- src/tools.cpp | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d14ba69..fc6fb68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,12 +110,15 @@ set(LIBRARIES blocks lmdb ringct + device common mnemonics easylogging checkpoints version + epee_readline epee + readline ${Boost_LIBRARIES} pthread unbound diff --git a/cmake/FindMonero.cmake b/cmake/FindMonero.cmake index 12d62ca..fed48ce 100644 --- a/cmake/FindMonero.cmake +++ b/cmake/FindMonero.cmake @@ -28,8 +28,8 @@ # (c) 2014-2016 cpp-ethereum contributors. #------------------------------------------------------------------------------ -set(LIBS common;blocks;cryptonote_basic;cryptonote_core; - cryptonote_protocol;daemonizer;mnemonics;epee;lmdb; +set(LIBS common;blocks;cryptonote_basic;cryptonote_core;epee_readline; + cryptonote_protocol;daemonizer;mnemonics;epee;lmdb;device; blockchain_db;ringct;wallet;cncrypto;easylogging;version;checkpoints) set(Xmr_INCLUDE_DIRS "${CPP_MONERO_DIR}") diff --git a/src/tools.cpp b/src/tools.cpp index 89049b4..fe680b4 100644 --- a/src/tools.cpp +++ b/src/tools.cpp @@ -937,14 +937,16 @@ decode_ringct(rct::rctSig const& rv, amount = rct::decodeRctSimple(rv, rct::sk2rct(scalar1), i, - mask); + mask, + hw::get_device("default")); break; case rct::RCTTypeFull: case rct::RCTTypeFullBulletproof: amount = rct::decodeRct(rv, rct::sk2rct(scalar1), i, - mask); + mask, + hw::get_device("default")); break; default: cerr << "Unsupported rct type: " << rv.type << '\n';