Merge pull request #537

a74cc1b hardfork: only accept major versions we know about (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-12-15 15:23:59 +02:00
commit 4550717464
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -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 bool HardFork::do_check(uint8_t block_version, uint8_t voting_version) const
{ {
return block_version >= heights[current_fork_index].version return block_version >= heights[current_fork_index].version
&& block_version <= get_ideal_version()
&& voting_version >= heights[current_fork_index].version; && voting_version >= heights[current_fork_index].version;
} }