Skip to content
Permalink
Browse files

print_coinbase_tx_sum now supports 128 bits sums

The tail emission will bring the total above 64 bits
  • Loading branch information
moneromooo-monero committed Dec 9, 2019
1 parent 411f1b0 commit bc11b3892dc13f3ccdc332795f14ea2539833f17
@@ -30,6 +30,7 @@

#include <atomic>
#include <boost/algorithm/string.hpp>
#include <boost/multiprecision/cpp_int.hpp>
#include "wipeable_string.h"
#include "string_tools.h"
#include "serialization/string.h"
@@ -996,17 +997,31 @@ namespace cryptonote
}
}
//---------------------------------------------------------------
std::string print_money(uint64_t amount, unsigned int decimal_point)
static void insert_money_decimal_point(std::string &s, unsigned int decimal_point)
{
if (decimal_point == (unsigned int)-1)
decimal_point = default_decimal_point;
std::string s = std::to_string(amount);
if(s.size() < decimal_point+1)
{
s.insert(0, decimal_point+1 - s.size(), '0');
}
if (decimal_point > 0)
s.insert(s.size() - decimal_point, ".");
}
//---------------------------------------------------------------
std::string print_money(uint64_t amount, unsigned int decimal_point)
{
std::string s = std::to_string(amount);
insert_money_decimal_point(s, decimal_point);
return s;
}
//---------------------------------------------------------------
std::string print_money(const boost::multiprecision::uint128_t &amount, unsigned int decimal_point)
{
std::stringstream ss;
ss << amount;
std::string s = ss.str();
insert_money_decimal_point(s, decimal_point);
return s;
}
//---------------------------------------------------------------
@@ -139,6 +139,9 @@ namespace cryptonote
unsigned int get_default_decimal_point();
std::string get_unit(unsigned int decimal_point = -1);
std::string print_money(uint64_t amount, unsigned int decimal_point = -1);
#ifdef BOOST_MP_CPP_INT_HPP
std::string print_money(const boost::multiprecision::uint128_t &amount, unsigned int decimal_point = -1);
#endif
//---------------------------------------------------------------
template<class t_object>
bool t_serializable_object_from_blob(t_object& to, const blobdata& b_blob)
@@ -1178,10 +1178,10 @@ namespace cryptonote
return m_mempool.check_for_key_images(key_im, spent);
}
//-----------------------------------------------------------------------------------------------
std::pair<uint64_t, uint64_t> core::get_coinbase_tx_sum(const uint64_t start_offset, const size_t count)
std::pair<boost::multiprecision::uint128_t, boost::multiprecision::uint128_t> core::get_coinbase_tx_sum(const uint64_t start_offset, const size_t count)
{
uint64_t emission_amount = 0;
uint64_t total_fee_amount = 0;
boost::multiprecision::uint128_t emission_amount = 0;
boost::multiprecision::uint128_t total_fee_amount = 0;
if (count)
{
const uint64_t end = start_offset + count - 1;
@@ -1203,7 +1203,7 @@ namespace cryptonote
});
}

return std::pair<uint64_t, uint64_t>(emission_amount, total_fee_amount);
return std::pair<boost::multiprecision::uint128_t, boost::multiprecision::uint128_t>(emission_amount, total_fee_amount);
}
//-----------------------------------------------------------------------------------------------
bool core::check_tx_inputs_keyimages_diff(const transaction& tx) const
@@ -743,7 +743,7 @@ namespace cryptonote
*
* @return the number of blocks to sync in one go
*/
std::pair<uint64_t, uint64_t> get_coinbase_tx_sum(const uint64_t start_offset, const size_t count);
std::pair<boost::multiprecision::uint128_t, boost::multiprecision::uint128_t> get_coinbase_tx_sum(const uint64_t start_offset, const size_t count);

