Merge remote-tracking branch 'origin/mempool_thread' into mempool_thread

master
moneroexamples 7 years ago
commit 875a92566e

@ -379,10 +379,7 @@ namespace xmreg
{ {
json j_info; json j_info;
if (!get_monero_network_info(j_info)) get_monero_network_info(j_info);
{
return json{};
}
return j_info; return j_info;
}); });
@ -736,7 +733,7 @@ namespace xmreg
static_cast<double>( static_cast<double>(
current_network_info.block_size_limit / 2)/1024.0); current_network_info.block_size_limit / 2)/1024.0);
context["network_inf o"] = mstch::map { context["network_info"] = mstch::map {
{"difficulty" , current_network_info.difficulty}, {"difficulty" , current_network_info.difficulty},
{"hash_rate" , hash_rate}, {"hash_rate" , hash_rate},
{"fee_per_kb" , print_money(current_network_info.fee_per_kb)}, {"fee_per_kb" , print_money(current_network_info.fee_per_kb)},

Loading…
Cancel
Save