fix: churn adjustments (ethereum#614)

Author: barnabasbusa

README.md

@@ -489,7 +489,11 @@ network_params:
   # Max churn rate for the network introduced by
   # EIP-7514 https:#eips.ethereum.org/EIPS/eip-7514
   # Defaults to 8
-  max_churn: 8
+  max_per_epoch_activation_churn_limit: 8
+
+  # Churn limit quotient for the network
+  # Defaults to 65536
+  churn_limit_quotient: 65536
 
   # Ejection balance
   # Defaults to 16ETH

network_params.yaml

@@ -65,7 +65,8 @@ network_params:
     very lucky have athlete"
   preregistered_validator_count: 0
   genesis_delay: 20
-  max_churn: 8
+  max_per_epoch_activation_churn_limit: 8
+  churn_limit_quotient: 65536
   ejection_balance: 16000000000
   eth1_follow_distance: 2048
   min_validator_withdrawability_delay: 256

src/package_io/constants.star

@@ -88,7 +88,7 @@ EIP7594_FORK_VERSION = "0x70000038"
 
 ETHEREUM_GENESIS_GENERATOR = struct(
     capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12",  # Deprecated (no support for minimal config)
-    deneb_genesis="ethpandaops/ethereum-genesis-generator:3.1.4",  # Default
+    deneb_genesis="ethpandaops/ethereum-genesis-generator:3.1.5",  # Default
     verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19",  # soon to be deneb genesis, waiting for rebase
     verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
 )

src/package_io/input_parser.star

@@ -262,7 +262,10 @@ def input_parser(plan, input_args):
             ],
             seconds_per_slot=result["network_params"]["seconds_per_slot"],
             genesis_delay=result["network_params"]["genesis_delay"],
-            max_churn=result["network_params"]["max_churn"],
+            max_per_epoch_activation_churn_limit=result["network_params"][
+                "max_per_epoch_activation_churn_limit"
+            ],
+            churn_limit_quotient=result["network_params"]["churn_limit_quotient"],
             ejection_balance=result["network_params"]["ejection_balance"],
             eth1_follow_distance=result["network_params"]["eth1_follow_distance"],
             deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"],
@@ -689,7 +692,8 @@ def default_network_params():
         "preregistered_validator_keys_mnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete",
         "preregistered_validator_count": 0,
         "genesis_delay": 20,
-        "max_churn": 8,
+        "max_per_epoch_activation_churn_limit": 8,
+        "churn_limit_quotient": 65536,
         "ejection_balance": 16000000000,
         "eth1_follow_distance": 2048,
         "min_validator_withdrawability_delay": 256,
@@ -713,7 +717,8 @@ def default_minimal_network_params():
         "preregistered_validator_keys_mnemonic": "giant issue aisle success illegal bike spike question tent bar rely arctic volcano long crawl hungry vocal artwork sniff fantasy very lucky have athlete",
         "preregistered_validator_count": 0,
         "genesis_delay": 20,
-        "max_churn": 4,
+        "max_per_epoch_activation_churn_limit": 4,
+        "churn_limit_quotient": 32,
         "ejection_balance": 16000000000,
         "eth1_follow_distance": 16,
         "min_validator_withdrawability_delay": 256,

src/participant_network.star

@@ -96,7 +96,8 @@ def launch_participant_network(
             network_params.preregistered_validator_keys_mnemonic,
             total_number_of_validator_keys,
             network_params.genesis_delay,
-            network_params.max_churn,
+            network_params.max_per_epoch_activation_churn_limit,
+            network_params.churn_limit_quotient,
             network_params.ejection_balance,
             network_params.eth1_follow_distance,
             network_params.deneb_fork_epoch,

src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star

@@ -20,7 +20,8 @@ def generate_el_cl_genesis_data(
     preregistered_validator_keys_mnemonic,
     total_num_validator_keys_to_preregister,
     genesis_delay,
-    max_churn,
+    max_per_epoch_activation_churn_limit,
+    churn_limit_quotient,
     ejection_balance,
     eth1_follow_distance,
     deneb_fork_epoch,
@@ -46,7 +47,8 @@ def generate_el_cl_genesis_data(
         preregistered_validator_keys_mnemonic,
         total_num_validator_keys_to_preregister,
         genesis_delay,
-        max_churn,
+        max_per_epoch_activation_churn_limit,
+        churn_limit_quotient,
         ejection_balance,
         eth1_follow_distance,
         deneb_fork_epoch,
@@ -128,7 +130,8 @@ def new_env_file_for_el_cl_genesis_data(
     preregistered_validator_keys_mnemonic,
     total_num_validator_keys_to_preregister,
     genesis_delay,
-    max_churn,
+    max_per_epoch_activation_churn_limit,
+    churn_limit_quotient,
     ejection_balance,
     eth1_follow_distance,
     deneb_fork_epoch,
@@ -148,7 +151,8 @@ def new_env_file_for_el_cl_genesis_data(
         "PreregisteredValidatorKeysMnemonic": preregistered_validator_keys_mnemonic,
         "NumValidatorKeysToPreregister": total_num_validator_keys_to_preregister,
         "GenesisDelay": genesis_delay,
-        "MaxChurn": max_churn,
+        "MaxPerEpochActivationChurnLimit": max_per_epoch_activation_churn_limit,
+        "ChurnLimitQuotient": churn_limit_quotient,
         "EjectionBalance": ejection_balance,
         "Eth1FollowDistance": eth1_follow_distance,
         "DenebForkEpoch": deneb_fork_epoch,

static_files/genesis-generation-config/el-cl/values.env.tmpl

@@ -20,7 +20,8 @@ export WITHDRAWAL_TYPE="0x00"
 export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134
 export GENESIS_TIMESTAMP={{ .UnixTimestamp }}
 export GENESIS_DELAY={{ .GenesisDelay }}
-export MAX_CHURN={{ .MaxChurn }}
+export MAX_PER_EPOCH_ACTIVATION_CHURN_LIMIT={{ .MaxPerEpochActivationChurnLimit }}
+export CHURN_LIMIT_QUOTIENT={{ .ChurnLimitQuotient }}
 export EJECTION_BALANCE={{ .EjectionBalance }}
 export ETH1_FOLLOW_DISTANCE={{ .Eth1FollowDistance }}
 export SHADOW_FORK_FILE={{ .ShadowForkFile }}