Merge pull request #651

5cb03a1 unit_tests: fix blockchain unit test after hard fork import fix (moneromooo-monero)
759383c hardfork: add a default fork entry for v1 if none exist (moneromooo-monero)
c7f82ec blockchain: initialize m_hardfork to NULL (moneromooo-monero)
8649b9f blockchain_db: pass hard fork object as a simple pointer (moneromooo-monero)
a333c42 core_tests: add tests for hard fork behaviors (MRL-0004) (moneromooo-monero)
945fe90 core_tests: allow setting miner tx max_outs when creating a block (moneromooo-monero)
8e4c2e6 unit_tests: fix hard fork unit test compilation (moneromooo-monero)
9ef5794 blockchain_utilities: remove unused num_blocks variable (moneromooo-monero)
6c8e5c3 blockchain: reset hardfork object when resetting blockchain (moneromooo-monero)

1 files changed, 5 insertions, 0 deletions

diff --git a/src/cryptonote_core/hardfork.cpp b/src/cryptonote_core/hardfork.cpp
index 9fe731ad1..e99736ff4 100644
--- a/src/cryptonote_core/hardfork.cpp
+++ b/src/cryptonote_core/hardfork.cpp
@@ -155,6 +155,11 @@ bool HardFork::add(const cryptonote::block &block, uint64_t height)
 void HardFork::init()
 {
   CRITICAL_REGION_LOCAL(lock);
+
+  // add a placeholder for the default version, to avoid special cases
+  if (heights.empty())
+    heights.push_back(Params(original_version, 0, 0, 0));
+
   versions.clear();
   for (size_t n = 0; n < 256; ++n)
     last_versions[n] = 0;