monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-18 00:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

hardfork: fix off by one updating fork index after popping

Browse source
This commit is contained in:
moneromooo-monero 2019-04-19 23:55:04 +00:00
parent ef1f1c5314
commit 375fde9454
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/cryptonote_basic/hardfork.cpp
View file

@ -292,8 +292,7 @@ void HardFork::on_block_popped(uint64_t nblocks)
const uint64_t new_chain_height = db.height(); const uint64_t new_chain_height = db.height();
const uint64_t old_chain_height = new_chain_height + nblocks; const uint64_t old_chain_height = new_chain_height + nblocks;
uint8_t version; uint8_t version;
uint64_t height; for (uint64_t height = old_chain_height - 1; height >= new_chain_height; --height)
for (height = old_chain_height - 1; height >= new_chain_height; --height)
{ {
version = versions.back(); version = versions.back();
last_versions[version]--; last_versions[version]--;
@ -305,7 +304,7 @@ void HardFork::on_block_popped(uint64_t nblocks)
// does not take voting into account // does not take voting into account
for (current_fork_index = heights.size() - 1; current_fork_index > 0; --current_fork_index) for (current_fork_index = heights.size() - 1; current_fork_index > 0; --current_fork_index)
if (height >= heights[current_fork_index].height) if (new_chain_height >= heights[current_fork_index].height)
break; break;
} }