diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-09-15 19:55:03 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-09-15 19:55:03 -0500 |
| commit | ea587de300088635267007f7c775b30293fc6ea2 (patch) | |
| tree | 82fccb41e3d253e61cd0f76d87768df669c434d0 /src/serialization/json_object.cpp | |
| parent | 9bba1a24eadbc7d23a5a58d83024df224f9cafcb (diff) | |
| parent | 80e535c95a3e7b0c548ad996a777d6d026e93f6a (diff) | |
| download | monzero-core-ea587de300088635267007f7c775b30293fc6ea2.tar.gz monzero-core-ea587de300088635267007f7c775b30293fc6ea2.tar.xz monzero-core-ea587de300088635267007f7c775b30293fc6ea2.zip | |
Merge pull request #6745
80e535c wallet2: adapt to deterministic unlock time (TheCharlatan)
4971219 blockchain: deterministic UNIX time unlock checks (moneromooo-monero)
Diffstat (limited to 'src/serialization/json_object.cpp')
| -rw-r--r-- | src/serialization/json_object.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/serialization/json_object.cpp b/src/serialization/json_object.cpp index 7c48cf6c3..67f042c2e 100644 --- a/src/serialization/json_object.cpp +++ b/src/serialization/json_object.cpp @@ -1342,6 +1342,7 @@ void toJsonValue(rapidjson::Writer<epee::byte_stream>& dest, const cryptonote::r INSERT_INTO_JSON_OBJECT(dest, block_weight_limit, info.block_weight_limit); INSERT_INTO_JSON_OBJECT(dest, block_size_median, info.block_size_median); INSERT_INTO_JSON_OBJECT(dest, block_weight_median, info.block_weight_median); + INSERT_INTO_JSON_OBJECT(dest, adjusted_time, info.adjusted_time); INSERT_INTO_JSON_OBJECT(dest, start_time, info.start_time); dest.EndObject(); @@ -1375,6 +1376,7 @@ void fromJsonValue(const rapidjson::Value& val, cryptonote::rpc::DaemonInfo& inf GET_FROM_JSON_OBJECT(val, info.block_weight_limit, block_weight_limit); GET_FROM_JSON_OBJECT(val, info.block_size_median, block_size_median); GET_FROM_JSON_OBJECT(val, info.block_weight_median, block_weight_median); + GET_FROM_JSON_OBJECT(val, info.adjusted_time, adjusted_time); GET_FROM_JSON_OBJECT(val, info.start_time, start_time); } |