diff options
author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-12-19 14:52:30 +0000 |
---|---|---|
committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-12-19 14:52:30 +0000 |
commit | 8ea7af1ba3ea74be52893a38ab9c7d5afdc90926 (patch) | |
tree | 2b98b4f9c06f39097c162d24386a55bc1e67ea07 /src/cryptonote_core/hardfork.cpp | |
parent | epee: make log macros behave like statements (diff) | |
download | monero-8ea7af1ba3ea74be52893a38ab9c7d5afdc90926.tar.xz |
Allow the wallet to access hard fork information
And make it change behavior slightly when close/after first hard fork
Diffstat (limited to '')
-rw-r--r-- | src/cryptonote_core/hardfork.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/cryptonote_core/hardfork.cpp b/src/cryptonote_core/hardfork.cpp index 550047289..9bd4a337c 100644 --- a/src/cryptonote_core/hardfork.cpp +++ b/src/cryptonote_core/hardfork.cpp @@ -355,7 +355,16 @@ uint8_t HardFork::get_ideal_version(uint64_t height) const return original_version; } -bool HardFork::get_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint8_t &voting) const +uint64_t HardFork::get_earliest_ideal_height_for_version(uint8_t version) const +{ + for (unsigned int n = heights.size() - 1; n > 0; --n) { + if (heights[n].version <= version) + return heights[n].height; + } + return 0; +} + +bool HardFork::get_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint64_t &earliest_height, uint8_t &voting) const { CRITICAL_REGION_LOCAL(lock); @@ -367,6 +376,7 @@ bool HardFork::get_voting_info(uint8_t version, uint32_t &window, uint32_t &vote votes += last_versions[n]; threshold = (window * heights[current_version].threshold + 99) / 100; assert((votes >= threshold) == enabled); + earliest_height = get_earliest_ideal_height_for_version(version); voting = heights.back().version; return enabled; } |