diff options
| author | Thomas Winget <tewinget@gmail.com> | 2015-03-24 02:46:48 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2015-03-24 02:47:15 -0400 |
| commit | 8855a32044f53c5aa39feac305cd357a39f90d90 (patch) | |
| tree | fac6db80df678edd802e189f6dddb6dcc290c18b /src/cryptonote_core/cryptonote_basic_impl.cpp | |
| parent | 51e3579a809a01b4cc73891e44bba44b986f4840 (diff) | |
| parent | 178b009e904d1addb2b9c82044283d02098444cd (diff) | |
| download | monzero-core-8855a32044f53c5aa39feac305cd357a39f90d90.tar.gz monzero-core-8855a32044f53c5aa39feac305cd357a39f90d90.tar.xz monzero-core-8855a32044f53c5aa39feac305cd357a39f90d90.zip | |
Merge upstream to daemonize changes
Preparation for PR
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) { |