Merge pull request #2591

93ad1f87 Fix #2559: more flexible print_tx daemon command (binaryFate)
This commit is contained in:
Riccardo Spagni 2017-11-06 01:54:48 +02:00
commit 7452359d8f
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
4 changed files with 43 additions and 22 deletions

View File

@ -187,9 +187,24 @@ bool t_command_parser_executor::print_block(const std::vector<std::string>& args
bool t_command_parser_executor::print_transaction(const std::vector<std::string>& args) bool t_command_parser_executor::print_transaction(const std::vector<std::string>& args)
{ {
bool include_hex = false;
bool include_json = 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 if (args[i] == "+json")
include_json = true;
else
{
std::cout << "unexpected argument: " << args[i] << std::endl;
return true;
}
}
if (args.empty()) if (args.empty())
{ {
std::cout << "expected: print_tx <transaction hash>" << std::endl; std::cout << "expected: print_tx <transaction_hash> [+hex] [+json]" << std::endl;
return true; return true;
} }
@ -197,7 +212,7 @@ bool t_command_parser_executor::print_transaction(const std::vector<std::string>
crypto::hash tx_hash; crypto::hash tx_hash;
if (parse_hash256(str_hash, tx_hash)) if (parse_hash256(str_hash, tx_hash))
{ {
m_executor.print_transaction(tx_hash); m_executor.print_transaction(tx_hash, include_hex, include_json);
} }
return true; return true;

View File

@ -91,7 +91,7 @@ t_command_server::t_command_server(
m_command_lookup.set_handler( m_command_lookup.set_handler(
"print_tx" "print_tx"
, std::bind(&t_command_parser_executor::print_transaction, &m_parser, p::_1) , std::bind(&t_command_parser_executor::print_transaction, &m_parser, p::_1)
, "Print transaction, print_tx <transaction_hash>" , "Print transaction, print_tx <transaction_hash> [+hex] [+json]"
); );
m_command_lookup.set_handler( m_command_lookup.set_handler(
"is_key_image_spent" "is_key_image_spent"

View File

@ -693,7 +693,9 @@ bool t_rpc_command_executor::print_block_by_height(uint64_t height) {
return true; return true;
} }
bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash) { bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash,
bool include_hex,
bool include_json) {
cryptonote::COMMAND_RPC_GET_TRANSACTIONS::request req; cryptonote::COMMAND_RPC_GET_TRANSACTIONS::request req;
cryptonote::COMMAND_RPC_GET_TRANSACTIONS::response res; cryptonote::COMMAND_RPC_GET_TRANSACTIONS::response res;
@ -728,30 +730,34 @@ bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash) {
tools::success_msg_writer() << "Found in blockchain at height " << res.txs.front().block_height; tools::success_msg_writer() << "Found in blockchain at height " << res.txs.front().block_height;
} }
// first as hex
const std::string &as_hex = (1 == res.txs.size()) ? res.txs.front().as_hex : res.txs_as_hex.front(); const std::string &as_hex = (1 == res.txs.size()) ? res.txs.front().as_hex : res.txs_as_hex.front();
tools::success_msg_writer() << as_hex; // Print raw hex if requested
if (include_hex)
tools::success_msg_writer() << as_hex << std::endl;
// then as json // Print json if requested
if (include_json)
{
crypto::hash tx_hash, tx_prefix_hash; crypto::hash tx_hash, tx_prefix_hash;
cryptonote::transaction tx; cryptonote::transaction tx;
cryptonote::blobdata blob; cryptonote::blobdata blob;
if (!string_tools::parse_hexstr_to_binbuff(as_hex, blob)) if (!string_tools::parse_hexstr_to_binbuff(as_hex, blob))
{ {
tools::fail_msg_writer() << "Failed to parse tx"; tools::fail_msg_writer() << "Failed to parse tx to get json format";
} }
else if (!cryptonote::parse_and_validate_tx_from_blob(blob, tx, tx_hash, tx_prefix_hash)) else if (!cryptonote::parse_and_validate_tx_from_blob(blob, tx, tx_hash, tx_prefix_hash))
{ {
tools::fail_msg_writer() << "Failed to parse tx blob"; tools::fail_msg_writer() << "Failed to parse tx blob to get json format";
} }
else else
{ {
tools::success_msg_writer() << cryptonote::obj_to_json_str(tx) << std::endl; tools::success_msg_writer() << cryptonote::obj_to_json_str(tx) << std::endl;
} }
} }
}
else else
{ {
tools::fail_msg_writer() << "transaction wasn't found: " << transaction_hash << std::endl; tools::fail_msg_writer() << "Transaction wasn't found: " << transaction_hash << std::endl;
} }
return true; return true;

View File

@ -95,7 +95,7 @@ public:
bool print_block_by_height(uint64_t height); bool print_block_by_height(uint64_t height);
bool print_transaction(crypto::hash transaction_hash); bool print_transaction(crypto::hash transaction_hash, bool include_hex, bool include_json);
bool is_key_image_spent(const crypto::key_image &ki); bool is_key_image_spent(const crypto::key_image &ki);