From d255effad6c6a94e32fd35e0fc1f65258f8a2310 Mon Sep 17 00:00:00 2001 From: parithosh Date: Sun, 26 Jan 2025 22:13:26 +0530 Subject: [PATCH] adding new fork values --- src/package_io/constants.star | 5 +++++ src/package_io/input_parser.star | 6 ++++++ src/package_io/sanity_check.star | 2 ++ .../el_cl_genesis/el_cl_genesis_generator.star | 4 ++++ .../genesis-generation-config/el-cl/values.env.tmpl | 4 ++++ 5 files changed, 21 insertions(+) diff --git a/src/package_io/constants.star b/src/package_io/constants.star index 63a1c80d9..ff67a6e79 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -116,6 +116,11 @@ ELECTRA_FORK_VERSION = "0x60000038" ELECTRA_FORK_EPOCH = 100000000 FULU_FORK_VERSION = "0x70000038" FULU_FORK_EPOCH = 100000001 +EIP7732_FORK_EPOCH = 100000002 +EIP7732_FORK_VERSION = "0x80000038" +EIP7805_FORK_EPOCH = 100000003 +EIP7805_FORK_VERSION = "0x90000038" + MAX_LABEL_LENGTH = 63 diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 0e3466706..ed66c59e5 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -329,6 +329,8 @@ def input_parser(plan, input_args): deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"], electra_fork_epoch=result["network_params"]["electra_fork_epoch"], fulu_fork_epoch=result["network_params"]["fulu_fork_epoch"], + eip7732_fork_epoch=result["network_params"]["eip7732_fork_epoch"], + eip7805_fork_epoch=result["network_params"]["eip7805_fork_epoch"], network=result["network_params"]["network"], min_validator_withdrawability_delay=result["network_params"][ "min_validator_withdrawability_delay" @@ -909,6 +911,8 @@ def default_network_params(): "deneb_fork_epoch": 0, "electra_fork_epoch": constants.ELECTRA_FORK_EPOCH, "fulu_fork_epoch": constants.FULU_FORK_EPOCH, + "eip7732_fork_epoch": constants.EIP7732_FORK_EPOCH, + "eip7805_fork_epoch": constants.EIP7805_FORK_EPOCH, "network_sync_base_url": "https://snapshots.ethpandaops.io/", "data_column_sidecar_subnet_count": 128, "samples_per_slot": 8, @@ -948,6 +952,8 @@ def default_minimal_network_params(): "deneb_fork_epoch": 0, "electra_fork_epoch": constants.ELECTRA_FORK_EPOCH, "fulu_fork_epoch": constants.FULU_FORK_EPOCH, + "eip7732_fork_epoch": constants.EIP7732_FORK_EPOCH, + "eip7805_fork_epoch": constants.EIP7805_FORK_EPOCH, "network_sync_base_url": "https://snapshots.ethpandaops.io/", "data_column_sidecar_subnet_count": 128, "samples_per_slot": 8, diff --git a/src/package_io/sanity_check.star b/src/package_io/sanity_check.star index d8c94b0ed..1089178d7 100644 --- a/src/package_io/sanity_check.star +++ b/src/package_io/sanity_check.star @@ -159,6 +159,8 @@ SUBCATEGORY_PARAMS = { "deneb_fork_epoch", "electra_fork_epoch", "fulu_fork_epoch", + "eip7732_fork_epoch", + "eip7805_fork_epoch", "network_sync_base_url", "data_column_sidecar_subnet_count", "samples_per_slot", diff --git a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star index 35327bb8c..5e5eefe41 100644 --- a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star +++ b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star @@ -113,6 +113,8 @@ def new_env_file_for_el_cl_genesis_data( "DenebForkEpoch": network_params.deneb_fork_epoch, "ElectraForkEpoch": network_params.electra_fork_epoch, "FuluForkEpoch": network_params.fulu_fork_epoch, + "Eip7732ForkEpoch": network_params.eip7732_fork_epoch, + "Eip7805ForkEpoch": network_params.eip7805_fork_epoch, "GenesisForkVersion": constants.GENESIS_FORK_VERSION, "AltairForkVersion": constants.ALTAIR_FORK_VERSION, "BellatrixForkVersion": constants.BELLATRIX_FORK_VERSION, @@ -120,6 +122,8 @@ def new_env_file_for_el_cl_genesis_data( "DenebForkVersion": constants.DENEB_FORK_VERSION, "ElectraForkVersion": constants.ELECTRA_FORK_VERSION, "FuluForkVersion": constants.FULU_FORK_VERSION, + "Eip7732ForkVersion": constants.EIP7732_FORK_VERSION, + "Eip7805ForkVersion": constants.EIP7805_FORK_VERSION, "ShadowForkFile": shadowfork_file, "MinValidatorWithdrawabilityDelay": network_params.min_validator_withdrawability_delay, "ShardCommitteePeriod": network_params.shard_committee_period, diff --git a/static_files/genesis-generation-config/el-cl/values.env.tmpl b/static_files/genesis-generation-config/el-cl/values.env.tmpl index acd4d1c96..3f4ec85a2 100644 --- a/static_files/genesis-generation-config/el-cl/values.env.tmpl +++ b/static_files/genesis-generation-config/el-cl/values.env.tmpl @@ -19,6 +19,10 @@ export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}" export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}" export FULU_FORK_VERSION="{{ .FuluForkVersion }}" export FULU_FORK_EPOCH="{{ .FuluForkEpoch }}" +export EIP7732_FORK_VERSION="{{ .Eip7732ForkVersion }}" +export EIP7732_FORK_EPOCH="{{ .Eip7732ForkEpoch }}" +export EIP7805_FORK_VERSION="{{ .Eip7805ForkVersion }}" +export EIP7805_FORK_EPOCH="{{ .Eip7805ForkEpoch }}" export WITHDRAWAL_TYPE="0x00" export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134 export GENESIS_TIMESTAMP={{ .UnixTimestamp }}