mirror of
https://github.com/monero-project/monero.git
synced 2024-12-29 10:56:14 -05:00
blockchain: fix reorganizations past a hard fork boundary
After popping blocks from the old chain, the hard fork object's notion of the current version was not in line with the new height, causing the first blocks from the new chain to be rejected due to a false expection of a newer version.
This commit is contained in:
parent
1a286061ff
commit
dd144b14bc
@ -759,6 +759,9 @@ bool Blockchain::rollback_blockchain_switching(std::list<block>& original_chain,
|
|||||||
pop_block_from_blockchain();
|
pop_block_from_blockchain();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// make sure the hard fork object updates its current version
|
||||||
|
m_hardfork->reorganize_from_chain_height(rollback_height);
|
||||||
|
|
||||||
//return back original chain
|
//return back original chain
|
||||||
for (auto& bl : original_chain)
|
for (auto& bl : original_chain)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user