diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-08-16 14:40:32 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-08-16 14:40:32 +0200 |
| commit | 40e8c6c403a78eeaf6367ea9cf3f5d76c266f30d (patch) | |
| tree | 62d2516871b61424612f8b6f5bd5dc52d3345a42 /src/rpc/core_rpc_server.cpp | |
| parent | 45f4ef7a6d45269d446b8303ce598df13bcf9dfb (diff) | |
| parent | 7e4e0021f422eec55fb0417b1d6e86ceddc1934f (diff) | |
| download | monzero-core-40e8c6c403a78eeaf6367ea9cf3f5d76c266f30d.tar.gz monzero-core-40e8c6c403a78eeaf6367ea9cf3f5d76c266f30d.tar.xz monzero-core-40e8c6c403a78eeaf6367ea9cf3f5d76c266f30d.zip | |
Merge pull request #959
7e4e002 daemon: print time to next fork (moneromooo-monero)
Diffstat (limited to 'src/rpc/core_rpc_server.cpp')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 9cd1893cf..e6fc11060 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -1025,7 +1025,7 @@ namespace cryptonote #if BLOCKCHAIN_DB == DB_LMDB const Blockchain &blockchain = m_core.get_blockchain_storage(); - uint8_t version = req.version > 0 ? req.version : blockchain.get_ideal_hard_fork_version(); + uint8_t version = req.version > 0 ? req.version : blockchain.get_next_hard_fork_version(); res.version = blockchain.get_current_hard_fork_version(); res.enabled = blockchain.get_hard_fork_voting_info(version, res.window, res.votes, res.threshold, res.earliest_height, res.voting); res.state = blockchain.get_hard_fork_state(); |