rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 18:53:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7418

Browse source 
68f1ca6 trezor: simplify recognition of integrated addresses (Dusan Klinec)
This commit is contained in:
luigi1111 2021-03-20 01:53:03 -04:00
commit 42987f93f4
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/device_trezor/trezor/protocol.cpp
View file

@ -502,21 +502,9 @@ namespace tx {
} }
void Signer::compute_integrated_indices(TsxData * tsx_data){ 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(); auto & chg = tsx_data->change_dts();
std::string change_hash = hash_addr(&chg.addr(), chg.amount(), chg.is_subaddress()); std::string change_hash = hash_addr(&chg.addr(), chg.amount(), chg.is_subaddress());
std::vector<uint32_t> integrated_indices; 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; ssize_t idx = -1;
for (auto & cur : tsx_data->outputs()){ for (auto & cur : tsx_data->outputs()){
@ -527,8 +515,7 @@ namespace tx {
continue; continue;
} }
c_hash = hash_addr(&cur.addr()); if (cur.is_integrated()){
if (integrated_hashes.find(c_hash) != integrated_hashes.end()){
integrated_indices.push_back((uint32_t)idx); integrated_indices.push_back((uint32_t)idx);
} }
} }