aboutsummaryrefslogtreecommitdiff
path: root/src/device/device.hpp
diff options
context:
space:
mode:
authorstoffu <stoffu@protonmail.ch>2018-03-05 16:16:30 +0900
committerstoffu <stoffu@protonmail.ch>2018-03-14 21:00:15 +0900
commit27a196b1268718dbc41e308c93b35c58f2da2eb4 (patch)
treef3e28abc5ef6efc4fd25530fa9b86df6edde664b /src/device/device.hpp
parentdevice: made function prototypes consistent with pre-#3303 codebase (diff)
downloadmonero-27a196b1268718dbc41e308c93b35c58f2da2eb4.tar.xz
device: untangle cyclic depenency
When #3303 was merged, a cyclic dependency chain was generated: libdevice <- libcncrypto <- libringct <- libdevice This was because libdevice needs access to a set of basic crypto operations implemented in libringct such as scalarmultBase(), while libringct also needs access to abstracted crypto operations implemented in libdevice such as ecdhEncode(). To untangle this cyclic dependency chain, this patch splits libringct into libringct_basic and libringct, where the basic crypto ops previously in libringct are moved into libringct_basic. The cyclic dependency is now resolved thanks to this separation: libcncrypto <- libringct_basic <- libdevice <- libcryptonote_basic <- libringct This eliminates the need for crypto_device.cpp and rctOps_device.cpp. Also, many abstracted interfaces of hw::device such as encrypt_payment_id() and get_subaddress_secret_key() were previously implemented in libcryptonote_basic (cryptonote_format_utils.cpp) and were then called from hw::core::device_default, which is odd because libdevice is supposed to be independent of libcryptonote_basic. Therefore, those functions were moved to device_default.cpp.
Diffstat (limited to 'src/device/device.hpp')
-rw-r--r--src/device/device.hpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/device/device.hpp b/src/device/device.hpp
index 1d2181fa3..b47460472 100644
--- a/src/device/device.hpp
+++ b/src/device/device.hpp
@@ -44,9 +44,9 @@
#pragma once
-#include "cryptonote_basic/cryptonote_basic.h"
-#include "cryptonote_basic/account.h"
-#include "cryptonote_basic/subaddress_index.h"
+#include "crypto/crypto.h"
+#include "crypto/chacha.h"
+#include "ringct/rctTypes.h"
#ifndef USE_DEVICE_LEDGER
#define USE_DEVICE_LEDGER 1
@@ -61,6 +61,14 @@
#define WITH_DEVICE_LEDGER
#endif
+// forward declaration needed because this header is included by headers in libcryptonote_basic which depends on libdevice
+namespace cryptonote
+{
+ struct account_public_address;
+ struct account_keys;
+ struct subaddress_index;
+}
+
namespace hw {
namespace {
//device funcion not supported