|
|
@ -1141,7 +1141,7 @@ namespace xmreg
|
|
|
|
|
|
|
|
|
|
|
|
// add total fees in the block to the context
|
|
|
|
// add total fees in the block to the context
|
|
|
|
context["sum_fees"]
|
|
|
|
context["sum_fees"]
|
|
|
|
= xmreg::xmr_amount_to_str(sum_fees, "{:0.6f}");
|
|
|
|
= xmreg::xmr_amount_to_str(sum_fees, "{:0.6f}", "0");
|
|
|
|
|
|
|
|
|
|
|
|
// get xmr in the block reward
|
|
|
|
// get xmr in the block reward
|
|
|
|
context["blk_reward"]
|
|
|
|
context["blk_reward"]
|
|
|
@ -1623,7 +1623,7 @@ namespace xmreg
|
|
|
|
{"blk_height" , tx_blk_height_str},
|
|
|
|
{"blk_height" , tx_blk_height_str},
|
|
|
|
{"tx_size" , fmt::format("{:0.4f}",
|
|
|
|
{"tx_size" , fmt::format("{:0.4f}",
|
|
|
|
static_cast<double>(txd.size) / 1024.0)},
|
|
|
|
static_cast<double>(txd.size) / 1024.0)},
|
|
|
|
{"tx_fee" , xmreg::xmr_amount_to_str(txd.fee)},
|
|
|
|
{"tx_fee" , xmreg::xmr_amount_to_str(txd.fee, "{:0.12f}", true)},
|
|
|
|
{"blk_timestamp" , blk_timestamp},
|
|
|
|
{"blk_timestamp" , blk_timestamp},
|
|
|
|
{"delta_time" , age.first},
|
|
|
|
{"delta_time" , age.first},
|
|
|
|
{"outputs_no" , static_cast<uint64_t>(txd.output_pub_keys.size())},
|
|
|
|
{"outputs_no" , static_cast<uint64_t>(txd.output_pub_keys.size())},
|
|
|
@ -4946,7 +4946,7 @@ namespace xmreg
|
|
|
|
|
|
|
|
|
|
|
|
string emission_blk_no = std::to_string(current_values.blk_no - 1);
|
|
|
|
string emission_blk_no = std::to_string(current_values.blk_no - 1);
|
|
|
|
string emission_coinbase = xmr_amount_to_str(current_values.coinbase, "{:0.3f}");
|
|
|
|
string emission_coinbase = xmr_amount_to_str(current_values.coinbase, "{:0.3f}");
|
|
|
|
string emission_fee = xmr_amount_to_str(current_values.fee, "{:0.3f}");
|
|
|
|
string emission_fee = xmr_amount_to_str(current_values.fee, "{:0.3f}", false);
|
|
|
|
|
|
|
|
|
|
|
|
j_data = json {
|
|
|
|
j_data = json {
|
|
|
|
{"blk_no" , current_values.blk_no - 1},
|
|
|
|
{"blk_no" , current_values.blk_no - 1},
|
|
|
@ -5297,7 +5297,7 @@ namespace xmreg
|
|
|
|
{"tx_blk_height" , tx_blk_height},
|
|
|
|
{"tx_blk_height" , tx_blk_height},
|
|
|
|
{"tx_size" , fmt::format("{:0.4f}",
|
|
|
|
{"tx_size" , fmt::format("{:0.4f}",
|
|
|
|
static_cast<double>(txd.size) / 1024.0)},
|
|
|
|
static_cast<double>(txd.size) / 1024.0)},
|
|
|
|
{"tx_fee" , xmreg::xmr_amount_to_str(txd.fee)},
|
|
|
|
{"tx_fee" , xmreg::xmr_amount_to_str(txd.fee, "{:0.12f}", false)},
|
|
|
|
{"tx_version" , static_cast<uint64_t>(txd.version)},
|
|
|
|
{"tx_version" , static_cast<uint64_t>(txd.version)},
|
|
|
|
{"blk_timestamp" , blk_timestamp},
|
|
|
|
{"blk_timestamp" , blk_timestamp},
|
|
|
|
{"blk_timestamp_uint" , blk.timestamp},
|
|
|
|
{"blk_timestamp_uint" , blk.timestamp},
|
|
|
|