From 253ed76ef4c55160d9defb673676943313da7786 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Tue, 13 Oct 2015 22:11:52 +0100 Subject: [PATCH] core_rpc_server: add optional json decoded tx to COMMAND_RPC_GET_TRANSACTIONS --- src/rpc/core_rpc_server.cpp | 2 ++ src/rpc/core_rpc_server_commands_defs.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 248ba17ac..08005ec72 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -253,6 +253,8 @@ namespace cryptonote { blobdata blob = t_serializable_object_to_blob(tx); res.txs_as_hex.push_back(string_tools::buff_to_hex_nodelimer(blob)); + if (req.decode_as_json) + res.txs_as_json.push_back(obj_to_json_str(tx)); } BOOST_FOREACH(const auto& miss_tx, missed_txs) diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h index 511a74bf1..cb8845e8c 100644 --- a/src/rpc/core_rpc_server_commands_defs.h +++ b/src/rpc/core_rpc_server_commands_defs.h @@ -95,9 +95,11 @@ namespace cryptonote struct request { std::list txs_hashes; + bool decode_as_json; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(txs_hashes) + KV_SERIALIZE(decode_as_json) END_KV_SERIALIZE_MAP() }; @@ -106,11 +108,13 @@ namespace cryptonote { std::list txs_as_hex; //transactions blobs as hex std::list missed_tx; //not found transactions + std::list txs_as_json; //transactions decoded as json std::string status; BEGIN_KV_SERIALIZE_MAP() KV_SERIALIZE(txs_as_hex) KV_SERIALIZE(missed_tx) + KV_SERIALIZE(txs_as_json) KV_SERIALIZE(status) END_KV_SERIALIZE_MAP() };