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/rpc | |
| 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/rpc')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 2 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server_commands_defs.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 945557a46..57d3b0d0b 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -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; diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index 73cdbbe07..5ad4450d4 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -877,6 +877,7 @@ namespace cryptonote uint32_t threshold; uint8_t voting; uint32_t state; + uint64_t earliest_height; std::string status; BEGIN_KV_SERIALIZE_MAP() @@ -887,6 +888,7 @@ namespace cryptonote KV_SERIALIZE(threshold) KV_SERIALIZE(voting) KV_SERIALIZE(state) + KV_SERIALIZE(earliest_height) KV_SERIALIZE(status) END_KV_SERIALIZE_MAP() }; |