diff options
Diffstat (limited to 'src/daemon/rpc_command_executor.cpp')
| -rw-r--r-- | src/daemon/rpc_command_executor.cpp | 71 |
1 files changed, 64 insertions, 7 deletions
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index b0fe5945b..71b2e6f9d 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -33,6 +33,7 @@ #include "daemon/rpc_command_executor.h" #include "rpc/core_rpc_server_commands_defs.h" #include "cryptonote_core/cryptonote_core.h" +#include "cryptonote_core/hardfork.h" #include <boost/format.hpp> #include <ctime> #include <string> @@ -246,6 +247,60 @@ bool t_rpc_command_executor::show_difficulty() { return true; } +bool t_rpc_command_executor::show_status() { + cryptonote::COMMAND_RPC_GET_INFO::request ireq; + cryptonote::COMMAND_RPC_GET_INFO::response ires; + cryptonote::COMMAND_RPC_HARD_FORK_INFO::request hfreq; + cryptonote::COMMAND_RPC_HARD_FORK_INFO::response hfres; + epee::json_rpc::error error_resp; + + std::string fail_message = "Problem fetching info"; + + if (m_is_rpc) + { + if (!m_rpc_client->rpc_request(ireq, ires, "/getinfo", fail_message.c_str())) + { + return true; + } + if (!m_rpc_client->rpc_request(hfreq, hfres, "/hard_fork_info", fail_message.c_str())) + { + return true; + } + } + else + { + if (!m_rpc_server->on_get_info(ireq, ires)) + { + tools::fail_msg_writer() << fail_message.c_str(); + return true; + } + if (!m_rpc_server->on_hard_fork_info(hfreq, hfres, error_resp)) + { + tools::fail_msg_writer() << fail_message.c_str(); + return true; + } + } + + tools::success_msg_writer() << boost::format("Height: %llu/%llu (%.1f%%) on %s, net hash %s, v%u, %s, %u+%u connections") + % (unsigned long long)ires.height + % (unsigned long long)(ires.target_height ? ires.target_height : ires.height) + % (100.0f * ires.height / (ires.target_height ? ires.target_height < ires.height ? ires.height : ires.target_height : ires.height)) + % (m_rpc_server->is_testnet() ? "testnet" : "mainnet") + % [&ires]()->std::string { + float hr = ires.difficulty / 60.0f; + if (hr>1e9) return (boost::format("%.2f GH/s") % (hr/1e9)).str(); + if (hr>1e6) return (boost::format("%.2f MH/s") % (hr/1e6)).str(); + if (hr>1e3) return (boost::format("%.2f kH/s") % (hr/1e3)).str(); + return (boost::format("%.0f H/s") % hr).str(); + }() + % (unsigned)hfres.version + % (hfres.state == cryptonote::HardFork::Ready ? "up to date" : hfres.state == cryptonote::HardFork::UpdateNeeded ? "update needed" : "out of date, likely forked") + % (unsigned)ires.outgoing_connections_count % (unsigned)ires.incoming_connections_count + ; + + return true; +} + bool t_rpc_command_executor::print_connections() { cryptonote::COMMAND_RPC_GET_CONNECTIONS::request req; cryptonote::COMMAND_RPC_GET_CONNECTIONS::response res; @@ -255,7 +310,7 @@ bool t_rpc_command_executor::print_connections() { if (m_is_rpc) { - if (!m_rpc_client->json_rpc_request(req, res, "/get_connections", fail_message.c_str())) + if (!m_rpc_client->json_rpc_request(req, res, "get_connections", fail_message.c_str())) { return true; } @@ -880,7 +935,7 @@ bool t_rpc_command_executor::out_peers(uint64_t limit) if (m_is_rpc) { - if (!m_rpc_client->json_rpc_request(req, res, "/out_peers", fail_message.c_str())) + if (!m_rpc_client->json_rpc_request(req, res, "out_peers", fail_message.c_str())) { return true; } @@ -959,7 +1014,7 @@ bool t_rpc_command_executor::hard_fork_info(uint8_t version) if (m_is_rpc) { - if (!m_rpc_client->json_rpc_request(req, res, "/hard_fork_info", fail_message.c_str())) + if (!m_rpc_client->json_rpc_request(req, res, "hard_fork_info", fail_message.c_str())) { return true; } @@ -971,11 +1026,13 @@ bool t_rpc_command_executor::hard_fork_info(uint8_t version) tools::fail_msg_writer() << fail_message.c_str(); return true; } - version = version > 0 ? version : res.voting; - tools::msg_writer() << "version " << (uint32_t)version << " " << (res.enabled ? "enabled" : "not enabled") << - ", " << res.votes << "/" << res.window << " votes, threshold " << res.threshold; - tools::msg_writer() << "current version " << (uint32_t)res.version << ", voting for version " << (uint32_t)res.voting; } + + version = version > 0 ? version : res.voting; + tools::msg_writer() << "version " << (uint32_t)version << " " << (res.enabled ? "enabled" : "not enabled") << + ", " << res.votes << "/" << res.window << " votes, threshold " << res.threshold; + tools::msg_writer() << "current version " << (uint32_t)res.version << ", voting for version " << (uint32_t)res.voting; + return true; } |