Merge remote-tracking branch 'upstream/master' into upstream

This commit is contained in:
wowario
2018-12-12 14:58:54 +03:00
61 changed files with 1559 additions and 182 deletions

View File

@@ -1967,4 +1967,31 @@ bool t_rpc_command_executor::sync_info()
return true;
}
bool t_rpc_command_executor::pop_blocks(uint64_t num_blocks)
{
cryptonote::COMMAND_RPC_POP_BLOCKS::request req;
cryptonote::COMMAND_RPC_POP_BLOCKS::response res;
std::string fail_message = "pop_blocks failed";
req.nblocks = num_blocks;
if (m_is_rpc)
{
if (!m_rpc_client->rpc_request(req, res, "/pop_blocks", fail_message.c_str()))
{
return true;
}
}
else
{
if (!m_rpc_server->on_pop_blocks(req, res) || res.status != CORE_RPC_STATUS_OK)
{
tools::fail_msg_writer() << make_error(fail_message, res.status);
return true;
}
}
tools::success_msg_writer() << "new height: " << res.height;
return true;
}
}// namespace daemonize