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/rpc/daemon_handler.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/rpc/daemon_handler.cpp')
| -rw-r--r-- | src/rpc/daemon_handler.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/rpc/daemon_handler.cpp b/src/rpc/daemon_handler.cpp index 248c54afb..e256322cb 100644 --- a/src/rpc/daemon_handler.cpp +++ b/src/rpc/daemon_handler.cpp @@ -538,6 +538,7 @@ namespace rpc res.info.cumulative_difficulty = (res.info.wide_cumulative_difficulty & 0xffffffffffffffff).convert_to<uint64_t>(); res.info.block_size_limit = res.info.block_weight_limit = m_core.get_blockchain_storage().get_current_cumulative_block_weight_limit(); res.info.block_size_median = res.info.block_weight_median = m_core.get_blockchain_storage().get_current_cumulative_block_weight_median(); + res.info.adjusted_time = m_core.get_blockchain_storage().get_adjusted_time(res.info.height); res.info.start_time = (uint64_t)m_core.get_start_time(); res.info.version = MONERO_VERSION; |