diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-04-12 14:41:51 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-04-12 14:41:51 +0200 |
| commit | 079dd5dfefbb6da1e86d4dec2ad0d9a8acc0e593 (patch) | |
| tree | dfc70af05997d97a5ad43ef77a364b8f86ade611 /src/device/device_default.hpp | |
| parent | Merge pull request #3549 (diff) | |
| parent | Use 'boost' mutex instead of 'std' mutex (diff) | |
| download | monero-079dd5dfefbb6da1e86d4dec2ad0d9a8acc0e593.tar.xz | |
Merge pull request #3616
94b899db Use 'boost' mutex instead of 'std' mutex (cslashm)
2c274e05 Fix sub-address tx scan. (cslashm)
Diffstat (limited to 'src/device/device_default.hpp')
| -rw-r--r-- | src/device/device_default.hpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/device/device_default.hpp b/src/device/device_default.hpp index 53942f53a..649fed862 100644 --- a/src/device/device_default.hpp +++ b/src/device/device_default.hpp @@ -93,6 +93,7 @@ namespace hw { bool sc_secret_add(crypto::secret_key &r, const crypto::secret_key &a, const crypto::secret_key &b) override; crypto::secret_key generate_keys(crypto::public_key &pub, crypto::secret_key &sec, const crypto::secret_key& recovery_key = crypto::secret_key(), bool recover = false) override; bool generate_key_derivation(const crypto::public_key &pub, const crypto::secret_key &sec, crypto::key_derivation &derivation) override; + bool conceal_derivation(crypto::key_derivation &derivation, const crypto::public_key &tx_pub_key, const std::vector<crypto::public_key> &additional_tx_pub_keys, const crypto::key_derivation &main_derivation, const std::vector<crypto::key_derivation> &additional_derivations); bool derivation_to_scalar(const crypto::key_derivation &derivation, const size_t output_index, crypto::ec_scalar &res) override; bool derive_secret_key(const crypto::key_derivation &derivation, const std::size_t output_index, const crypto::secret_key &sec, crypto::secret_key &derived_sec) override; bool derive_public_key(const crypto::key_derivation &derivation, const std::size_t output_index, const crypto::public_key &pub, crypto::public_key &derived_pub) override; |