aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-01-15 11:34:22 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-01-15 11:54:35 +0000
commit945ac788d488eb1907b0fdb037e1a212b4161af8 (patch)
treecdcdadc99da2c368c16b59c28f86651e1190135f /src/cryptonote_core
parentMerge branch 'LMDB-tweaks' (diff)
downloadmonero-945ac788d488eb1907b0fdb037e1a212b4161af8.tar.xz
hardfork: fix accepting v2 blocks too early
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/hardfork.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/cryptonote_core/hardfork.cpp b/src/cryptonote_core/hardfork.cpp
index 4d466515b..463d9c065 100644
--- 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;
}