aboutsummaryrefslogtreecommitdiff
path: root/src/device/device_default.hpp
diff options
context:
space:
mode:
authorCédric <cslashm@gmail.com>2018-03-05 14:46:15 +0100
committercslashm <cslashm@gmail.com>2018-03-12 10:43:06 +0100
commit73dd883d5112e2e8be1a465aca3b3fb48b651afd (patch)
tree612da8e64d9b036f1934174ab766befa9a0324b7 /src/device/device_default.hpp
parentMerge pull request #3368 (diff)
downloadmonero-73dd883d5112e2e8be1a465aca3b3fb48b651afd.tar.xz
Ledger HW Bug fixes
Fix the way the REAL mode is handle: Let create_transactions_2 and create_transactions_from construct the vector of transactions. Then iterate on it and resign. We just need to add 'outs' list in the TX struct for that. Fix default secret keys value when DEBUG_HWDEVICE mode is off The magic value (00...00 for view key and FF..FF for spend key) was not correctly set when DEBUG_HWDEVICE was off. Both was set to 00...00. Add sub-address info in ABP map in order to correctly display destination sub-address on device Fix DEBUG_HWDEVICE mode: - Fix compilation errors. - Fix control device init in ledger device. - Add more log. Fix sub addr control Fix debug Info
Diffstat (limited to 'src/device/device_default.hpp')
-rw-r--r--src/device/device_default.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/device/device_default.hpp b/src/device/device_default.hpp
index f5b158a3b..d7fc2b914 100644
--- a/src/device/device_default.hpp
+++ b/src/device/device_default.hpp
@@ -105,8 +105,8 @@ namespace hw {
bool ecdhEncode(rct::ecdhTuple & unmasked, const rct::key & sharedSec) override;
bool ecdhDecode(rct::ecdhTuple & masked, const rct::key & sharedSec) override;
- bool add_output_key_mapping(const crypto::public_key &Aout, const crypto::public_key &Bout, size_t real_output_index,
- const rct::key &amount_key, const crypto::public_key &out_eph_public_key) override;
+ bool add_output_key_mapping(const crypto::public_key &Aout, const crypto::public_key &Bout, const bool is_subaddress, const size_t real_output_index,
+ const rct::key &amount_key, const crypto::public_key &out_eph_public_key) override;
bool mlsag_prehash(const std::string &blob, size_t inputs_size, size_t outputs_size, const rct::keyV &hashes, const rct::ctkeyV &outPk, rct::key &prehash) override;