mirror of
https://github.com/monero-project/monero.git
synced 2024-11-17 16:27:39 +00:00
update get_info RPC and bump RPC version
This commit is contained in:
parent
34cb6b4b70
commit
9e1403e155
4 changed files with 8 additions and 1 deletions
|
@ -194,6 +194,7 @@ namespace cryptonote
|
||||||
res.mainnet = m_nettype == MAINNET;
|
res.mainnet = m_nettype == MAINNET;
|
||||||
res.testnet = m_nettype == TESTNET;
|
res.testnet = m_nettype == TESTNET;
|
||||||
res.stagenet = m_nettype == STAGENET;
|
res.stagenet = m_nettype == STAGENET;
|
||||||
|
res.nettype = m_nettype == MAINNET ? "mainnet" : m_nettype == TESTNET ? "testnet" : m_nettype == STAGENET ? "stagenet" : "fakechain";
|
||||||
res.cumulative_difficulty = m_core.get_blockchain_storage().get_db().get_block_cumulative_difficulty(res.height - 1);
|
res.cumulative_difficulty = m_core.get_blockchain_storage().get_db().get_block_cumulative_difficulty(res.height - 1);
|
||||||
res.block_size_limit = m_core.get_blockchain_storage().get_current_cumulative_blocksize_limit();
|
res.block_size_limit = m_core.get_blockchain_storage().get_current_cumulative_blocksize_limit();
|
||||||
res.block_size_median = m_core.get_blockchain_storage().get_current_cumulative_blocksize_median();
|
res.block_size_median = m_core.get_blockchain_storage().get_current_cumulative_blocksize_median();
|
||||||
|
@ -1626,6 +1627,7 @@ namespace cryptonote
|
||||||
res.mainnet = m_nettype == MAINNET;
|
res.mainnet = m_nettype == MAINNET;
|
||||||
res.testnet = m_nettype == TESTNET;
|
res.testnet = m_nettype == TESTNET;
|
||||||
res.stagenet = m_nettype == STAGENET;
|
res.stagenet = m_nettype == STAGENET;
|
||||||
|
res.nettype = m_nettype == MAINNET ? "mainnet" : m_nettype == TESTNET ? "testnet" : m_nettype == STAGENET ? "stagenet" : "fakechain";
|
||||||
res.cumulative_difficulty = m_core.get_blockchain_storage().get_db().get_block_cumulative_difficulty(res.height - 1);
|
res.cumulative_difficulty = m_core.get_blockchain_storage().get_db().get_block_cumulative_difficulty(res.height - 1);
|
||||||
res.block_size_limit = m_core.get_blockchain_storage().get_current_cumulative_blocksize_limit();
|
res.block_size_limit = m_core.get_blockchain_storage().get_current_cumulative_blocksize_limit();
|
||||||
res.block_size_median = m_core.get_blockchain_storage().get_current_cumulative_blocksize_median();
|
res.block_size_median = m_core.get_blockchain_storage().get_current_cumulative_blocksize_median();
|
||||||
|
|
|
@ -49,7 +49,7 @@ namespace cryptonote
|
||||||
// advance which version they will stop working with
|
// advance which version they will stop working with
|
||||||
// Don't go over 32767 for any of these
|
// Don't go over 32767 for any of these
|
||||||
#define CORE_RPC_VERSION_MAJOR 1
|
#define CORE_RPC_VERSION_MAJOR 1
|
||||||
#define CORE_RPC_VERSION_MINOR 20
|
#define CORE_RPC_VERSION_MINOR 21
|
||||||
#define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor))
|
#define MAKE_CORE_RPC_VERSION(major,minor) (((major)<<16)|(minor))
|
||||||
#define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR)
|
#define CORE_RPC_VERSION MAKE_CORE_RPC_VERSION(CORE_RPC_VERSION_MAJOR, CORE_RPC_VERSION_MINOR)
|
||||||
|
|
||||||
|
@ -953,6 +953,7 @@ namespace cryptonote
|
||||||
bool mainnet;
|
bool mainnet;
|
||||||
bool testnet;
|
bool testnet;
|
||||||
bool stagenet;
|
bool stagenet;
|
||||||
|
std::string nettype;
|
||||||
std::string top_block_hash;
|
std::string top_block_hash;
|
||||||
uint64_t cumulative_difficulty;
|
uint64_t cumulative_difficulty;
|
||||||
uint64_t block_size_limit;
|
uint64_t block_size_limit;
|
||||||
|
@ -982,6 +983,7 @@ namespace cryptonote
|
||||||
KV_SERIALIZE(mainnet)
|
KV_SERIALIZE(mainnet)
|
||||||
KV_SERIALIZE(testnet)
|
KV_SERIALIZE(testnet)
|
||||||
KV_SERIALIZE(stagenet)
|
KV_SERIALIZE(stagenet)
|
||||||
|
KV_SERIALIZE(nettype)
|
||||||
KV_SERIALIZE(top_block_hash)
|
KV_SERIALIZE(top_block_hash)
|
||||||
KV_SERIALIZE(cumulative_difficulty)
|
KV_SERIALIZE(cumulative_difficulty)
|
||||||
KV_SERIALIZE(block_size_limit)
|
KV_SERIALIZE(block_size_limit)
|
||||||
|
|
|
@ -181,6 +181,7 @@ namespace rpc
|
||||||
bool mainnet;
|
bool mainnet;
|
||||||
bool testnet;
|
bool testnet;
|
||||||
bool stagenet;
|
bool stagenet;
|
||||||
|
std::string nettype;
|
||||||
crypto::hash top_block_hash;
|
crypto::hash top_block_hash;
|
||||||
uint64_t cumulative_difficulty;
|
uint64_t cumulative_difficulty;
|
||||||
uint64_t block_size_limit;
|
uint64_t block_size_limit;
|
||||||
|
|
|
@ -1175,6 +1175,7 @@ void toJsonValue(rapidjson::Document& doc, const cryptonote::rpc::DaemonInfo& in
|
||||||
INSERT_INTO_JSON_OBJECT(val, doc, white_peerlist_size, info.white_peerlist_size);
|
INSERT_INTO_JSON_OBJECT(val, doc, white_peerlist_size, info.white_peerlist_size);
|
||||||
INSERT_INTO_JSON_OBJECT(val, doc, grey_peerlist_size, info.grey_peerlist_size);
|
INSERT_INTO_JSON_OBJECT(val, doc, grey_peerlist_size, info.grey_peerlist_size);
|
||||||
INSERT_INTO_JSON_OBJECT(val, doc, testnet, info.testnet);
|
INSERT_INTO_JSON_OBJECT(val, doc, testnet, info.testnet);
|
||||||
|
INSERT_INTO_JSON_OBJECT(val, doc, nettype, info.nettype);
|
||||||
INSERT_INTO_JSON_OBJECT(val, doc, top_block_hash, info.top_block_hash);
|
INSERT_INTO_JSON_OBJECT(val, doc, top_block_hash, info.top_block_hash);
|
||||||
INSERT_INTO_JSON_OBJECT(val, doc, cumulative_difficulty, info.cumulative_difficulty);
|
INSERT_INTO_JSON_OBJECT(val, doc, cumulative_difficulty, info.cumulative_difficulty);
|
||||||
INSERT_INTO_JSON_OBJECT(val, doc, block_size_limit, info.block_size_limit);
|
INSERT_INTO_JSON_OBJECT(val, doc, block_size_limit, info.block_size_limit);
|
||||||
|
@ -1200,6 +1201,7 @@ void fromJsonValue(const rapidjson::Value& val, cryptonote::rpc::DaemonInfo& inf
|
||||||
GET_FROM_JSON_OBJECT(val, info.white_peerlist_size, white_peerlist_size);
|
GET_FROM_JSON_OBJECT(val, info.white_peerlist_size, white_peerlist_size);
|
||||||
GET_FROM_JSON_OBJECT(val, info.grey_peerlist_size, grey_peerlist_size);
|
GET_FROM_JSON_OBJECT(val, info.grey_peerlist_size, grey_peerlist_size);
|
||||||
GET_FROM_JSON_OBJECT(val, info.testnet, testnet);
|
GET_FROM_JSON_OBJECT(val, info.testnet, testnet);
|
||||||
|
GET_FROM_JSON_OBJECT(val, info.nettype, nettype);
|
||||||
GET_FROM_JSON_OBJECT(val, info.top_block_hash, top_block_hash);
|
GET_FROM_JSON_OBJECT(val, info.top_block_hash, top_block_hash);
|
||||||
GET_FROM_JSON_OBJECT(val, info.cumulative_difficulty, cumulative_difficulty);
|
GET_FROM_JSON_OBJECT(val, info.cumulative_difficulty, cumulative_difficulty);
|
||||||
GET_FROM_JSON_OBJECT(val, info.block_size_limit, block_size_limit);
|
GET_FROM_JSON_OBJECT(val, info.block_size_limit, block_size_limit);
|
||||||
|
|
Loading…
Reference in a new issue