Merge pull request #1222

5e10fb0 rpc: add blockchain cumulative difficulty to getinfo call (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2016-10-22 22:14:35 +02:00
commit b9f31bbc10
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 4 additions and 0 deletions

View File

@ -142,6 +142,7 @@ namespace cryptonote
res.white_peerlist_size = m_p2p.get_peerlist_manager().get_white_peers_count(); res.white_peerlist_size = m_p2p.get_peerlist_manager().get_white_peers_count();
res.grey_peerlist_size = m_p2p.get_peerlist_manager().get_gray_peers_count(); res.grey_peerlist_size = m_p2p.get_peerlist_manager().get_gray_peers_count();
res.testnet = m_testnet; res.testnet = m_testnet;
res.cumulative_difficulty = m_core.get_blockchain_storage().get_db().get_block_cumulative_difficulty(res.height - 1);
res.status = CORE_RPC_STATUS_OK; res.status = CORE_RPC_STATUS_OK;
return true; return true;
} }
@ -1112,6 +1113,7 @@ namespace cryptonote
res.white_peerlist_size = m_p2p.get_peerlist_manager().get_white_peers_count(); res.white_peerlist_size = m_p2p.get_peerlist_manager().get_white_peers_count();
res.grey_peerlist_size = m_p2p.get_peerlist_manager().get_gray_peers_count(); res.grey_peerlist_size = m_p2p.get_peerlist_manager().get_gray_peers_count();
res.testnet = m_testnet; res.testnet = m_testnet;
res.cumulative_difficulty = m_core.get_blockchain_storage().get_db().get_block_cumulative_difficulty(res.height - 1);
res.status = CORE_RPC_STATUS_OK; res.status = CORE_RPC_STATUS_OK;
return true; return true;
} }

View File

@ -464,6 +464,7 @@ namespace cryptonote
uint64_t grey_peerlist_size; uint64_t grey_peerlist_size;
bool testnet; bool testnet;
std::string top_block_hash; std::string top_block_hash;
uint64_t cumulative_difficulty;
BEGIN_KV_SERIALIZE_MAP() BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE(status) KV_SERIALIZE(status)
@ -480,6 +481,7 @@ namespace cryptonote
KV_SERIALIZE(grey_peerlist_size) KV_SERIALIZE(grey_peerlist_size)
KV_SERIALIZE(testnet) KV_SERIALIZE(testnet)
KV_SERIALIZE(top_block_hash) KV_SERIALIZE(top_block_hash)
KV_SERIALIZE(cumulative_difficulty)
END_KV_SERIALIZE_MAP() END_KV_SERIALIZE_MAP()
}; };
}; };