diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-04-24 10:41:31 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-04-24 10:41:32 +0200 |
| commit | acbe0b4849409b82d94a063dec8962e74f703b4e (patch) | |
| tree | f259e7398d00de20939353df9d2fdda0b050cc1d /src/cryptonote_core/tx_pool.cpp | |
| parent | a059e91d7fbdbf8745e48dd1c86e336483ff778c (diff) | |
| parent | bff90264b8b4e3869aad92e09591f2a579504d7e (diff) | |
| download | monzero-core-acbe0b4849409b82d94a063dec8962e74f703b4e.tar.gz monzero-core-acbe0b4849409b82d94a063dec8962e74f703b4e.tar.xz monzero-core-acbe0b4849409b82d94a063dec8962e74f703b4e.zip | |
Merge pull request #1938
bff90264 Add expected total reward to RPC "getblocktemplate". Only works from V5 fork onward - returns 0 before that block. (assylias)
Diffstat (limited to 'src/cryptonote_core/tx_pool.cpp')
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 37b6fb4b0..f78f673c7 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -613,7 +613,7 @@ namespace cryptonote } //--------------------------------------------------------------------------------- //TODO: investigate whether boolean return is appropriate - bool tx_memory_pool::fill_block_template(block &bl, size_t median_size, uint64_t already_generated_coins, size_t &total_size, uint64_t &fee, uint8_t version) + bool tx_memory_pool::fill_block_template(block &bl, size_t median_size, uint64_t already_generated_coins, size_t &total_size, uint64_t &fee, uint64_t &expected_reward, uint8_t version) { // Warning: This function takes already_generated_ // coins as an argument and appears to do nothing @@ -705,6 +705,7 @@ namespace cryptonote LOG_PRINT_L2(" added, new block size " << total_size << "/" << max_total_size << ", coinbase " << print_money(best_coinbase)); } + expected_reward = best_coinbase; LOG_PRINT_L2("Block template filled with " << bl.tx_hashes.size() << " txes, size " << total_size << "/" << max_total_size << ", coinbase " << print_money(best_coinbase) << " (including " << print_money(fee) << " in fees)"); |