rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 11:23:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5019

Browse Source 
65ce387c daemon: add a +hex option to print_block (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-01-16 21:36:08 +02:00
commit 17878369f9
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/daemon/command_parser_executor.cpp
View File

@ -163,9 +163,21 @@ bool t_command_parser_executor::print_height(const std::vector<std::string>& arg
bool t_command_parser_executor::print_block(const std::vector<std::string>& args) bool t_command_parser_executor::print_block(const std::vector<std::string>& args)
{ {
bool include_hex = false;
// Assumes that optional flags come after mandatory argument <transaction_hash>
for (unsigned int i = 1; i < args.size(); ++i) {
if (args[i] == "+hex")
include_hex = true;
else
{
std::cout << "unexpected argument: " << args[i] << std::endl;
return true;
}
}
if (args.empty()) if (args.empty())
{ {
std::cout << "expected: print_block (<block_hash> | <block_height>)" << std::endl; std::cout << "expected: print_block (<block_hash> | <block_height>) [+hex]" << std::endl;
return false; return false;
} }
@ -173,14 +185,14 @@ bool t_command_parser_executor::print_block(const std::vector<std::string>& args
try try
{ {
uint64_t height = boost::lexical_cast<uint64_t>(arg); uint64_t height = boost::lexical_cast<uint64_t>(arg);
return m_executor.print_block_by_height(height); return m_executor.print_block_by_height(height, include_hex);
} }
catch (const boost::bad_lexical_cast&) catch (const boost::bad_lexical_cast&)
{ {
crypto::hash block_hash; crypto::hash block_hash;
if (parse_hash256(arg, block_hash)) if (parse_hash256(arg, block_hash))
{ {
return m_executor.print_block_by_hash(block_hash); return m_executor.print_block_by_hash(block_hash, include_hex);
} }
} }

8
src/daemon/rpc_command_executor.cpp
View File

@ -663,7 +663,7 @@ bool t_rpc_command_executor::print_height() {
return true; return true;
} }
bool t_rpc_command_executor::print_block_by_hash(crypto::hash block_hash) { bool t_rpc_command_executor::print_block_by_hash(crypto::hash block_hash, bool include_hex) {
cryptonote::COMMAND_RPC_GET_BLOCK::request req; cryptonote::COMMAND_RPC_GET_BLOCK::request req;
cryptonote::COMMAND_RPC_GET_BLOCK::response res; cryptonote::COMMAND_RPC_GET_BLOCK::response res;
epee::json_rpc::error error_resp; epee::json_rpc::error error_resp;
@ -689,13 +689,15 @@ bool t_rpc_command_executor::print_block_by_hash(crypto::hash block_hash) {
} }
} }
if (include_hex)
tools::success_msg_writer() << res.blob << std::endl;
print_block_header(res.block_header); print_block_header(res.block_header);
tools::success_msg_writer() << res.json << ENDL; tools::success_msg_writer() << res.json << ENDL;
return true; return true;
} }
bool t_rpc_command_executor::print_block_by_height(uint64_t height) { bool t_rpc_command_executor::print_block_by_height(uint64_t height, bool include_hex) {
cryptonote::COMMAND_RPC_GET_BLOCK::request req; cryptonote::COMMAND_RPC_GET_BLOCK::request req;
cryptonote::COMMAND_RPC_GET_BLOCK::response res; cryptonote::COMMAND_RPC_GET_BLOCK::response res;
epee::json_rpc::error error_resp; epee::json_rpc::error error_resp;
@ -721,6 +723,8 @@ bool t_rpc_command_executor::print_block_by_height(uint64_t height) {
} }
} }
if (include_hex)
tools::success_msg_writer() << res.blob << std::endl;
print_block_header(res.block_header); print_block_header(res.block_header);
tools::success_msg_writer() << res.json << ENDL; tools::success_msg_writer() << res.json << ENDL;

4
src/daemon/rpc_command_executor.h
View File

@ -91,9 +91,9 @@ public:
bool print_height(); bool print_height();
bool print_block_by_hash(crypto::hash block_hash); bool print_block_by_hash(crypto::hash block_hash, bool include_hex);
bool print_block_by_height(uint64_t height); bool print_block_by_height(uint64_t height, bool include_hex);
bool print_transaction(crypto::hash transaction_hash, bool include_hex, bool include_json); bool print_transaction(crypto::hash transaction_hash, bool include_hex, bool include_json);