/**
* @brief get the network type we're on
@@ -1852,8 +1852,8 @@ bool t_rpc_command_executor::print_coinbase_tx_sum(uint64_t height, uint64_t cou
tools::msg_writer() << "Sum of coinbase transactions between block heights ["
<< height << ", " << (height + count) << ") is "
<< cryptonote::print_money(res.emission_amount + res.fee_amount) << " "
<< "consisting of " << cryptonote::print_money(res.emission_amount)
<< " in emissions, and " << cryptonote::print_money(res.fee_amount) << " in fees";
<< "consisting of " << cryptonote::print_money(boost::multiprecision::uint128_t(res.wide_emission_amount))
<< " in emissions, and " << cryptonote::print_money(boost::multiprecision::uint128_t(res.wide_fee_amount)) << " in fees";
return true;
}

@@ -120,11 +120,16 @@ namespace
return (value + quantum - 1) / quantum * quantum;
}

void store_128(boost::multiprecision::uint128_t value, uint64_t &slow64, std::string &swide, uint64_t &stop64)
{
slow64 = (value & 0xffffffffffffffff).convert_to<uint64_t>();
swide = cryptonote::hex(value);
stop64 = ((value >> 64) & 0xffffffffffffffff).convert_to<uint64_t>();
}

void store_difficulty(cryptonote::difficulty_type difficulty, uint64_t &sdiff, std::string &swdiff, uint64_t &stop64)
{
sdiff = (difficulty & 0xffffffffffffffff).convert_to<uint64_t>();
swdiff = cryptonote::hex(difficulty);
stop64 = ((difficulty >> 64) & 0xffffffffffffffff).convert_to<uint64_t>();
store_128(difficulty, sdiff, swdiff, stop64);
}
}

@@ -2486,9 +2491,9 @@ namespace cryptonote
return true;
}
CHECK_PAYMENT_MIN1(req, res, COST_PER_COINBASE_TX_SUM_BLOCK * req.count, false);
std::pair<uint64_t, uint64_t> amounts = m_core.get_coinbase_tx_sum(req.height, req.count);
res.emission_amount = amounts.first;
res.fee_amount = amounts.second;
std::pair<boost::multiprecision::uint128_t, boost::multiprecision::uint128_t> amounts = m_core.get_coinbase_tx_sum(req.height, req.count);
store_128(amounts.first, res.emission_amount, res.wide_emission_amount, res.emission_amount_top64);
store_128(amounts.second, res.fee_amount, res.wide_fee_amount, res.fee_amount_top64);
res.status = CORE_RPC_STATUS_OK;
return true;
}
@@ -2021,12 +2021,20 @@ namespace cryptonote
struct response_t: public rpc_access_response_base
{
uint64_t emission_amount;
std::string wide_emission_amount;
uint64_t emission_amount_top64;
uint64_t fee_amount;
std::string wide_fee_amount;
uint64_t fee_amount_top64;

BEGIN_KV_SERIALIZE_MAP()
KV_SERIALIZE_PARENT(rpc_access_response_base)
KV_SERIALIZE(emission_amount)
KV_SERIALIZE(wide_emission_amount)
KV_SERIALIZE(emission_amount_top64)
KV_SERIALIZE(fee_amount)
KV_SERIALIZE(wide_fee_amount)
KV_SERIALIZE(fee_amount_top64)
END_KV_SERIALIZE_MAP()
};
typedef epee::misc_utils::struct_init<response_t> response;
@@ -203,10 +203,15 @@ def _test_generateblocks(self, blocks):
res_sum = daemon.get_coinbase_tx_sum(i, 1)
res_header = daemon.getblockheaderbyheight(i)
assert res_sum.emission_amount == res_header.block_header.reward
assert res_sum.emission_amount_top64 == 0
assert res_sum.emission_amount == int(res_sum.wide_emission_amount, 16)
assert res_sum.fee_amount == int(res_sum.wide_fee_amount, 16)

res = daemon.get_coinbase_tx_sum(0, 1)
assert res.emission_amount == 17592186044415
assert res.emission_amount_top64 == 0
assert res.fee_amount == 0
assert res.fee_amount_top64 == 0
sum_blocks = height + nblocks - 1
res = daemon.get_coinbase_tx_sum(0, sum_blocks)
extrapolated = 17592186044415 + 17592186044415 * 2 * (sum_blocks - 1)

0 comments on commit bc11b38

Please sign in to comment.
You can’t perform that action at this time.