From dca8e339bcd0b4135cda57c6dd0266c754ee73e4 Mon Sep 17 00:00:00 2001 From: selsta Date: Fri, 24 Apr 2026 23:55:58 +0200 Subject: [PATCH] rpc: remove last usage of txs_as_hex --- src/daemon/rpc_command_executor.cpp | 27 +++++++++++-------------- src/rpc/core_rpc_server_commands_defs.h | 1 + 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 9c3bf7868..63a11b9f4 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -1006,23 +1006,20 @@ bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash, } } - if (1 == res.txs.size() || 1 == res.txs_as_hex.size()) + if (1 == res.txs.size()) { - if (1 == res.txs.size()) - { - // only available for new style answers - static const std::string empty_hash = epee::string_tools::pod_to_hex(crypto::cn_fast_hash("", 0)); - // prunable_hash will equal empty_hash when nothing is prunable (mostly when the transaction is coinbase) - bool pruned = res.txs.front().prunable_as_hex.empty() && res.txs.front().prunable_hash != epee::string_tools::pod_to_hex(crypto::null_hash) && res.txs.front().prunable_hash != empty_hash; - if (res.txs.front().in_pool) - tools::success_msg_writer() << "Found in pool"; - else - tools::success_msg_writer() << "Found in blockchain at height " << res.txs.front().block_height << (pruned ? " (pruned)" : ""); - } + // only available for new style answers + static const std::string empty_hash = epee::string_tools::pod_to_hex(crypto::cn_fast_hash("", 0)); + // prunable_hash will equal empty_hash when nothing is prunable (mostly when the transaction is coinbase) + bool pruned = res.txs.front().prunable_as_hex.empty() && res.txs.front().prunable_hash != epee::string_tools::pod_to_hex(crypto::null_hash) && res.txs.front().prunable_hash != empty_hash; + if (res.txs.front().in_pool) + tools::success_msg_writer() << "Found in pool"; + else + tools::success_msg_writer() << "Found in blockchain at height " << res.txs.front().block_height << (pruned ? " (pruned)" : ""); - 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 : ""; + const std::string &as_hex = res.txs.front().as_hex; + const std::string &pruned_as_hex = res.txs.front().pruned_as_hex; + const std::string &prunable_as_hex = res.txs.front().prunable_as_hex; // Print metadata if requested if (include_metadata) { diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index 60b48622f..0d8123fad 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -418,6 +418,7 @@ inline const std::string get_rpc_status(const bool trusted_daemon, const std::st struct response_t: public rpc_access_response_base { // older compatibility stuff + // TODO: remove after FCMP++ hf std::vector txs_as_hex; //transactions blobs as hex (old compat) std::vector txs_as_json; //transactions decoded as json (old compat)