aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core/blockchain.cpp
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-12-19 14:52:30 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-12-19 14:52:30 +0000
commit8ea7af1ba3ea74be52893a38ab9c7d5afdc90926 (patch)
tree2b98b4f9c06f39097c162d24386a55bc1e67ea07 /src/cryptonote_core/blockchain.cpp
parentepee: make log macros behave like statements (diff)
downloadmonero-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 'src/cryptonote_core/blockchain.cpp')
-rw-r--r--src/cryptonote_core/blockchain.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 55571f57b..badccd06f 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -3173,9 +3173,9 @@ HardFork::State Blockchain::get_hard_fork_state() const
return m_hardfork->get_state();
}
-bool Blockchain::get_hard_fork_voting_info(uint8_t version, uint32_t &window, uint32_t &votes, uint32_t &threshold, uint8_t &voting) const
+bool Blockchain::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
{
- return m_hardfork->get_voting_info(version, window, votes, threshold, voting);
+ return m_hardfork->get_voting_info(version, window, votes, threshold, earliest_height, voting);
}
bool Blockchain::for_all_key_images(std::function<bool(const crypto::key_image&)> f) const