Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-07-22 22:00:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

print_coinbase_tx_sum now breaks output into fee and emission components

Browse source
This commit is contained in:
Dion Ahmetaj 2016-10-10 19:55:18 -04:00
parent dd6c44327b
commit 7db29d6903
5 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/cryptonote_core/cryptonote_core.cpp
View file

@ -616,18 +616,32 @@ namespace cryptonote
return true;
}
//-----------------------------------------------------------------------------------------------
uint64_t core::get_coinbase_tx_sum(const uint64_t start_offset, const uint64_t count)
std::pair<uint64_t, uint64_t> core::get_coinbase_tx_sum(const uint64_t start_offset, const uint64_t count)
{
std::list<block> blocks;
uint64_t coinbase_tx_sum = 0;
uint64_t current_index = start_offset;
std::list<transaction> txs;
std::list<crypto::hash> missed_txs;
uint64_t coinbase_amount = 0;
uint64_t emission_amount = 0;
uint64_t total_fee_amount = 0;
uint64_t tx_fee_amount = 0;
this->get_blocks(start_offset, count, blocks);
BOOST_FOREACH(auto& b, blocks)
{
coinbase_tx_sum += get_outs_money_amount(b.miner_tx);
coinbase_amount = get_outs_money_amount(b.miner_tx);
this->get_transactions(b.tx_hashes, txs, missed_txs);
BOOST_FOREACH(const auto& tx, txs)
{
tx_fee_amount += get_tx_fee(tx);
}
emission_amount += coinbase_amount - tx_fee_amount;
total_fee_amount += tx_fee_amount;
coinbase_amount = 0;
tx_fee_amount = 0;
}
return coinbase_tx_sum;
return std::pair<uint64_t, uint64_t>(emission_amount, total_fee_amount);
}
//-----------------------------------------------------------------------------------------------
bool core::check_tx_inputs_keyimages_diff(const transaction& tx) const

2
src/cryptonote_core/cryptonote_core.h
View file

@ -605,7 +605,7 @@ namespace cryptonote
*
* @return the number of blocks to sync in one go
*/
uint64_t get_coinbase_tx_sum(const uint64_t start_offset, const uint64_t count);
std::pair<uint64_t, uint64_t> get_coinbase_tx_sum(const uint64_t start_offset, const uint64_t count);
private: