diff options
| author | Javier Smooth <iamjaviersmooth@gmail.com> | 2015-11-13 00:24:47 -0800 |
|---|---|---|
| committer | Javier Smooth <iamjaviersmooth@gmail.com> | 2015-11-13 00:37:35 -0800 |
| commit | baf101ef4a05ae4d24ed717c16be929456775969 (patch) | |
| tree | 807afcbc2d1faf2f792a774d72a62ee835934092 /src/cryptonote_core/blockchain.h | |
| parent | Adjust difficulty target (2 min) and full reward zone (60 kbytes) for block v... (diff) | |
| download | monero-baf101ef4a05ae4d24ed717c16be929456775969.tar.xz | |
More changes for 2-min blocks
Use the correct block time for realtime fuzz on locktime
Use the correct block time to calculate next_difficulty on alt chains (will not work as-is with voting)
Lock unit tests to original block time for now
Diffstat (limited to 'src/cryptonote_core/blockchain.h')
| -rw-r--r-- | src/cryptonote_core/blockchain.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h index 00670c6d3..c83314634 100644 --- a/src/cryptonote_core/blockchain.h +++ b/src/cryptonote_core/blockchain.h @@ -160,6 +160,8 @@ namespace cryptonote HardFork::State get_hard_fork_state() const; uint8_t get_current_hard_fork_version() const { return m_hardfork->get_current_version(); } uint8_t get_ideal_hard_fork_version() const { return m_hardfork->get_ideal_version(); } + uint8_t get_ideal_hard_fork_version(uint64_t height) const { return m_hardfork->get_ideal_version(height); } + bool get_hard_fork_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint8_t &voting) const; bool for_all_key_images(std::function<bool(const crypto::key_image&)>) const; |