monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-24 20:49:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2718

Browse source 
626e8078 wallet2: fix show_transfers missing multiple incoming outputs (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-10-31 20:33:44 +02:00
commit c97fbb0176
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View file

@ -788,7 +788,7 @@ void wallet2::scan_output(const cryptonote::account_keys &keys, const cryptonote
{ {
tx_scan_info.money_transfered = tools::decodeRct(tx.rct_signatures, tx_scan_info.received->derivation, i, tx_scan_info.mask); tx_scan_info.money_transfered = tools::decodeRct(tx.rct_signatures, tx_scan_info.received->derivation, i, tx_scan_info.mask);
} }
tx_money_got_in_outs[tx_scan_info.received->index] = tx_scan_info.money_transfered; tx_money_got_in_outs[tx_scan_info.received->index] += tx_scan_info.money_transfered;
tx_scan_info.amount = tx_scan_info.money_transfered; tx_scan_info.amount = tx_scan_info.money_transfered;
++num_vouts_received; ++num_vouts_received;
} }
@ -1520,7 +1520,7 @@ void wallet2::pull_next_blocks(uint64_t start_height, uint64_t &blocks_start_hei
void wallet2::remove_obsolete_pool_txs(const std::vector<crypto::hash> &tx_hashes) void wallet2::remove_obsolete_pool_txs(const std::vector<crypto::hash> &tx_hashes)
{ {
// remove pool txes to us that aren't in the pool anymore // remove pool txes to us that aren't in the pool anymore
std::unordered_map<crypto::hash, wallet2::payment_details>::iterator uit = m_unconfirmed_payments.begin(); std::unordered_multimap<crypto::hash, wallet2::payment_details>::iterator uit = m_unconfirmed_payments.begin();
while (uit != m_unconfirmed_payments.end()) while (uit != m_unconfirmed_payments.end())
{ {
const crypto::hash &txid = uit->second.m_tx_hash; const crypto::hash &txid = uit->second.m_tx_hash;