From 2f254ff5999f1b814a91c33f982cb2fc0844ec66 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Mon, 9 Nov 2015 21:22:32 +0000 Subject: hardfork: add a get_ideal_version(uint64_t) function It returns the ideal version for a given height, which is based on the minimum height for a fork, disregarding votes --- src/cryptonote_core/hardfork.cpp | 11 +++++++++++ src/cryptonote_core/hardfork.h | 7 +++++++ 2 files changed, 18 insertions(+) (limited to 'src/cryptonote_core') diff --git a/src/cryptonote_core/hardfork.cpp b/src/cryptonote_core/hardfork.cpp index 45d623ca9..edc2f33a9 100644 --- a/src/cryptonote_core/hardfork.cpp +++ b/src/cryptonote_core/hardfork.cpp @@ -337,6 +337,17 @@ uint8_t HardFork::get_ideal_version() const return heights.back().version; } +uint8_t HardFork::get_ideal_version(uint64_t height) const +{ + CRITICAL_REGION_LOCAL(lock); + for (unsigned int n = heights.size() - 1; n > 0; --n) { + if (height >= heights[n].height) { + return heights[n].version; + } + } + return original_version; +} + bool HardFork::get_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint8_t &voting) const { CRITICAL_REGION_LOCAL(lock); diff --git a/src/cryptonote_core/hardfork.h b/src/cryptonote_core/hardfork.h index f44d20f8e..6800749da 100644 --- a/src/cryptonote_core/hardfork.h +++ b/src/cryptonote_core/hardfork.h @@ -167,6 +167,13 @@ namespace cryptonote */ uint8_t get_ideal_version() const; + /** + * @brief returns the "ideal" version for a given height + * + * @param height height of the block to check + */ + uint8_t get_ideal_version(uint64_t height) const; + /** * @brief returns the current version * -- cgit v1.2.3