Merge pull request #610

945ac78 hardfork: fix accepting v2 blocks too early (moneromooo-monero)
2016-01-15 15:02:26 +02:00 · 2016-01-15 15:02:26 +02:00 · 15e0cbd01e
parent b085fbc667 945ac788d4
commit 15e0cbd01e
1 changed files with 1 additions and 2 deletions
--- a/src/cryptonote_core/hardfork.cpp
+++ b/src/cryptonote_core/hardfork.cpp
@ -104,8 +104,7 @@ uint8_t HardFork::get_effective_version(uint8_t voting_version) const

 bool HardFork::do_check(uint8_t block_version, uint8_t voting_version) const
 {
-  return block_version >= heights[current_fork_index].version
-      && block_version <= get_ideal_version()
+  return block_version == heights[current_fork_index].version
      && voting_version >= heights[current_fork_index].version;
 }