diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-12-22 10:10:36 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-12-22 10:10:54 +0200 |
| commit | aa7d6c5412da29ec39bb4c9aaba7e45633d27547 (patch) | |
| tree | 3c85a553792605403878aa5e06067c641318a125 /src/cryptonote_core/blockchain.h | |
| parent | Merge pull request #546 (diff) | |
| parent | Allow the wallet to access hard fork information (diff) | |
| download | monero-aa7d6c5412da29ec39bb4c9aaba7e45633d27547.tar.xz | |
Merge pull request #547
8ea7af1 Allow the wallet to access hard fork information (moneromooo-monero)
760331b epee: make log macros behave like statements (moneromooo-monero)
3f2970f Add missing semicolons after log statements (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/blockchain.h')
| -rw-r--r-- | src/cryptonote_core/blockchain.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h index e8f5a7e5b..1efc4e394 100644 --- a/src/cryptonote_core/blockchain.h +++ b/src/cryptonote_core/blockchain.h @@ -162,7 +162,7 @@ namespace cryptonote 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 get_hard_fork_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint64_t &earliest_height, uint8_t &voting) const; bool for_all_key_images(std::function<bool(const crypto::key_image&)>) const; bool for_all_blocks(std::function<bool(uint64_t, const crypto::hash&, const block&)>) const; |