diff options
author | tobtoht <thotbot@protonmail.com> | 2021-06-04 15:02:06 +0200 |
---|---|---|
committer | selsta <selsta@sent.at> | 2021-08-07 03:04:04 +0200 |
commit | 49beb8da17ff2700ef96eddf9fca9f94ee3582a1 (patch) | |
tree | bb6c50cebeee6bf380900b31973d8ca05e76e1fd /src/device/device_ledger.cpp | |
parent | wallet_api: getPassword (diff) | |
download | monero-49beb8da17ff2700ef96eddf9fca9f94ee3582a1.tar.xz |
ledger: use software device if we have view key
Diffstat (limited to '')
-rw-r--r-- | src/device/device_ledger.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/device/device_ledger.cpp b/src/device/device_ledger.cpp index 3e0afeb65..b7c6fe94d 100644 --- a/src/device/device_ledger.cpp +++ b/src/device/device_ledger.cpp @@ -529,9 +529,7 @@ namespace hw { } bool device_ledger::init(void) { - #ifdef DEBUG_HWDEVICE this->controle_device = &hw::get_device("default"); - #endif this->release(); hw_device.init(); MDEBUG( "Device "<<this->id <<" HIDUSB inited"); @@ -750,6 +748,12 @@ namespace hw { } crypto::public_key device_ledger::get_subaddress_spend_public_key(const cryptonote::account_keys& keys, const cryptonote::subaddress_index &index) { + if (has_view_key) { + cryptonote::account_keys keys_{keys}; + keys_.m_view_secret_key = this->viewkey; + return this->controle_device->get_subaddress_spend_public_key(keys_, index); + } + AUTO_LOCK_CMD(); crypto::public_key D; @@ -801,6 +805,12 @@ namespace hw { } cryptonote::account_public_address device_ledger::get_subaddress(const cryptonote::account_keys& keys, const cryptonote::subaddress_index &index) { + if (has_view_key) { + cryptonote::account_keys keys_{keys}; + keys_.m_view_secret_key = this->viewkey; + return this->controle_device->get_subaddress(keys_, index); + } + AUTO_LOCK_CMD(); cryptonote::account_public_address address; |