Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-25 22:09:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4465

Browse Source 
1f8bfe7f wallet2: fix transfers between subaddresses hitting the sanity check (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-29 21:50:07 +02:00
commit 517faceb9e
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/wallet2.cpp
View File

@ -1455,10 +1455,14 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
} }
// remove change sent to the spending subaddress account from the list of received funds // remove change sent to the spending subaddress account from the list of received funds
uint64_t sub_change = 0;
for (auto i = tx_money_got_in_outs.begin(); i != tx_money_got_in_outs.end();) for (auto i = tx_money_got_in_outs.begin(); i != tx_money_got_in_outs.end();)
{ {
if (subaddr_account && i->first.major == *subaddr_account) if (subaddr_account && i->first.major == *subaddr_account)
{
sub_change += i->second;
i = tx_money_got_in_outs.erase(i); i = tx_money_got_in_outs.erase(i);
}
else else
++i; ++i;
} }
@ -1505,7 +1509,7 @@ void wallet2::process_new_transaction(const crypto::hash &txid, const cryptonote
LOG_PRINT_L2("Found unencrypted payment ID: " << payment_id); LOG_PRINT_L2("Found unencrypted payment ID: " << payment_id);
} }
uint64_t total_received_2 = 0; uint64_t total_received_2 = sub_change;
for (const auto& i : tx_money_got_in_outs) for (const auto& i : tx_money_got_in_outs)
total_received_2 += i.second; total_received_2 += i.second;
if (total_received_1 != total_received_2) if (total_received_1 != total_received_2)