diff options
| author | smooth <iamjaviersmooth@gmail.com> | 2015-03-04 23:35:04 -0800 |
|---|---|---|
| committer | smooth <iamjaviersmooth@gmail.com> | 2015-03-04 23:35:04 -0800 |
| commit | 754a785ee15915c4d8d81dbd55d7005e07c6407e (patch) | |
| tree | 9148840a68ff9ca197cc29cd28bcdd9a3562def1 /src/cryptonote_core/blockchain_storage.cpp | |
| parent | c01069f35253586ac2fbc3d507c7ed3ccdd900ce (diff) | |
| download | monzero-core-754a785ee15915c4d8d81dbd55d7005e07c6407e.tar.gz monzero-core-754a785ee15915c4d8d81dbd55d7005e07c6407e.tar.xz monzero-core-754a785ee15915c4d8d81dbd55d7005e07c6407e.zip | |
minimum subsidy for mining incentives, remove unused LEGACY_FEE define
Diffstat (limited to 'src/cryptonote_core/blockchain_storage.cpp')
| -rw-r--r-- | src/cryptonote_core/blockchain_storage.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain_storage.cpp b/src/cryptonote_core/blockchain_storage.cpp index e2b6f2326..1f35e6a5b 100644 --- a/src/cryptonote_core/blockchain_storage.cpp +++ b/src/cryptonote_core/blockchain_storage.cpp @@ -1709,7 +1709,8 @@ bool blockchain_storage::handle_block_to_main_chain(const block& bl, const crypt bei.bl = bl; bei.block_cumulative_size = cumulative_block_size; bei.cumulative_difficulty = current_diffic; - bei.already_generated_coins = already_generated_coins + base_reward; + bei.already_generated_coins = base_reward < (MONEY_SUPPLY-already_generated_coins) ? already_generated_coins + base_reward : MONEY_SUPPLY; + if(m_blocks.size()) bei.cumulative_difficulty += m_blocks.back().cumulative_difficulty; |