From ce336d4a391c0f5dc207d58bcf7b336293d79d74 Mon Sep 17 00:00:00 2001 From: Danny Ryan Date: Sun, 30 Jun 2019 22:31:14 -0600 Subject: [PATCH] last few config fixes to match spec --- configs/constant_presets/mainnet.yaml | 15 ++++++++++----- configs/constant_presets/minimal.yaml | 12 +++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/configs/constant_presets/mainnet.yaml b/configs/constant_presets/mainnet.yaml index 55993ada1..10ab26a00 100644 --- a/configs/constant_presets/mainnet.yaml +++ b/configs/constant_presets/mainnet.yaml @@ -19,6 +19,9 @@ CHURN_LIMIT_QUOTIENT: 65536 SHUFFLE_ROUND_COUNT: 90 # `2**16` (= 65,536) MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 65536 +# Jan 3, 2020 +MIN_GENESIS_TIME: 1578009600 + # Deposit contract @@ -41,7 +44,6 @@ EFFECTIVE_BALANCE_INCREMENT: 1000000000 # Initial values # --------------------------------------------------------------- -GENESIS_FORK_VERSION: 0x00000000 # 0, GENESIS_EPOCH is derived from this constant GENESIS_SLOT: 0 BLS_WITHDRAWAL_PREFIX: 0x00 @@ -51,8 +53,8 @@ BLS_WITHDRAWAL_PREFIX: 0x00 # --------------------------------------------------------------- # 6 seconds 6 seconds SECONDS_PER_SLOT: 6 -# 2**2 (= 4) slots 24 seconds -MIN_ATTESTATION_INCLUSION_DELAY: 4 +# 2**0 (= 1) slots 6 seconds +MIN_ATTESTATION_INCLUSION_DELAY: 1 # 2**6 (= 64) slots 6.4 minutes SLOTS_PER_EPOCH: 64 # 2**0 (= 1) epochs 6.4 minutes @@ -71,6 +73,9 @@ PERSISTENT_COMMITTEE_PERIOD: 2048 MAX_EPOCHS_PER_CROSSLINK: 64 # 2**2 (= 4) epochs 25.6 minutes MIN_EPOCHS_TO_INACTIVITY_PENALTY: 4 +# 2**14 (= 16,384) epochs ~73 days +EARLY_DERIVED_SECRET_PENALTY_MAX_FUTURE_EPOCHS: 16384 + # State vector lengths @@ -87,8 +92,8 @@ VALIDATOR_REGISTRY_LIMIT: 1099511627776 # Reward and penalty quotients # --------------------------------------------------------------- -# 2**5 (= 32) -BASE_REWARD_FACTOR: 32 +# 2**6 (= 64) +BASE_REWARD_FACTOR: 64 # 2**9 (= 512) WHISTLEBLOWER_REWARD_QUOTIENT: 512 # 2**3 (= 8) diff --git a/configs/constant_presets/minimal.yaml b/configs/constant_presets/minimal.yaml index 153b55a6c..b030333ff 100644 --- a/configs/constant_presets/minimal.yaml +++ b/configs/constant_presets/minimal.yaml @@ -18,6 +18,9 @@ CHURN_LIMIT_QUOTIENT: 65536 SHUFFLE_ROUND_COUNT: 10 # [customized] MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 64 +# Jan 3, 2020 +MIN_GENESIS_TIME: 1578009600 + # Deposit contract @@ -40,7 +43,6 @@ EFFECTIVE_BALANCE_INCREMENT: 1000000000 # Initial values # --------------------------------------------------------------- -GENESIS_FORK_VERSION: 0x00000000 # 0, GENESIS_EPOCH is derived from this constant GENESIS_SLOT: 0 BLS_WITHDRAWAL_PREFIX: 0x00 @@ -50,8 +52,8 @@ BLS_WITHDRAWAL_PREFIX: 0x00 # --------------------------------------------------------------- # 6 seconds 6 seconds SECONDS_PER_SLOT: 6 -# [customized] 2 slots -MIN_ATTESTATION_INCLUSION_DELAY: 2 +# 2**0 (= 1) slots 6 seconds +MIN_ATTESTATION_INCLUSION_DELAY: 1 # [customized] fast epochs SLOTS_PER_EPOCH: 8 # 2**0 (= 1) epochs @@ -88,8 +90,8 @@ VALIDATOR_REGISTRY_LIMIT: 1099511627776 # Reward and penalty quotients # --------------------------------------------------------------- -# 2**5 (= 32) -BASE_REWARD_FACTOR: 32 +# 2**6 (= 64) +BASE_REWARD_FACTOR: 64 # 2**9 (= 512) WHISTLEBLOWER_REWARD_QUOTIENT: 512 # 2**3 (= 8)