oxen-io
/
oxen-core
mirror of https://github.com/oxen-io/oxen-core.git
2
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fix double-counting in coinbase tx sum 

The coinbase tx sum rpc call had an off-by-one error that made it
double-count a block the first time it was reloaded at any height.  This
caused the deviation of oxen.observer and lokiblocks.com emissions
counts (because one is being called more frequently than the other), and
caused *both* to grow too quickly over time.
This commit is contained in:
Jason Rhinelander 2021-02-19 02:42:50 -04:00
parent 5b558aa230
commit e5dd9b389a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blockchain_db/blockchain_db.h
View File

@ -1711,7 +1711,7 @@ public:
* not found. Current implementations simply return false.
*
* @param h1 the start height
* @param h2 the end height
* @param h2 the end height (inclusive)
* @param std::function fn the function to run
*
* @return false if the function returns false for any block, otherwise true

10
src/cryptonote_core/cryptonote_core.cpp
View File

@ -1775,7 +1775,7 @@ namespace cryptonote
emission_amount = m_coinbase_cache.emissions;
total_fee_amount = m_coinbase_cache.fees;
burnt_oxen = m_coinbase_cache.burnt;
start_offset = m_coinbase_cache.height;
start_offset = m_coinbase_cache.height + 1;
count -= m_coinbase_cache.height;
}
// else don't change anything; we need a subset of blocks that ends before the cache.
@ -1792,12 +1792,12 @@ namespace cryptonote
if (m_coinbase_cache.building)
return std::nullopt; // Another thread is already updating the cache
if (m_coinbase_cache.height > start_offset) {
if (m_coinbase_cache.height >= start_offset) {
// Someone else updated the cache while we were acquiring the unique lock, so update our variables
if (m_coinbase_cache.height >= start_offset + count) {
// The cache is now *beyond* us, which means we can't use it, so reset start/count back
// to what they were originally.
count += start_offset;
count += start_offset - 1;
start_offset = 0;
cache_to = 0;
} else {
@ -1805,8 +1805,8 @@ namespace cryptonote
emission_amount = m_coinbase_cache.emissions;
total_fee_amount = m_coinbase_cache.fees;
burnt_oxen = m_coinbase_cache.burnt;
count -= m_coinbase_cache.height - start_offset;
start_offset = m_coinbase_cache.height;
count -= m_coinbase_cache.height - start_offset + 1;
start_offset = m_coinbase_cache.height + 1;
}
}
if (cache_to > 0 && count > CACHE_EXCLUSIVE) {