diff options
| author | Thomas Winget <tewinget@gmail.com> | 2015-03-25 05:56:36 -0400 |
|---|---|---|
| committer | Thomas Winget <tewinget@gmail.com> | 2015-03-25 05:56:36 -0400 |
| commit | 5c0bc0050ccfd579ed75be384e928e0165d6b2ce (patch) | |
| tree | 7bce2200f19b05448cb719b54037a7c2c82d6bab /src/cryptonote_config.h | |
| parent | Merges #36 (diff) | |
| parent | Merge pull request #243 (diff) | |
| download | monero-5c0bc0050ccfd579ed75be384e928e0165d6b2ce.tar.xz | |
Merge upstream updates into blockchain branch
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 |