Commit 6b7a409f authored by Parithosh Jayanthi's avatar Parithosh Jayanthi Committed by GitHub

feat: Adding support for EIP-7732 and EIP-7805 (#880)

- Awaiting a genesis generator update to consume these values
parent 8ff3b113
participants:
- el_type: geth
cl_type: teku
- el_type: reth
cl_type: prysm
- el_type: nethermind
cl_type: nimbus
- el_type: besu
cl_type: lighthouse
- el_type: nimbus
cl_type: lodestar
- el_type: erigon
cl_type: grandine
additional_services:
- dora
network_params:
altair_fork_epoch: 0
bellatrix_fork_epoch: 0
capella_fork_epoch: 0
deneb_fork_epoch: 0
electra_fork_epoch: 0
fulu_fork_epoch: 1
preset: minimal
electra_fork_epoch: 1
fulu_fork_epoch: 2
eip7732_fork_epoch: 3
eip7805_fork_epoch: 4
......@@ -23,7 +23,6 @@ additional_services:
- spamoor_blob
- custom_flood
- blobscan
- blockscout
- dugtrio
- blutgang
- apache
......
......@@ -89,7 +89,7 @@ DEFAULT_DORA_IMAGE = "ethpandaops/dora:latest"
DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest"
DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest"
DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE = (
"ethpandaops/ethereum-genesis-generator:3.5.4"
"ethpandaops/ethereum-genesis-generator:3.6.0"
)
DEFAULT_FLASHBOTS_RELAY_IMAGE = "flashbots/mev-boost-relay:0.29.2a3"
DEFAULT_FLASHBOTS_BUILDER_IMAGE = "ethpandaops/reth-rbuilder:develop"
......@@ -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
......
......@@ -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,
......
......@@ -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",
......
......@@ -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,
......
......@@ -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 }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment