monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 03:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8902

Browse source 
c138a28 wallet2: take ignored-by-value outputs into account in balance (Crypto City)
This commit is contained in:
luigi1111 2023-07-06 21:36:19 -05:00
commit e67f82a164
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet2.cpp
View file

@ -6356,6 +6356,8 @@ std::map<uint32_t, uint64_t> wallet2::balance_per_subaddress(uint32_t index_majo
std::map<uint32_t, uint64_t> amount_per_subaddr; std::map<uint32_t, uint64_t> amount_per_subaddr;
for (const auto& td: m_transfers) for (const auto& td: m_transfers)
{ {
if (td.amount() > m_ignore_outputs_above || td.amount() < m_ignore_outputs_below)
continue;
if (td.m_subaddr_index.major == index_major && !is_spent(td, strict) && !td.m_frozen) if (td.m_subaddr_index.major == index_major && !is_spent(td, strict) && !td.m_frozen)
{ {
auto found = amount_per_subaddr.find(td.m_subaddr_index.minor); auto found = amount_per_subaddr.find(td.m_subaddr_index.minor);
@ -6411,6 +6413,8 @@ std::map<uint32_t, std::pair<uint64_t, std::pair<uint64_t, uint64_t>>> wallet2::
const uint64_t now = time(NULL); const uint64_t now = time(NULL);
for(const transfer_details& td: m_transfers) for(const transfer_details& td: m_transfers)
{ {
if (td.amount() > m_ignore_outputs_above || td.amount() < m_ignore_outputs_below)
continue;
if(td.m_subaddr_index.major == index_major && !is_spent(td, strict) && !td.m_frozen) if(td.m_subaddr_index.major == index_major && !is_spent(td, strict) && !td.m_frozen)
{ {
uint64_t amount = 0, blocks_to_unlock = 0, time_to_unlock = 0; uint64_t amount = 0, blocks_to_unlock = 0, time_to_unlock = 0;