diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-29 19:24:24 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-29 19:24:24 +0200 |
| commit | b91fc2dc3c4489f44a74915ae80fd1968d150302 (patch) | |
| tree | 96f432c221f6edb336b65000acf30f0c45e3efa9 /src/cryptonote_config.h | |
| parent | Merge pull request #628 (diff) | |
| parent | tx_pool: do not accept txes not in a block if they timed out before (diff) | |
| download | monero-b91fc2dc3c4489f44a74915ae80fd1968d150302.tar.xz | |
Merge pull request #629
94b98fb tx_pool: do not accept txes not in a block if they timed out before (moneromooo-monero)
eadbdf3 tx_pool: fix use of invalidated iterator (moneromooo-monero)
3b1d7e0 Fix V1/V2 use of hard fork related parameters (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_config.h')
| -rw-r--r-- | src/cryptonote_config.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index f89835ff2..1a093b501 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -55,7 +55,7 @@ #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 60000 //size of block (bytes) after which reward for block calculated using block size +#define CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V2 60000 //size of block (bytes) after which reward for block calculated using block size #define CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V1 20000 //size of block (bytes) after which reward for block calculated using block size - before first fork #define CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE 600 #define CRYPTONOTE_DISPLAY_DECIMAL_POINT 12 @@ -67,7 +67,7 @@ #define ORPHANED_BLOCKS_MAX_COUNT 100 -#define DIFFICULTY_TARGET 120 // seconds +#define DIFFICULTY_TARGET_V2 120 // seconds #define DIFFICULTY_TARGET_V1 60 // seconds - before first fork #define DIFFICULTY_WINDOW 720 // blocks #define DIFFICULTY_LAG 15 // !!! @@ -76,7 +76,7 @@ #define CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS_V1 DIFFICULTY_TARGET_V1 * CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS -#define CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS DIFFICULTY_TARGET * CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS +#define CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_SECONDS_V2 DIFFICULTY_TARGET_V2 * CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS #define CRYPTONOTE_LOCKED_TX_ALLOWED_DELTA_BLOCKS 1 |