diff options
author | luigi1111 <luigi1111w@gmail.com> | 2021-03-20 01:54:52 -0400 |
---|---|---|
committer | luigi1111 <luigi1111w@gmail.com> | 2021-03-20 01:54:52 -0400 |
commit | 9ec4ce36c7b46034933ec8a1eee70c49a0cb8afc (patch) | |
tree | 31a9131611d51fb5a7915d6903b2b17233db35e0 /src | |
parent | Merge pull request #7390 (diff) | |
parent | trezor: simplify recognition of integrated addresses (diff) | |
download | monero-9ec4ce36c7b46034933ec8a1eee70c49a0cb8afc.tar.xz |
Merge pull request #7419
25588de trezor: simplify recognition of integrated addresses (Dusan Klinec)
Diffstat (limited to 'src')
-rw-r--r-- | src/device_trezor/trezor/protocol.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/device_trezor/trezor/protocol.cpp b/src/device_trezor/trezor/protocol.cpp index 288f3ddca..92150b579 100644 --- a/src/device_trezor/trezor/protocol.cpp +++ b/src/device_trezor/trezor/protocol.cpp @@ -502,21 +502,9 @@ namespace tx { } void Signer::compute_integrated_indices(TsxData * tsx_data){ - if (m_aux_data == nullptr || m_aux_data->tx_recipients.empty()){ - return; - } - auto & chg = tsx_data->change_dts(); std::string change_hash = hash_addr(&chg.addr(), chg.amount(), chg.is_subaddress()); - std::vector<uint32_t> integrated_indices; - std::set<std::string> integrated_hashes; - for (auto & cur : m_aux_data->tx_recipients){ - if (!cur.has_payment_id){ - continue; - } - integrated_hashes.emplace(hash_addr(&cur.address.m_spend_public_key, &cur.address.m_view_public_key)); - } ssize_t idx = -1; for (auto & cur : tsx_data->outputs()){ @@ -527,8 +515,7 @@ namespace tx { continue; } - c_hash = hash_addr(&cur.addr()); - if (integrated_hashes.find(c_hash) != integrated_hashes.end()){ + if (cur.is_integrated()){ integrated_indices.push_back((uint32_t)idx); } } |