diff options
| author | Javier Smooth <iamjaviersmooth@gmail.com> | 2015-11-13 00:24:47 -0800 |
|---|---|---|
| committer | Javier Smooth <iamjaviersmooth@gmail.com> | 2015-11-13 00:37:35 -0800 |
| commit | baf101ef4a05ae4d24ed717c16be929456775969 (patch) | |
| tree | 807afcbc2d1faf2f792a774d72a62ee835934092 /src/cryptonote_config.h | |
| parent | Adjust difficulty target (2 min) and full reward zone (60 kbytes) for block v... (diff) | |
| download | monero-baf101ef4a05ae4d24ed717c16be929456775969.tar.xz | |
More changes for 2-min blocks
Use the correct block time for realtime fuzz on locktime
Use the correct block time to calculate next_difficulty on alt chains (will not work as-is with voting)
Lock unit tests to original block time for now
Diffstat (limited to 'src/cryptonote_config.h')
| -rw-r--r-- | src/cryptonote_config.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/cryptonote_config.h b/src/cryptonote_config.h index 94ead558f..6053387ac 100644 --- a/src/cryptonote_config.h +++ b/src/cryptonote_config.h @@ -75,11 +75,12 @@ #define DIFFICULTY_BLOCKS_COUNT DIFFICULTY_WINDOW + DIFFICULTY_LAG +#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_BLOCKS 1 -#define DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN DIFFICULTY_TARGET //just alias +#define DIFFICULTY_BLOCKS_ESTIMATE_TIMESPAN DIFFICULTY_TARGET_V1 //just alias; used by tests #define BLOCKS_IDS_SYNCHRONIZING_DEFAULT_COUNT 10000 //by default, blocks ids count in synchronizing |