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_config.h | |
| parent | fixed English word list issue: 'launchpad' should be 'ourselves' (diff) | |
| parent | add comment about avoiding overflow (diff) | |
| download | monero-8237705964bf712dbae37290d263dd88839e053d.tar.xz | |
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_config.h')
| -rw-r--r-- | src/cryptonote_config.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index e26945086..e5df844e7 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -51,6 +51,7 @@ // MONEY_SUPPLY - total number coins to be generated #define MONEY_SUPPLY ((uint64_t)(-1)) #define EMISSION_SPEED_FACTOR (20) +#define FINAL_SUBSIDY_PER_MINUTE ((uint64_t)300000000000) // 3 * pow(10, 11) #define CRYPTONOTE_REWARD_BLOCKS_WINDOW 100 #define CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE 20000 //size of block (bytes) after which reward for block calculated using block size @@ -61,9 +62,6 @@ #define FEE_PER_KB ((uint64_t)10000000000) // pow(10, 10) -// temporarily to allow backward compatibility during the switch to per-kb -//#define MINING_ALLOWED_LEGACY_FEE ((uint64_t)100000000000) // pow(10, 11) - #define ORPHANED_BLOCKS_MAX_COUNT 100 |