4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 12:26:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1442

Browse Source 
dd144b14 blockchain: fix reorganizations past a hard fork boundary (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-12-13 10:24:25 +02:00
commit 2f2c6460ae
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cryptonote_core/blockchain.cpp
View File

@ -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)
{ {