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.h | |
parent | Merge pull request #1816 (diff) | |
parent | Add expected total reward to RPC "getblocktemplate". (diff) | |
download | monero-acbe0b4849409b82d94a063dec8962e74f703b4e.tar.xz |
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.h')
-rw-r--r-- | src/cryptonote_core/tx_pool.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_core/tx_pool.h b/src/cryptonote_core/tx_pool.h index d19f83b2e..f68bc0bb9 100644 --- a/src/cryptonote_core/tx_pool.h +++ b/src/cryptonote_core/tx_pool.h @@ -220,11 +220,12 @@ namespace cryptonote * @param already_generated_coins the current total number of coins "minted" * @param total_size return-by-reference the total size of the new block * @param fee return-by-reference the total of fees from the included transactions + * @param expected_reward return-by-reference the total reward awarded to the miner finding this block, including transaction fees * @param version hard fork version to use for consensus rules * * @return true */ - bool 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 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); /** * @brief get a list of all transactions in the pool |