rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2025-07-07 18:38:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2591

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

42
src/daemon/rpc_command_executor.cpp
View file

@ -693,7 +693,9 @@ bool t_rpc_command_executor::print_block_by_height(uint64_t height) {
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::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;
}
// first as hex
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
crypto::hash tx_hash, tx_prefix_hash;
cryptonote::transaction tx;
cryptonote::blobdata blob;
if (!string_tools::parse_hexstr_to_binbuff(as_hex, blob))
// Print json if requested
if (include_json)
{
tools::fail_msg_writer() << "Failed to parse tx";
}
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";
}
else
{
tools::success_msg_writer() << cryptonote::obj_to_json_str(tx) << std::endl;
crypto::hash tx_hash, tx_prefix_hash;
cryptonote::transaction tx;
cryptonote::blobdata blob;
if (!string_tools::parse_hexstr_to_binbuff(as_hex, blob))
{
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))
{
tools::fail_msg_writer() << "Failed to parse tx blob to get json format";
}
else
{
tools::success_msg_writer() << cryptonote::obj_to_json_str(tx) << std::endl;
}
}
}
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;