diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-15 15:02:26 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-15 15:02:26 +0200 |
| commit | 15e0cbd01ec3a754b9e942680eae71bf736aa073 (patch) | |
| tree | b8d52f37a41b97f845f270ffc43188f847f4974f /src | |
| parent | Merge pull request #609 (diff) | |
| parent | hardfork: fix accepting v2 blocks too early (diff) | |
| download | monero-15e0cbd01ec3a754b9e942680eae71bf736aa073.tar.xz | |
Merge pull request #610
945ac78 hardfork: fix accepting v2 blocks too early (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/cryptonote_core/hardfork.cpp | 3 |
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; } |