rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-27 05:13:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4369

Browse Source 
b2bb9312 blockchain: simplify output distribution code (moneromooo-monero)
befdcbf4 db_lmdb: do not use base for cumulative distribution (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-09-21 20:31:21 +02:00
commit d6893aedf6
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blockchain_db/lmdb/db_lmdb.cpp
View File

@ -3391,8 +3391,10 @@ bool BlockchainLMDB::get_output_distribution(uint64_t amount, uint64_t from_heig
break; break;
} }
distribution[0] += base;
for (size_t n = 1; n < distribution.size(); ++n) for (size_t n = 1; n < distribution.size(); ++n)
distribution[n] += distribution[n - 1]; distribution[n] += distribution[n - 1];
base = 0;
TXN_POSTFIX_RDONLY(); TXN_POSTFIX_RDONLY();

9
src/cryptonote_core/blockchain.cpp
View File

@ -1818,15 +1818,10 @@ bool Blockchain::get_output_distribution(uint64_t amount, uint64_t from_height,
{ {
std::vector<uint64_t> heights; std::vector<uint64_t> heights;
heights.reserve(to_height + 1 - start_height); heights.reserve(to_height + 1 - start_height);
uint64_t real_start_height = start_height > 0 ? start_height-1 : start_height; for (uint64_t h = start_height; h <= to_height; ++h)
for (uint64_t h = real_start_height; h <= to_height; ++h)
heights.push_back(h); heights.push_back(h);
distribution = m_db->get_block_cumulative_rct_outputs(heights); distribution = m_db->get_block_cumulative_rct_outputs(heights);
if (start_height > 0) base = 0;
{
base = distribution[0];
distribution.erase(distribution.begin());
}
return true; return true;
} }
else else