From 1b4bd3d1478839474a26d163312e99a810399b1b Mon Sep 17 00:00:00 2001 From: pk910 Date: Mon, 6 May 2024 15:38:20 +0200 Subject: [PATCH] feat: use `peer-das` image for dora when eip7594 is active (#593) Adds PeerDAS (EIP7594) support for dory by using a [custom image](https://github.com/ethpandaops/dora/pull/61) --- README.md | 4 ++-- network_params.yaml | 4 ++-- src/dora/dora_launcher.star | 2 ++ src/package_io/input_parser.star | 8 ++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 51a6d3707..d0eda9ec2 100644 --- a/README.md +++ b/README.md @@ -511,8 +511,8 @@ network_params: # The epoch at which the deneb/electra/eip7594(peerdas) forks are set to occur. Note: PeerDAS and Electra clients are currently # working on forks. So set either one of the below forks. deneb_fork_epoch: 0 - electra_fork_epoch: 500 - eip7594_fork_epoch: 1000 + electra_fork_epoch: 100000000 + eip7594_fork_epoch: 100000001 # The fork version to set if the eip7594 fork is active eip7594_fork_version: "0x70000038" diff --git a/network_params.yaml b/network_params.yaml index fdac45851..6bcfd66a1 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -71,8 +71,8 @@ network_params: min_validator_withdrawability_delay: 256 shard_committee_period: 256 deneb_fork_epoch: 0 - electra_fork_epoch: 500 - eip7594_fork_epoch: 1000 + electra_fork_epoch: 100000000 + eip7594_fork_epoch: 100000001 eip7594_fork_version: "0x70000038" network_sync_base_url: https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/ additional_services: diff --git a/src/dora/dora_launcher.star b/src/dora/dora_launcher.star index 74cd55453..a04dd2fa9 100644 --- a/src/dora/dora_launcher.star +++ b/src/dora/dora_launcher.star @@ -95,6 +95,8 @@ def get_config( if network_params.preset == "minimal": IMAGE_NAME = "ethpandaops/dora:minimal-preset" + elif network_params.eip7594_fork_epoch < 100000000: + IMAGE_NAME = "ethpandaops/dora:peer-das" else: IMAGE_NAME = "ethpandaops/dora:latest" diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 2c6b17523..ea133165f 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -693,8 +693,8 @@ def default_network_params(): "min_validator_withdrawability_delay": 256, "shard_committee_period": 256, "deneb_fork_epoch": 0, - "electra_fork_epoch": 500, - "eip7594_fork_epoch": 1000, + "electra_fork_epoch": 100000000, + "eip7594_fork_epoch": 100000001, "eip7594_fork_version": "0x70000038", "network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/", "preset": "mainnet", @@ -717,8 +717,8 @@ def default_minimal_network_params(): "min_validator_withdrawability_delay": 256, "shard_committee_period": 64, "deneb_fork_epoch": 0, - "electra_fork_epoch": 500, - "eip7594_fork_epoch": 1000, + "electra_fork_epoch": 100000000, + "eip7594_fork_epoch": 100000001, "eip7594_fork_version": "0x70000038", "network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/", "preset": "minimal",