gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-01 23:40:03 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #547

Browse Source 
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)
This commit is contained in:
Riccardo Spagni
2015-12-22 10:10:36 +02:00
parent cab57ca49d 8ea7af1ba3
commit aa7d6c5412
16 changed files with 97 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/core_rpc_server.cpp
View File

@@ -897,7 +897,7 @@ namespace cryptonote
const Blockchain &blockchain = m_core.get_blockchain_storage();
uint8_t version = req.version > 0 ? req.version : blockchain.get_ideal_hard_fork_version();
res.version = blockchain.get_current_hard_fork_version();
res.enabled = blockchain.get_hard_fork_voting_info(version, res.window, res.votes, res.threshold, res.voting);
res.enabled = blockchain.get_hard_fork_voting_info(version, res.window, res.votes, res.threshold, res.earliest_height, res.voting);
res.state = blockchain.get_hard_fork_state();
res.status = CORE_RPC_STATUS_OK;
return true;