nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rpc: pass current block target in rpc

Browse Source 
This fixes the hash rate being wrong on testnet after the switch
to 2 minute blocks
This commit is contained in:
moneromooo-monero 2015-11-26 00:25:13 +00:00
parent 4061a32082
commit 55e5a33d85
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/daemon/rpc_command_executor.cpp
View File

@ -242,7 +242,7 @@ bool t_rpc_command_executor::show_difficulty() {
tools::success_msg_writer() << "BH: " << res.height tools::success_msg_writer() << "BH: " << res.height
<< ", DIFF: " << res.difficulty << ", DIFF: " << res.difficulty
<< ", HR: " << (int) res.difficulty / 60L << " H/s"; << ", HR: " << (int) res.difficulty / res.target << " H/s";
return true; return true;
} }
@ -287,7 +287,7 @@ bool t_rpc_command_executor::show_status() {
% (100.0f * ires.height / (ires.target_height ? ires.target_height < ires.height ? ires.height : ires.target_height : ires.height)) % (100.0f * ires.height / (ires.target_height ? ires.target_height < ires.height ? ires.height : ires.target_height : ires.height))
% (ires.testnet ? "testnet" : "mainnet") % (ires.testnet ? "testnet" : "mainnet")
% [&ires]()->std::string { % [&ires]()->std::string {
float hr = ires.difficulty / 60.0f; float hr = ires.difficulty / ires.target;
if (hr>1e9) return (boost::format("%.2f GH/s") % (hr/1e9)).str(); if (hr>1e9) return (boost::format("%.2f GH/s") % (hr/1e9)).str();
if (hr>1e6) return (boost::format("%.2f MH/s") % (hr/1e6)).str(); if (hr>1e6) return (boost::format("%.2f MH/s") % (hr/1e6)).str();
if (hr>1e3) return (boost::format("%.2f kH/s") % (hr/1e3)).str(); if (hr>1e3) return (boost::format("%.2f kH/s") % (hr/1e3)).str();

1
src/rpc/core_rpc_server.cpp
View File

@ -119,6 +119,7 @@ namespace cryptonote
res.height = m_core.get_current_blockchain_height(); res.height = m_core.get_current_blockchain_height();
res.target_height = m_core.get_target_blockchain_height(); res.target_height = m_core.get_target_blockchain_height();
res.difficulty = m_core.get_blockchain_storage().get_difficulty_for_next_block(); res.difficulty = m_core.get_blockchain_storage().get_difficulty_for_next_block();
res.target = m_core.get_blockchain_storage().get_current_hard_fork_version() < 2 ? DIFFICULTY_TARGET_V1 : DIFFICULTY_TARGET;
res.tx_count = m_core.get_blockchain_storage().get_total_transactions() - res.height; //without coinbase res.tx_count = m_core.get_blockchain_storage().get_total_transactions() - res.height; //without coinbase
res.tx_pool_size = m_core.get_pool_transactions_count(); res.tx_pool_size = m_core.get_pool_transactions_count();
res.alt_blocks_count = m_core.get_blockchain_storage().get_alternative_blocks_count(); res.alt_blocks_count = m_core.get_blockchain_storage().get_alternative_blocks_count();

1
src/rpc/core_rpc_server_commands_defs.h
View File

@ -273,6 +273,7 @@ namespace cryptonote
uint64_t height; uint64_t height;
uint64_t target_height; uint64_t target_height;
uint64_t difficulty; uint64_t difficulty;
uint64_t target;
uint64_t tx_count; uint64_t tx_count;
uint64_t tx_pool_size; uint64_t tx_pool_size;
uint64_t alt_blocks_count; uint64_t alt_blocks_count;