mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-25 13:54:31 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5159

Browse Source 
1d628550 blockchain: fix long term weight addition on pop/init (moneromooo-monero)
This commit is contained in:
Riccardo Spagni
2019-02-18 17:08:09 +02:00
parent 35616a71da 1d62855044
commit e81829bb52
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryptonote_core/blockchain.cpp
View File

@@ -512,7 +512,8 @@ bool Blockchain::init(BlockchainDB* db, const network_type nettype, bool offline
const uint64_t nblocks = std::min<uint64_t>(m_long_term_block_weights.capacity(), db_height);
while (m_long_term_block_weights.size() < nblocks)
{
m_long_term_block_weights.push_front(db_height - 1 - m_long_term_block_weights.size());
uint64_t weight = m_db->get_block_long_term_weight(db_height - 1 - m_long_term_block_weights.size());
m_long_term_block_weights.push_front(weight);
}
m_long_term_block_weights_height = db_height;
@@ -3646,7 +3647,8 @@ void Blockchain::pop_from_long_term_block_weights()
if (m_long_term_block_weights_height + 1 > m_long_term_block_weights.capacity())
{
uint64_t block_height = m_long_term_block_weights_height - m_long_term_block_weights.capacity() + 1;
m_long_term_block_weights.push_front(block_height);
uint64_t weight = m_db->get_block_long_term_weight(block_height);
m_long_term_block_weights.push_front(weight);
}
}
//------------------------------------------------------------------