aboutsummaryrefslogtreecommitdiff
path: root/src/serialization
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2017-10-02 23:27:21 +0400
committerRiccardo Spagni <ric@spagni.net>2017-10-02 23:27:21 +0400
commitdb45291c8da8fa37e037729876d039f7eb8ac0f3 (patch)
treef14f8ee4af341f7dcdce2beae66529610eba63a3 /src/serialization
parentMerge pull request #2504 (diff)
parentjson_object: add missing do_not_relay to tx_in_pool serialization (diff)
downloadmonero-db45291c8da8fa37e037729876d039f7eb8ac0f3.tar.xz
Merge pull request #2506
c3de19ed json_object: add missing do_not_relay to tx_in_pool serialization (moneromooo-monero)
Diffstat (limited to 'src/serialization')
-rw-r--r--src/serialization/json_object.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/serialization/json_object.cpp b/src/serialization/json_object.cpp
index e35389f9c..a40821d19 100644
--- a/src/serialization/json_object.cpp
+++ b/src/serialization/json_object.cpp
@@ -776,6 +776,7 @@ void fromJsonValue(const rapidjson::Value& val, cryptonote::rpc::tx_in_pool& tx)
GET_FROM_JSON_OBJECT(val, tx.receive_time, receive_time);
GET_FROM_JSON_OBJECT(val, tx.last_relayed_time, last_relayed_time);
GET_FROM_JSON_OBJECT(val, tx.relayed, relayed);
+ GET_FROM_JSON_OBJECT(val, tx.do_not_relay, do_not_relay);
}
void toJsonValue(rapidjson::Document& doc, const cryptonote::rpc::hard_fork_info& info, rapidjson::Value& val)