diff options
| author | rfree2monero <rfreemonero@op.pl> | 2015-04-01 18:24:45 +0200 |
|---|---|---|
| committer | rfree2monero <rfreemonero@op.pl> | 2015-04-01 18:24:45 +0200 |
| commit | 3cbdf198f168e113f12fa49d016133c434964ed7 (patch) | |
| tree | 050c74077de8e1b6e431f7d0671b57b5afcb01ab /src/cryptonote_core/cryptonote_basic_impl.cpp | |
| parent | f79821ac7ebc269b18dd2edd8ac0cb022861ad11 (diff) | |
| parent | b0151de60144ddc1f56d253e7574bd6a9aefa28f (diff) | |
| download | monzero-core-3cbdf198f168e113f12fa49d016133c434964ed7.tar.gz monzero-core-3cbdf198f168e113f12fa49d016133c434964ed7.tar.xz monzero-core-3cbdf198f168e113f12fa49d016133c434964ed7.zip | |
Merge remote-tracking branch 'monero-official/master' into network-1.6-work1
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) { |