diff options
| author | Thomas Winget <tewinget@gmail.com> | 2015-03-25 05:56:36 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2015-03-25 05:56:36 -0400 |
| commit | 5c0bc0050ccfd579ed75be384e928e0165d6b2ce (patch) | |
| tree | 7bce2200f19b05448cb719b54037a7c2c82d6bab /src/cryptonote_core/cryptonote_basic_impl.cpp | |
| parent | a96134113ead8bc21ea79be6c0660121978fbcc5 (diff) | |
| parent | d7286395c97afd9d33d6170c1cf24f1e38140b37 (diff) | |
| download | monzero-core-5c0bc0050ccfd579ed75be384e928e0165d6b2ce.tar.gz monzero-core-5c0bc0050ccfd579ed75be384e928e0165d6b2ce.tar.xz monzero-core-5c0bc0050ccfd579ed75be384e928e0165d6b2ce.zip | |
Merge upstream updates into blockchain branch
Diffstat (limited to 'src/cryptonote_core/cryptonote_basic_impl.cpp')
| -rw-r--r-- | src/cryptonote_core/cryptonote_basic_impl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/cryptonote_core/cryptonote_basic_impl.cpp b/src/cryptonote_core/cryptonote_basic_impl.cpp index a7416a7e4..f2d862e57 100644 --- a/src/cryptonote_core/cryptonote_basic_impl.cpp +++ b/src/cryptonote_core/cryptonote_basic_impl.cpp @@ -60,6 +60,10 @@ namespace cryptonote { //----------------------------------------------------------------------------------------------- bool get_block_reward(size_t median_size, size_t current_block_size, uint64_t already_generated_coins, uint64_t &reward) { uint64_t base_reward = (MONEY_SUPPLY - already_generated_coins) >> EMISSION_SPEED_FACTOR; + if (base_reward < FINAL_SUBSIDY_PER_MINUTE) + { + base_reward = FINAL_SUBSIDY_PER_MINUTE; + } //make it soft if (median_size < CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE) { |