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

Merge pull request #4659

Browse Source 
b916ca63 rpc: fix output distribution caching ignoring chain changes (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-10-20 20:37:54 +02:00
commit 9f34a3a29a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rpc/core_rpc_server.cpp
View File

@ -2120,6 +2120,8 @@ namespace cryptonote
try try
{ {
// 0 is placeholder for the whole chain
const uint64_t req_to_height = req.to_height ? req.to_height : (m_core.get_current_blockchain_height() - 1);
for (uint64_t amount: req.amounts) for (uint64_t amount: req.amounts)
{ {
static struct D static struct D
@ -2132,7 +2134,7 @@ namespace cryptonote
} d; } d;
boost::unique_lock<boost::mutex> lock(d.mutex); boost::unique_lock<boost::mutex> lock(d.mutex);
if (d.cached && amount == 0 && d.cached_from == req.from_height && d.cached_to == req.to_height) if (d.cached && amount == 0 && d.cached_from == req.from_height && d.cached_to == req_to_height)
{ {
res.distributions.push_back({amount, d.cached_start_height, req.binary, d.cached_distribution, d.cached_base}); res.distributions.push_back({amount, d.cached_start_height, req.binary, d.cached_distribution, d.cached_base});
if (!req.cumulative) if (!req.cumulative)
@ -2147,23 +2149,23 @@ namespace cryptonote
std::vector<uint64_t> distribution; std::vector<uint64_t> distribution;
uint64_t start_height, base; uint64_t start_height, base;
if (!m_core.get_output_distribution(amount, req.from_height, req.to_height, start_height, distribution, base)) if (!m_core.get_output_distribution(amount, req.from_height, req_to_height, start_height, distribution, base))
{ {
error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR; error_resp.code = CORE_RPC_ERROR_CODE_INTERNAL_ERROR;
error_resp.message = "Failed to get rct distribution"; error_resp.message = "Failed to get rct distribution";
return false; return false;
} }
if (req.to_height > 0 && req.to_height >= req.from_height) if (req_to_height > 0 && req_to_height >= req.from_height)
{ {
uint64_t offset = std::max(req.from_height, start_height); uint64_t offset = std::max(req.from_height, start_height);
if (offset <= req.to_height && req.to_height - offset + 1 < distribution.size()) if (offset <= req_to_height && req_to_height - offset + 1 < distribution.size())
distribution.resize(req.to_height - offset + 1); distribution.resize(req_to_height - offset + 1);
} }
if (amount == 0) if (amount == 0)
{ {
d.cached_from = req.from_height; d.cached_from = req.from_height;
d.cached_to = req.to_height; d.cached_to = req_to_height;
d.cached_distribution = distribution; d.cached_distribution = distribution;
d.cached_start_height = start_height; d.cached_start_height = start_height;
d.cached_base = base; d.cached_base = base;