diff options
author | Riccardo Spagni <ric@spagni.net> | 2015-12-15 15:23:59 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2015-12-15 15:24:56 +0200 |
commit | 45507174641976816e0ccb30fb2598332171889f (patch) | |
tree | c86d5906047ec15133ad4d4411bba75ccbc55360 | |
parent | Merge pull request #535 (diff) | |
parent | hardfork: only accept major versions we know about (diff) | |
download | monero-45507174641976816e0ccb30fb2598332171889f.tar.xz |
Merge pull request #537
a74cc1b hardfork: only accept major versions we know about (moneromooo-monero)
Diffstat (limited to '')
-rw-r--r-- | src/cryptonote_core/hardfork.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cryptonote_core/hardfork.cpp b/src/cryptonote_core/hardfork.cpp index 2a2e25635..550047289 100644 --- a/src/cryptonote_core/hardfork.cpp +++ b/src/cryptonote_core/hardfork.cpp @@ -105,6 +105,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() && voting_version >= heights[current_fork_index].version; } |