diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-12-13 10:24:25 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-12-13 10:24:25 +0200 |
| commit | 2f2c6460ae795ae37007ce9835417d0f01611625 (patch) | |
| tree | a246c1c679a2e6d17048b42b26f8733677c94c0c /src/cryptonote_core | |
| parent | c03da2b2ddc7c64fc3db5ec3ff0ac2ee6068eb55 (diff) | |
| parent | dd144b14bcdcd7679d201e762a1165dcdea13c29 (diff) | |
| download | monzero-core-2f2c6460ae795ae37007ce9835417d0f01611625.tar.gz monzero-core-2f2c6460ae795ae37007ce9835417d0f01611625.tar.xz monzero-core-2f2c6460ae795ae37007ce9835417d0f01611625.zip | |
Merge pull request #1442
dd144b14 blockchain: fix reorganizations past a hard fork boundary (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index efda3f5cf..70b2ccc79 100644 --- 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) { |