From 2ed3b027a7631e3057cf984e09351450ac216601 Mon Sep 17 00:00:00 2001 From: Etan Kissling Date: Fri, 5 May 2023 16:47:34 +0200 Subject: [PATCH] remove `SAFE_SLOTS_TO_UPDATE_JUSTIFIED` The `SAFE_SLOTS_TO_UPDATE_JUSTIFIED` constant is no longer used as the bouncing attack fix was removed: https://github.com/ethereum/consensus-specs/pull/3290 --- lighthouse/testnet0/config.yaml | 1 - lighthouse/testnet2/config.yaml | 1 - lighthouse/testnet5/config.yaml | 3 +-- prysm/Onyx(v0.12.1)/config.yaml | 1 - prysm/Sapphire(v0.9.4)/config.yaml | 1 - prysm/Topaz(v0.11.1)/config.yaml | 1 - shared/altona/config.yaml | 1 - shared/attacknet-beta1-mc-0/config.yaml | 1 - shared/medalla/config.yaml | 6 ------ shared/rayonism/nocturne/config.yaml | 6 ------ shared/rayonism/steklo/config.yaml | 5 ----- shared/schlesi/config.yaml | 7 ------- shared/spadina/config.yaml | 1 - shared/toledo/config.yaml | 7 ------- shared/witti/config.yaml | 5 ----- shared/zinken/config.yaml | 1 - teku/coorparoo/phase0.yaml | 8 +------- teku/oonoonba/phase0.yaml | 8 +------- teku/yeerongpilly/phase0.yaml | 8 +------- 19 files changed, 4 insertions(+), 68 deletions(-) diff --git a/lighthouse/testnet0/config.yaml b/lighthouse/testnet0/config.yaml index e82b5f5..7428ca3 100644 --- a/lighthouse/testnet0/config.yaml +++ b/lighthouse/testnet0/config.yaml @@ -27,7 +27,6 @@ WHISTLEBLOWER_REWARD_QUOTIENT: 512 PROPOSER_REWARD_QUOTIENT: 8 INACTIVITY_PENALTY_QUOTIENT: 33554432 MIN_SLASHING_PENALTY_QUOTIENT: 32 -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 DOMAIN_BEACON_PROPOSER: 0x00000000 DOMAIN_BEACON_ATTESTER: 0x01000000 DOMAIN_RANDAO: 0x02000000 diff --git a/lighthouse/testnet2/config.yaml b/lighthouse/testnet2/config.yaml index b53cab9..8ecb870 100644 --- a/lighthouse/testnet2/config.yaml +++ b/lighthouse/testnet2/config.yaml @@ -27,7 +27,6 @@ WHISTLEBLOWER_REWARD_QUOTIENT: 512 PROPOSER_REWARD_QUOTIENT: 8 INACTIVITY_PENALTY_QUOTIENT: 33554432 MIN_SLASHING_PENALTY_QUOTIENT: 32 -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 DOMAIN_BEACON_PROPOSER: 0x00000000 DOMAIN_BEACON_ATTESTER: 0x01000000 DOMAIN_RANDAO: 0x02000000 diff --git a/lighthouse/testnet5/config.yaml b/lighthouse/testnet5/config.yaml index aa46e00..fa5cf22 100644 --- a/lighthouse/testnet5/config.yaml +++ b/lighthouse/testnet5/config.yaml @@ -28,7 +28,6 @@ WHISTLEBLOWER_REWARD_QUOTIENT: 512 PROPOSER_REWARD_QUOTIENT: 8 INACTIVITY_PENALTY_QUOTIENT: 33554432 MIN_SLASHING_PENALTY_QUOTIENT: 32 -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 DOMAIN_BEACON_PROPOSER: 0x00000000 DOMAIN_BEACON_ATTESTER: 0x01000000 DOMAIN_RANDAO: 0x02000000 @@ -53,4 +52,4 @@ ETH1_FOLLOW_DISTANCE: 16 TARGET_AGGREGATORS_PER_COMMITTEE: 0 RANDOM_SUBNETS_PER_VALIDATOR: 0 EPOCHS_PER_RANDOM_SUBNET_SUBSCRIPTION: 0 -SECONDS_PER_ETH1_BLOCK: 14 \ No newline at end of file +SECONDS_PER_ETH1_BLOCK: 14 diff --git a/prysm/Onyx(v0.12.1)/config.yaml b/prysm/Onyx(v0.12.1)/config.yaml index 4aea380..3fd33ef 100644 --- a/prysm/Onyx(v0.12.1)/config.yaml +++ b/prysm/Onyx(v0.12.1)/config.yaml @@ -31,7 +31,6 @@ WHISTLEBLOWER_REWARD_QUOTIENT: 512 PROPOSER_REWARD_QUOTIENT: 8 INACTIVITY_PENALTY_QUOTIENT: 16777216 MIN_SLASHING_PENALTY_QUOTIENT: 32 -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 DOMAIN_BEACON_PROPOSER: 0x00000000 DOMAIN_BEACON_ATTESTER: 0x01000000 DOMAIN_RANDAO: 0x02000000 diff --git a/prysm/Sapphire(v0.9.4)/config.yaml b/prysm/Sapphire(v0.9.4)/config.yaml index a543d53..2bc2efd 100644 --- a/prysm/Sapphire(v0.9.4)/config.yaml +++ b/prysm/Sapphire(v0.9.4)/config.yaml @@ -26,7 +26,6 @@ WHISTLEBLOWER_REWARD_QUOTIENT: 512 PROPOSER_REWARD_QUOTIENT: 8 INACTIVITY_PENALTY_QUOTIENT: 3355443 MIN_SLASHING_PENALTY_QUOTIENT: 32 -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 DOMAIN_BEACON_PROPOSER: 0x00000000 DOMAIN_BEACON_ATTESTER: 0x01000000 DOMAIN_RANDAO: 0x02000000 diff --git a/prysm/Topaz(v0.11.1)/config.yaml b/prysm/Topaz(v0.11.1)/config.yaml index 6c53d18..f1ab299 100644 --- a/prysm/Topaz(v0.11.1)/config.yaml +++ b/prysm/Topaz(v0.11.1)/config.yaml @@ -31,7 +31,6 @@ WHISTLEBLOWER_REWARD_QUOTIENT: 512 PROPOSER_REWARD_QUOTIENT: 8 INACTIVITY_PENALTY_QUOTIENT: 33554432 MIN_SLASHING_PENALTY_QUOTIENT: 32 -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 DOMAIN_BEACON_PROPOSER: 0x00000000 DOMAIN_BEACON_ATTESTER: 0x01000000 DOMAIN_RANDAO: 0x02000000 diff --git a/shared/altona/config.yaml b/shared/altona/config.yaml index f8963b8..83bd1c0 100644 --- a/shared/altona/config.yaml +++ b/shared/altona/config.yaml @@ -9,7 +9,6 @@ MIN_GENESIS_TIME: 1593433800 HYSTERESIS_QUOTIENT: 4 HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 ETH1_FOLLOW_DISTANCE: 1024 TARGET_AGGREGATORS_PER_COMMITTEE: 16 RANDOM_SUBNETS_PER_VALIDATOR: 1 diff --git a/shared/attacknet-beta1-mc-0/config.yaml b/shared/attacknet-beta1-mc-0/config.yaml index 08410a2..0da1374 100644 --- a/shared/attacknet-beta1-mc-0/config.yaml +++ b/shared/attacknet-beta1-mc-0/config.yaml @@ -27,7 +27,6 @@ WHISTLEBLOWER_REWARD_QUOTIENT: 512 PROPOSER_REWARD_QUOTIENT: 8 INACTIVITY_PENALTY_QUOTIENT: 16777216 MIN_SLASHING_PENALTY_QUOTIENT: 32 -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 DOMAIN_BEACON_PROPOSER: 0x00000000 DOMAIN_BEACON_ATTESTER: 0x01000000 DOMAIN_RANDAO: 0x02000000 diff --git a/shared/medalla/config.yaml b/shared/medalla/config.yaml index bd81a14..e513876 100644 --- a/shared/medalla/config.yaml +++ b/shared/medalla/config.yaml @@ -26,12 +26,6 @@ HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 -# Fork Choice -# --------------------------------------------------------------- -# 2**3 (= 8) -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 - - # Validator # --------------------------------------------------------------- # 2**10 (= 1,024) diff --git a/shared/rayonism/nocturne/config.yaml b/shared/rayonism/nocturne/config.yaml index c84436f..34b8416 100644 --- a/shared/rayonism/nocturne/config.yaml +++ b/shared/rayonism/nocturne/config.yaml @@ -19,11 +19,6 @@ HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 -# Fork Choice -# --------------------------------------------------------------- -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 - - # Validator # --------------------------------------------------------------- ETH1_FOLLOW_DISTANCE: 2048 @@ -121,4 +116,3 @@ MERGE_FORK_SLOT: 0 # Transition # --------------------------------------------------------------- TRANSITION_TOTAL_DIFFICULTY: 0 - diff --git a/shared/rayonism/steklo/config.yaml b/shared/rayonism/steklo/config.yaml index a433fb9..a1db1c5 100644 --- a/shared/rayonism/steklo/config.yaml +++ b/shared/rayonism/steklo/config.yaml @@ -19,11 +19,6 @@ HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 -# Fork Choice -# --------------------------------------------------------------- -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 - - # Validator # --------------------------------------------------------------- ETH1_FOLLOW_DISTANCE: 2048 diff --git a/shared/schlesi/config.yaml b/shared/schlesi/config.yaml index 9e498a2..fcec8b8 100644 --- a/shared/schlesi/config.yaml +++ b/shared/schlesi/config.yaml @@ -29,12 +29,6 @@ HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 -# Fork Choice -# --------------------------------------------------------------- -# 2**3 (= 8) -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 - - # Validator # --------------------------------------------------------------- # 2**10 (= 1,024) @@ -221,4 +215,3 @@ MAX_CUSTODY_SLASHINGS: 1 EARLY_DERIVED_SECRET_REVEAL_SLOT_REWARD_MULTIPLE: 2 # 2**8 (= 256) MINOR_REWARD_QUOTIENT: 256 - diff --git a/shared/spadina/config.yaml b/shared/spadina/config.yaml index 59b8105..ba1d13c 100644 --- a/shared/spadina/config.yaml +++ b/shared/spadina/config.yaml @@ -10,7 +10,6 @@ HYSTERESIS_QUOTIENT: 4 HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 PROPORTIONAL_SLASHING_MULTIPLIER: 3 -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 ETH1_FOLLOW_DISTANCE: 1024 TARGET_AGGREGATORS_PER_COMMITTEE: 16 RANDOM_SUBNETS_PER_VALIDATOR: 1 diff --git a/shared/toledo/config.yaml b/shared/toledo/config.yaml index 6d1eabc..f76070d 100644 --- a/shared/toledo/config.yaml +++ b/shared/toledo/config.yaml @@ -26,12 +26,6 @@ HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 -# Fork Choice -# --------------------------------------------------------------- -# 2**3 (= 8) -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 - - # Validator # --------------------------------------------------------------- # 2**11 (= 2,048) @@ -150,4 +144,3 @@ DOMAIN_DEPOSIT: 0x03000000 DOMAIN_VOLUNTARY_EXIT: 0x04000000 DOMAIN_SELECTION_PROOF: 0x05000000 DOMAIN_AGGREGATE_AND_PROOF: 0x06000000 - diff --git a/shared/witti/config.yaml b/shared/witti/config.yaml index 3e52d14..79779a9 100644 --- a/shared/witti/config.yaml +++ b/shared/witti/config.yaml @@ -25,11 +25,6 @@ HYSTERESIS_DOWNWARD_MULTIPLIER: 1 # 5 (plus 1.25) HYSTERESIS_UPWARD_MULTIPLIER: 5 -# Fork Choice -# --------------------------------------------------------------- -# 2**3 (= 8) -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 - # Validator # --------------------------------------------------------------- # 2**10 (= 1,024) diff --git a/shared/zinken/config.yaml b/shared/zinken/config.yaml index d523112..1d89961 100644 --- a/shared/zinken/config.yaml +++ b/shared/zinken/config.yaml @@ -11,7 +11,6 @@ HYSTERESIS_QUOTIENT: 4 HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 PROPORTIONAL_SLASHING_MULTIPLIER: 3 -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 ETH1_FOLLOW_DISTANCE: 1024 TARGET_AGGREGATORS_PER_COMMITTEE: 16 RANDOM_SUBNETS_PER_VALIDATOR: 1 diff --git a/teku/coorparoo/phase0.yaml b/teku/coorparoo/phase0.yaml index ed901a2..f7099b1 100644 --- a/teku/coorparoo/phase0.yaml +++ b/teku/coorparoo/phase0.yaml @@ -26,12 +26,6 @@ HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 -# Fork Choice -# --------------------------------------------------------------- -# 2**3 (= 8) -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 - - # Validator # --------------------------------------------------------------- # 2**11 (= 2,048) @@ -150,4 +144,4 @@ DOMAIN_RANDAO: 0x02000000 DOMAIN_DEPOSIT: 0x03000000 DOMAIN_VOLUNTARY_EXIT: 0x04000000 DOMAIN_SELECTION_PROOF: 0x05000000 -DOMAIN_AGGREGATE_AND_PROOF: 0x06000000 \ No newline at end of file +DOMAIN_AGGREGATE_AND_PROOF: 0x06000000 diff --git a/teku/oonoonba/phase0.yaml b/teku/oonoonba/phase0.yaml index 0a51948..61105a4 100644 --- a/teku/oonoonba/phase0.yaml +++ b/teku/oonoonba/phase0.yaml @@ -26,12 +26,6 @@ HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 -# Fork Choice -# --------------------------------------------------------------- -# 2**3 (= 8) -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 - - # Validator # --------------------------------------------------------------- # 2**11 (= 2,048) @@ -150,4 +144,4 @@ DOMAIN_RANDAO: 0x02000000 DOMAIN_DEPOSIT: 0x03000000 DOMAIN_VOLUNTARY_EXIT: 0x04000000 DOMAIN_SELECTION_PROOF: 0x05000000 -DOMAIN_AGGREGATE_AND_PROOF: 0x06000000 \ No newline at end of file +DOMAIN_AGGREGATE_AND_PROOF: 0x06000000 diff --git a/teku/yeerongpilly/phase0.yaml b/teku/yeerongpilly/phase0.yaml index f9eae70..195d0f1 100644 --- a/teku/yeerongpilly/phase0.yaml +++ b/teku/yeerongpilly/phase0.yaml @@ -26,12 +26,6 @@ HYSTERESIS_DOWNWARD_MULTIPLIER: 1 HYSTERESIS_UPWARD_MULTIPLIER: 5 -# Fork Choice -# --------------------------------------------------------------- -# 2**3 (= 8) -SAFE_SLOTS_TO_UPDATE_JUSTIFIED: 8 - - # Validator # --------------------------------------------------------------- # 2**11 (= 2,048) @@ -150,4 +144,4 @@ DOMAIN_RANDAO: 0x02000000 DOMAIN_DEPOSIT: 0x03000000 DOMAIN_VOLUNTARY_EXIT: 0x04000000 DOMAIN_SELECTION_PROOF: 0x05000000 -DOMAIN_AGGREGATE_AND_PROOF: 0x06000000 \ No newline at end of file +DOMAIN_AGGREGATE_AND_PROOF: 0x06000000