diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-12-19 14:52:30 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2015-12-19 14:52:30 +0000 |
| commit | 8ea7af1ba3ea74be52893a38ab9c7d5afdc90926 (patch) | |
| tree | 2b98b4f9c06f39097c162d24386a55bc1e67ea07 /src/rpc | |
| parent | epee: make log macros behave like statements (diff) | |
| download | monero-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/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 b566e7318..e3e250a8e 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -890,7 +890,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 b70164614..dbb274c50 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -875,6 +875,7 @@ namespace cryptonote uint32_t threshold; uint8_t voting; uint32_t state; + uint64_t earliest_height; std::string status; BEGIN_KV_SERIALIZE_MAP() @@ -885,6 +886,7 @@ namespace cryptonote KV_SERIALIZE(threshold) KV_SERIALIZE(voting) KV_SERIALIZE(state) + KV_SERIALIZE(earliest_height) KV_SERIALIZE(status) END_KV_SERIALIZE_MAP() }; |