diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-03-05 10:56:46 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-03-05 10:56:54 +0200 |
| commit | 8237705964bf712dbae37290d263dd88839e053d (patch) | |
| tree | 7bb4ad8cd910c947c709665c347f7a53e3572025 /src/cryptonote_core/cryptonote_basic_impl.cpp | |
| parent | c01069f35253586ac2fbc3d507c7ed3ccdd900ce (diff) | |
| parent | 41a95e7b11ba9eb7ef94e1708f2407608148b8ed (diff) | |
| download | monzero-core-8237705964bf712dbae37290d263dd88839e053d.tar.gz monzero-core-8237705964bf712dbae37290d263dd88839e053d.tar.xz monzero-core-8237705964bf712dbae37290d263dd88839e053d.zip | |
Merge pull request #237
41a95e7 add comment about avoiding overflow (smooth)
754a785 minimum subsidy for mining incentives, remove unused LEGACY_FEE define (smooth)
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) { |