From 051ddbc741b1b703f5d58193ea770b13887d4e49 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Wed, 28 Oct 2015 18:08:14 +0000 Subject: rpc: fix start_mining and status RPC crashes They check whether they're running on testnet by accessing the m_rpc_server object, which does not exist when in RPC mode. Also, fix hard_fork_info being called with the wrong API. --- src/daemon/command_parser_executor.cpp | 4 +++- src/daemon/rpc_command_executor.cpp | 8 ++++---- src/daemon/rpc_command_executor.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/daemon') diff --git a/src/daemon/command_parser_executor.cpp b/src/daemon/command_parser_executor.cpp index 51e3231e5..a07bb25de 100644 --- a/src/daemon/command_parser_executor.cpp +++ b/src/daemon/command_parser_executor.cpp @@ -230,6 +230,7 @@ bool t_command_parser_executor::start_mining(const std::vector& arg } cryptonote::account_public_address adr; + bool testnet = false; if(!cryptonote::get_account_address_from_str(adr, false, args.front())) { if(!cryptonote::get_account_address_from_str(adr, true, args.front())) @@ -237,6 +238,7 @@ bool t_command_parser_executor::start_mining(const std::vector& arg std::cout << "target account address has wrong format" << std::endl; return true; } + testnet = true; std::cout << "Mining to a testnet address, make sure this is intentional!" << std::endl; } uint64_t threads_count = 1; @@ -250,7 +252,7 @@ bool t_command_parser_executor::start_mining(const std::vector& arg threads_count = (ok && 0 < threads_count) ? threads_count : 1; } - m_executor.start_mining(adr, threads_count); + m_executor.start_mining(adr, threads_count, testnet); return true; } diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 71b2e6f9d..a28b4290d 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -262,7 +262,7 @@ bool t_rpc_command_executor::show_status() { { return true; } - if (!m_rpc_client->rpc_request(hfreq, hfres, "/hard_fork_info", fail_message.c_str())) + if (!m_rpc_client->json_rpc_request(hfreq, hfres, "hard_fork_info", fail_message.c_str())) { return true; } @@ -285,7 +285,7 @@ bool t_rpc_command_executor::show_status() { % (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.testnet ? "testnet" : "mainnet") % [&ires]()->std::string { float hr = ires.difficulty / 60.0f; if (hr>1e9) return (boost::format("%.2f GH/s") % (hr/1e9)).str(); @@ -733,10 +733,10 @@ bool t_rpc_command_executor::print_transaction_pool_short() { return true; } -bool t_rpc_command_executor::start_mining(cryptonote::account_public_address address, uint64_t num_threads) { +bool t_rpc_command_executor::start_mining(cryptonote::account_public_address address, uint64_t num_threads, bool testnet) { cryptonote::COMMAND_RPC_START_MINING::request req; cryptonote::COMMAND_RPC_START_MINING::response res; - req.miner_address = cryptonote::get_account_address_as_str(m_rpc_server->is_testnet(), address); + req.miner_address = cryptonote::get_account_address_as_str(testnet, address); req.threads_count = num_threads; std::string fail_message = "Mining did not start"; diff --git a/src/daemon/rpc_command_executor.h b/src/daemon/rpc_command_executor.h index 5df089be2..778b73acb 100644 --- a/src/daemon/rpc_command_executor.h +++ b/src/daemon/rpc_command_executor.h @@ -95,7 +95,7 @@ public: bool print_transaction_pool_short(); - bool start_mining(cryptonote::account_public_address address, uint64_t num_threads); + bool start_mining(cryptonote::account_public_address address, uint64_t num_threads, bool testnet); bool stop_mining(); -- cgit v1.2.3