From 4e2377995d286eb01456ed1dfd29cd278282ec19 Mon Sep 17 00:00:00 2001 From: Lee Clagett Date: Sun, 31 May 2020 01:22:33 -0400 Subject: [PATCH] Change ZMQ-JSON txextra to hex and remove unnecessary base fields --- src/rpc/daemon_rpc_version.h | 2 +- src/rpc/message.cpp | 4 ---- src/serialization/json_object.cpp | 20 ++++++++++++++++++++ src/serialization/json_object.h | 11 +++++++++++ tests/unit_tests/json_serialization.cpp | 17 ++++++++++++++++- 5 files changed, 48 insertions(+), 6 deletions(-) diff --git a/src/rpc/daemon_rpc_version.h b/src/rpc/daemon_rpc_version.h index b3eb9699b..9390114f5 100644 --- a/src/rpc/daemon_rpc_version.h +++ b/src/rpc/daemon_rpc_version.h @@ -35,7 +35,7 @@ namespace rpc { static const uint32_t DAEMON_RPC_VERSION_ZMQ_MINOR = 0; -static const uint32_t DAEMON_RPC_VERSION_ZMQ_MAJOR = 1; +static const uint32_t DAEMON_RPC_VERSION_ZMQ_MAJOR = 2; static const uint32_t DAEMON_RPC_VERSION_ZMQ = DAEMON_RPC_VERSION_ZMQ_MINOR + (DAEMON_RPC_VERSION_ZMQ_MAJOR << 16); diff --git a/src/rpc/message.cpp b/src/rpc/message.cpp index fffb44921..c3fbc4ce2 100644 --- a/src/rpc/message.cpp +++ b/src/rpc/message.cpp @@ -65,8 +65,6 @@ const rapidjson::Value& get_method_field(const rapidjson::Value& src) void Message::toJson(rapidjson::Writer& dest) const { dest.StartObject(); - INSERT_INTO_JSON_OBJECT(dest, status, status); - INSERT_INTO_JSON_OBJECT(dest, error_details, error_details); INSERT_INTO_JSON_OBJECT(dest, rpc_version, DAEMON_RPC_VERSION_ZMQ); doToJson(dest); dest.EndObject(); @@ -74,8 +72,6 @@ void Message::toJson(rapidjson::Writer& dest) const void Message::fromJson(const rapidjson::Value& val) { - GET_FROM_JSON_OBJECT(val, status, status); - GET_FROM_JSON_OBJECT(val, error_details, error_details); GET_FROM_JSON_OBJECT(val, rpc_version, rpc_version); } diff --git a/src/serialization/json_object.cpp b/src/serialization/json_object.cpp index 6228b4bec..1f71126c3 100644 --- a/src/serialization/json_object.cpp +++ b/src/serialization/json_object.cpp @@ -146,6 +146,26 @@ void fromJsonValue(const rapidjson::Value& val, std::string& str) str = val.GetString(); } +void toJsonValue(rapidjson::Writer& dest, const std::vector& src) +{ + const std::string hex = epee::to_hex::string(epee::to_span(src)); + dest.String(hex.data(), hex.size()); +} + +void fromJsonValue(const rapidjson::Value& val, std::vector& dest) +{ + if (!val.IsString()) + { + throw WRONG_TYPE("string"); + } + + dest.resize(val.GetStringLength() / 2); + if ((val.GetStringLength() % 2) != 0 || !epee::from_hex::to_buffer(epee::to_mut_span(dest), {val.GetString(), val.GetStringLength()})) + { + throw BAD_INPUT(); + } +} + void toJsonValue(rapidjson::Writer& dest, bool i) { dest.Bool(i); diff --git a/src/serialization/json_object.h b/src/serialization/json_object.h index 2a9b63b08..9f652a679 100644 --- a/src/serialization/json_object.h +++ b/src/serialization/json_object.h @@ -153,6 +153,9 @@ inline void toJsonValue(rapidjson::Writer& dest, const std::s } void fromJsonValue(const rapidjson::Value& val, std::string& str); +void toJsonValue(rapidjson::Writer& dest, const std::vector&); +void fromJsonValue(const rapidjson::Value& src, std::vector& i); + void toJsonValue(rapidjson::Writer& dest, bool i); void fromJsonValue(const rapidjson::Value& val, bool& b); @@ -353,6 +356,10 @@ inline typename std::enable_if::value, void>::type from template inline typename std::enable_if::value, void>::type toJsonValue(rapidjson::Writer& dest, const Vec &vec) { + using value_type = typename Vec::value_type; + static_assert(!std::is_same::value, "encoding an array of chars is faster as hex"); + static_assert(!std::is_same::value, "encoding an array of unsigned char is faster as hex"); + dest.StartArray(); for (const auto& t : vec) toJsonValue(dest, t); @@ -362,6 +369,10 @@ inline typename std::enable_if::value, void>::type t template inline typename std::enable_if::value, void>::type fromJsonValue(const rapidjson::Value& val, Vec& vec) { + using value_type = typename Vec::value_type; + static_assert(!std::is_same::value, "encoding a vector of chars is faster as hex"); + static_assert(!std::is_same::value, "encoding a vector of unsigned char is faster as hex"); + if (!val.IsArray()) { throw WRONG_TYPE("json array"); diff --git a/tests/unit_tests/json_serialization.cpp b/tests/unit_tests/json_serialization.cpp index 5873d0ab6..c899f9be6 100644 --- a/tests/unit_tests/json_serialization.cpp +++ b/tests/unit_tests/json_serialization.cpp @@ -94,7 +94,7 @@ namespace rapidjson::Document doc; doc.Parse(reinterpret_cast(buffer.data()), buffer.size()); - if (doc.HasParseError() || !doc.IsObject()) + if (doc.HasParseError()) { throw cryptonote::json::PARSE_FAIL(); } @@ -105,6 +105,21 @@ namespace } } // anonymous +TEST(JsonSerialization, VectorBytes) +{ + EXPECT_EQ(std::vector{}, test_json(std::vector{})); + EXPECT_EQ(std::vector{0x00}, test_json(std::vector{0x00})); +} + +TEST(JsonSerialization, InvalidVectorBytes) +{ + rapidjson::Document doc; + doc.SetString("1"); + + std::vector out; + EXPECT_THROW(cryptonote::json::fromJsonValue(doc, out), cryptonote::json::BAD_INPUT); +} + TEST(JsonSerialization, MinerTransaction) { cryptonote::account_base acct;