mirror of
https://codeberg.org/anoncontributorxmr/monero.git
synced 2024-11-30 03:03:17 +00:00
wallet2: avoid growing the short history when refreshing in a loop
This commit is contained in:
parent
f48aeab5c4
commit
99f398a25e
1 changed files with 17 additions and 10 deletions
|
@ -468,6 +468,19 @@ static void emplace_or_replace(std::unordered_multimap<crypto::hash, tools::wall
|
||||||
container.emplace(key, pd);
|
container.emplace(key, pd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void drop_from_short_history(std::list<crypto::hash> &short_chain_history, size_t N)
|
||||||
|
{
|
||||||
|
std::list<crypto::hash>::iterator right;
|
||||||
|
// drop early N off, skipping the genesis block
|
||||||
|
if (short_chain_history.size() > N) {
|
||||||
|
right = short_chain_history.end();
|
||||||
|
std::advance(right,-1);
|
||||||
|
std::list<crypto::hash>::iterator left = right;
|
||||||
|
std::advance(left, -N);
|
||||||
|
short_chain_history.erase(left, right);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} //namespace
|
} //namespace
|
||||||
|
|
||||||
namespace tools
|
namespace tools
|
||||||
|
@ -1521,6 +1534,8 @@ void wallet2::pull_next_blocks(uint64_t start_height, uint64_t &blocks_start_hei
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
drop_from_short_history(short_chain_history, 3);
|
||||||
|
|
||||||
// prepend the last 3 blocks, should be enough to guard against a block or two's reorg
|
// prepend the last 3 blocks, should be enough to guard against a block or two's reorg
|
||||||
cryptonote::block bl;
|
cryptonote::block bl;
|
||||||
std::list<cryptonote::block_complete_entry>::const_reverse_iterator i = prev_blocks.rbegin();
|
std::list<cryptonote::block_complete_entry>::const_reverse_iterator i = prev_blocks.rbegin();
|
||||||
|
@ -1810,16 +1825,8 @@ void wallet2::fast_refresh(uint64_t stop_height, uint64_t &blocks_start_height,
|
||||||
if (hashes.size() <= 3)
|
if (hashes.size() <= 3)
|
||||||
return;
|
return;
|
||||||
if (hashes.size() + current_index < stop_height) {
|
if (hashes.size() + current_index < stop_height) {
|
||||||
std::list<crypto::hash>::iterator right;
|
drop_from_short_history(short_chain_history, 3);
|
||||||
// drop early 3 off, skipping the genesis block
|
std::list<crypto::hash>::iterator right = hashes.end();
|
||||||
if (short_chain_history.size() > 3) {
|
|
||||||
right = short_chain_history.end();
|
|
||||||
std::advance(right,-1);
|
|
||||||
std::list<crypto::hash>::iterator left = right;
|
|
||||||
std::advance(left, -3);
|
|
||||||
short_chain_history.erase(left, right);
|
|
||||||
}
|
|
||||||
right = hashes.end();
|
|
||||||
// prepend 3 more
|
// prepend 3 more
|
||||||
for (int i = 0; i<3; i++) {
|
for (int i = 0; i<3; i++) {
|
||||||
right--;
|
right--;
|
||||||
|
|
Loading…
Reference in a new issue