diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-10-02 23:27:21 +0400 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-10-02 23:27:21 +0400 |
| commit | db45291c8da8fa37e037729876d039f7eb8ac0f3 (patch) | |
| tree | f14f8ee4af341f7dcdce2beae66529610eba63a3 | |
| parent | abe24f4429f126a41fd945418184806db785b84b (diff) | |
| parent | c3de19edd69e06aea4d7af5a888438a1c38e4220 (diff) | |
| download | monzero-core-db45291c8da8fa37e037729876d039f7eb8ac0f3.tar.gz monzero-core-db45291c8da8fa37e037729876d039f7eb8ac0f3.tar.xz monzero-core-db45291c8da8fa37e037729876d039f7eb8ac0f3.zip | |
Merge pull request #2506
c3de19ed json_object: add missing do_not_relay to tx_in_pool serialization (moneromooo-monero)
| -rw-r--r-- | src/serialization/json_object.cpp | 1 |
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) |