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

Merge pull request #6095

Browse source 
7ba31191 daemon: add +meta print_tx parameter (moneromooo-monero)
This commit is contained in:
Alexander Blair 2020-02-06 00:31:17 -08:00
commit b8e5c769c7
No known key found for this signature in database
GPG key ID: C64552D877C32479
3 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/daemon/rpc_command_executor.cpp
View file

@ -940,6 +940,7 @@ bool t_rpc_command_executor::print_block_by_height(uint64_t height, bool include
}
bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash,
bool include_metadata,
bool include_hex,
bool include_json) {
cryptonote::COMMAND_RPC_GET_TRANSACTIONS::request req;
@ -982,6 +983,29 @@ bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash,
const std::string &as_hex = (1 == res.txs.size()) ? res.txs.front().as_hex : res.txs_as_hex.front();
const std::string &pruned_as_hex = (1 == res.txs.size()) ? res.txs.front().pruned_as_hex : "";
const std::string &prunable_as_hex = (1 == res.txs.size()) ? res.txs.front().prunable_as_hex : "";
// Print metadata if requested
if (include_metadata)
{
if (!res.txs.front().in_pool)
{
tools::msg_writer() << "Block timestamp: " << res.txs.front().block_timestamp << " (" << tools::get_human_readable_timestamp(res.txs.front().block_timestamp) << ")";
}
cryptonote::blobdata blob;
if (epee::string_tools::parse_hexstr_to_binbuff(pruned_as_hex + prunable_as_hex, blob))
{
cryptonote::transaction tx;
if (cryptonote::parse_and_validate_tx_from_blob(blob, tx))
{
tools::msg_writer() << "Size: " << blob.size();
tools::msg_writer() << "Weight: " << cryptonote::get_transaction_weight(tx);
}
else
tools::fail_msg_writer() << "Error parsing transaction blob";
}
else
tools::fail_msg_writer() << "Error parsing transaction from hex";
}
// Print raw hex if requested
if (include_hex)
{