Merge pull request #1442

dd144b14 blockchain: fix reorganizations past a hard fork boundary (moneromooo-monero)
2016-12-13 10:24:25 +02:00 · 2016-12-13 10:24:25 +02:00 · 2f2c6460ae
commit 2f2c6460ae
parent c03da2b2dd dd144b14bc
1 changed files with 3 additions and 0 deletions
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@ -759,6 +759,9 @@ bool Blockchain::rollback_blockchain_switching(std::list<block>& original_chain,
    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
  for (auto& bl : original_chain)
  {