From cf5256f7ec1551d0292cd88e1e5e35239c8664d2 Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 6 May 2024 11:06:47 +0200 Subject: [PATCH 01/11] add peerdas support --- .github/tests/lighthouse-all.yaml | 11 +---------- README.md | 5 +++-- network_params.yaml | 1 + src/package_io/constants.star | 3 ++- src/package_io/input_parser.star | 3 +++ src/participant_network.star | 2 ++ .../el_cl_genesis/el_cl_genesis_generator.star | 4 ++++ .../genesis-generation-config/el-cl/values.env.tmpl | 1 + 8 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.github/tests/lighthouse-all.yaml b/.github/tests/lighthouse-all.yaml index 72ea6a317..75a9d9a0a 100644 --- a/.github/tests/lighthouse-all.yaml +++ b/.github/tests/lighthouse-all.yaml @@ -1,14 +1,5 @@ participants: - el_type: geth cl_type: lighthouse - - el_type: nethermind - cl_type: lighthouse - - el_type: erigon - cl_type: lighthouse - - el_type: besu - cl_type: lighthouse - - el_type: reth - cl_type: lighthouse - - el_type: ethereumjs - cl_type: lighthouse + count: 3 additional_services: [] diff --git a/README.md b/README.md index a8518c8f9..90eba269c 100644 --- a/README.md +++ b/README.md @@ -508,10 +508,11 @@ network_params: # Defaults to 256 epoch ~27 hours shard_committee_period: 256 - # The epoch at which the deneb/electra forks are set to occur. + # 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 # Network sync base url for syncing public networks from a custom snapshot (mostly useful for shadowforks) # Defaults to "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/ # If you have a local snapshot, you can set this to the local url: diff --git a/network_params.yaml b/network_params.yaml index 8a8786726..5c245c01c 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -72,6 +72,7 @@ network_params: shard_committee_period: 256 deneb_fork_epoch: 0 electra_fork_epoch: 500 + eip7594_fork_epoch: 1000 network_sync_base_url: https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/ additional_services: - tx_spammer diff --git a/src/package_io/constants.star b/src/package_io/constants.star index 1439197b1..3611c7610 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -84,10 +84,11 @@ BELLATRIX_FORK_VERSION = "0x30000038" CAPELLA_FORK_VERSION = "0x40000038" DENEB_FORK_VERSION = "0x50000038" ELECTRA_FORK_VERSION = "0x60000038" +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.0.5", # Default + deneb_genesis="ethpandaops/ethereum-genesis-generator:3.1.0", # 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", ) diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 8f8f910ce..00faa66b3 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -267,6 +267,7 @@ def input_parser(plan, input_args): eth1_follow_distance=result["network_params"]["eth1_follow_distance"], deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"], electra_fork_epoch=result["network_params"]["electra_fork_epoch"], + peerdas_fork_epoch=result["network_params"]["eip7594_fork_epoch"], network=result["network_params"]["network"], min_validator_withdrawability_delay=result["network_params"][ "min_validator_withdrawability_delay" @@ -692,6 +693,7 @@ def default_network_params(): "shard_committee_period": 256, "deneb_fork_epoch": 0, "electra_fork_epoch": 500, + "eip7594_fork_epoch": 1000, "network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/", "preset": "mainnet", } @@ -714,6 +716,7 @@ def default_minimal_network_params(): "shard_committee_period": 64, "deneb_fork_epoch": 0, "electra_fork_epoch": 500, + "eip7594_fork_epoch": 1000, "network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/", "preset": "minimal", } diff --git a/src/participant_network.star b/src/participant_network.star index 52cacb755..3f975f874 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -101,6 +101,7 @@ def launch_participant_network( network_params.eth1_follow_distance, network_params.deneb_fork_epoch, network_params.electra_fork_epoch, + network_params.eip7594_fork_epoch, latest_block.files_artifacts[0] if latest_block != "" else "", network_params.min_validator_withdrawability_delay, network_params.shard_committee_period, @@ -340,6 +341,7 @@ def launch_participant_network( preset=network_params.preset, network=network_params.network, electra_fork_epoch=network_params.electra_fork_epoch, + eip7594_fork_epoch=network_params.eip7594_fork_epoch, ) all_vc_contexts.append(vc_context) 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 95b882c29..db0535c96 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 @@ -25,6 +25,7 @@ def generate_el_cl_genesis_data( eth1_follow_distance, deneb_fork_epoch, electra_fork_epoch, + eip7594_fork_epoch, latest_block, min_validator_withdrawability_delay, shard_committee_period, @@ -49,6 +50,7 @@ def generate_el_cl_genesis_data( eth1_follow_distance, deneb_fork_epoch, electra_fork_epoch, + eip7594_fork_epoch, shadowfork_file, min_validator_withdrawability_delay, shard_committee_period, @@ -129,6 +131,7 @@ def new_env_file_for_el_cl_genesis_data( eth1_follow_distance, deneb_fork_epoch, electra_fork_epoch, + eip7594_fork_epoch, shadowfork_file, min_validator_withdrawability_delay, shard_committee_period, @@ -147,6 +150,7 @@ def new_env_file_for_el_cl_genesis_data( "Eth1FollowDistance": eth1_follow_distance, "DenebForkEpoch": deneb_fork_epoch, "ElectraForkEpoch": electra_fork_epoch, + "EIP7594ForkEpoch": eip7594_fork_epoch, "GenesisForkVersion": constants.GENESIS_FORK_VERSION, "BellatrixForkVersion": constants.BELLATRIX_FORK_VERSION, "CapellaForkVersion": constants.CAPELLA_FORK_VERSION, 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 0af40e5e6..9e04e0df9 100644 --- a/static_files/genesis-generation-config/el-cl/values.env.tmpl +++ b/static_files/genesis-generation-config/el-cl/values.env.tmpl @@ -14,6 +14,7 @@ export DENEB_FORK_VERSION="{{ .DenebForkVersion }}" export DENEB_FORK_EPOCH="{{ .DenebForkEpoch }}" export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}" export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}" +export EIP7594_FORK_EPOCH="{{ .EIP7594ForkEpoch }}" export WITHDRAWAL_TYPE="0x00" export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134 export GENESIS_TIMESTAMP={{ .UnixTimestamp }} From da4106c7214b9aa487b95bbf602781f1f7d8a79d Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 6 May 2024 11:07:30 +0200 Subject: [PATCH 02/11] revert test change --- .github/tests/lighthouse-all.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/tests/lighthouse-all.yaml b/.github/tests/lighthouse-all.yaml index 75a9d9a0a..72ea6a317 100644 --- a/.github/tests/lighthouse-all.yaml +++ b/.github/tests/lighthouse-all.yaml @@ -1,5 +1,14 @@ participants: - el_type: geth cl_type: lighthouse - count: 3 + - el_type: nethermind + cl_type: lighthouse + - el_type: erigon + cl_type: lighthouse + - el_type: besu + cl_type: lighthouse + - el_type: reth + cl_type: lighthouse + - el_type: ethereumjs + cl_type: lighthouse additional_services: [] From 328248d31560ea98146bded2f83bdb6dac7e666b Mon Sep 17 00:00:00 2001 From: Parithosh Jayanthi Date: Mon, 6 May 2024 11:10:00 +0200 Subject: [PATCH 03/11] Update src/package_io/input_parser.star Co-authored-by: Barnabas Busa --- src/package_io/input_parser.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 00faa66b3..543f32d05 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -267,7 +267,7 @@ def input_parser(plan, input_args): eth1_follow_distance=result["network_params"]["eth1_follow_distance"], deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"], electra_fork_epoch=result["network_params"]["electra_fork_epoch"], - peerdas_fork_epoch=result["network_params"]["eip7594_fork_epoch"], + eip7594_fork_epoch =result["network_params"]["eip7594_fork_epoch"], network=result["network_params"]["network"], min_validator_withdrawability_delay=result["network_params"][ "min_validator_withdrawability_delay" From aaf088fd051469886a76b554c4709ee2ebe9f681 Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 6 May 2024 12:05:09 +0200 Subject: [PATCH 04/11] add configurible version --- .github/tests/peerdas-fork.yaml | 17 +++++++++++++++++ README.md | 4 ++++ network_params.yaml | 1 + src/network_launcher/kurtosis.star | 5 +++++ src/package_io/input_parser.star | 3 +++ src/participant_network.star | 2 ++ .../el_cl_genesis/el_cl_genesis_generator.star | 4 ++++ .../el-cl/values.env.tmpl | 1 + 8 files changed, 37 insertions(+) create mode 100644 .github/tests/peerdas-fork.yaml diff --git a/.github/tests/peerdas-fork.yaml b/.github/tests/peerdas-fork.yaml new file mode 100644 index 000000000..92768f578 --- /dev/null +++ b/.github/tests/peerdas-fork.yaml @@ -0,0 +1,17 @@ +participants: + - el_type: geth + cl_type: teku + - el_type: nethermind + cl_type: prysm + - el_type: erigon + cl_type: nimbus + - el_type: besu + cl_type: lighthouse + - el_type: reth + cl_type: lodestar + - el_type: ethereumjs + cl_type: teku +network_params: + deneb_fork_epoch: 0 + eip7594_fork_epoch: 1 +additional_services: [] diff --git a/README.md b/README.md index 90eba269c..844f92ec0 100644 --- a/README.md +++ b/README.md @@ -513,6 +513,10 @@ network_params: deneb_fork_epoch: 0 electra_fork_epoch: 500 eip7594_fork_epoch: 1000 + + # The fork version to set if the eip7594 fork is active + eip7594_fork_version: 0x70000038 + # Network sync base url for syncing public networks from a custom snapshot (mostly useful for shadowforks) # Defaults to "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/ # If you have a local snapshot, you can set this to the local url: diff --git a/network_params.yaml b/network_params.yaml index 5c245c01c..f05694559 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -73,6 +73,7 @@ network_params: deneb_fork_epoch: 0 electra_fork_epoch: 500 eip7594_fork_epoch: 1000 + eip7594_fork_version: 0x70000038 network_sync_base_url: https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/ additional_services: - tx_spammer diff --git a/src/network_launcher/kurtosis.star b/src/network_launcher/kurtosis.star index e7315d417..2b1390f98 100644 --- a/src/network_launcher/kurtosis.star +++ b/src/network_launcher/kurtosis.star @@ -56,6 +56,11 @@ def launch(plan, network_params, participants, parallel_keystore_generation): ethereum_genesis_generator_image = ( constants.ETHEREUM_GENESIS_GENERATOR.capella_genesis ) + # we are running in deneb genesis, but only one fork is allowed to be active at a time + elif network_params.electra_fork_epoch == network_params.eip7594_fork_epoch: + fail( + "Unsupported fork epoch configuration, need to define either electra_fork_epoch or eip7594_fork_epoch" + ) # we are running deneb genesis - default behavior elif network_params.deneb_fork_epoch == 0: ethereum_genesis_generator_image = ( diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 543f32d05..3d4939bba 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -268,6 +268,7 @@ def input_parser(plan, input_args): deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"], electra_fork_epoch=result["network_params"]["electra_fork_epoch"], eip7594_fork_epoch =result["network_params"]["eip7594_fork_epoch"], + eip7594_fork_version = result["network_params"]["eip7594_fork_version"], network=result["network_params"]["network"], min_validator_withdrawability_delay=result["network_params"][ "min_validator_withdrawability_delay" @@ -694,6 +695,7 @@ def default_network_params(): "deneb_fork_epoch": 0, "electra_fork_epoch": 500, "eip7594_fork_epoch": 1000, + "eip7594_fork_version": 0x70000038, "network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/", "preset": "mainnet", } @@ -717,6 +719,7 @@ def default_minimal_network_params(): "deneb_fork_epoch": 0, "electra_fork_epoch": 500, "eip7594_fork_epoch": 1000, + "eip7594_fork_version": 0x70000038, "network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/", "preset": "minimal", } diff --git a/src/participant_network.star b/src/participant_network.star index 3f975f874..529be9b8b 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -102,6 +102,7 @@ def launch_participant_network( network_params.deneb_fork_epoch, network_params.electra_fork_epoch, network_params.eip7594_fork_epoch, + network_params.eip_7594_fork_version, latest_block.files_artifacts[0] if latest_block != "" else "", network_params.min_validator_withdrawability_delay, network_params.shard_committee_period, @@ -342,6 +343,7 @@ def launch_participant_network( network=network_params.network, electra_fork_epoch=network_params.electra_fork_epoch, eip7594_fork_epoch=network_params.eip7594_fork_epoch, + eip_7594_fork_version=network_params.eip7594_fork_version, ) all_vc_contexts.append(vc_context) 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 db0535c96..dd2a4630d 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 @@ -26,6 +26,7 @@ def generate_el_cl_genesis_data( deneb_fork_epoch, electra_fork_epoch, eip7594_fork_epoch, + eip7594_fork_version, latest_block, min_validator_withdrawability_delay, shard_committee_period, @@ -51,6 +52,7 @@ def generate_el_cl_genesis_data( deneb_fork_epoch, electra_fork_epoch, eip7594_fork_epoch, + eip7594_fork_version, shadowfork_file, min_validator_withdrawability_delay, shard_committee_period, @@ -132,6 +134,7 @@ def new_env_file_for_el_cl_genesis_data( deneb_fork_epoch, electra_fork_epoch, eip7594_fork_epoch, + eip7594_fork_version, shadowfork_file, min_validator_withdrawability_delay, shard_committee_period, @@ -151,6 +154,7 @@ def new_env_file_for_el_cl_genesis_data( "DenebForkEpoch": deneb_fork_epoch, "ElectraForkEpoch": electra_fork_epoch, "EIP7594ForkEpoch": eip7594_fork_epoch, + "EIP7594ForkVersion": eip7594_fork_version, "GenesisForkVersion": constants.GENESIS_FORK_VERSION, "BellatrixForkVersion": constants.BELLATRIX_FORK_VERSION, "CapellaForkVersion": constants.CAPELLA_FORK_VERSION, 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 9e04e0df9..526baa759 100644 --- a/static_files/genesis-generation-config/el-cl/values.env.tmpl +++ b/static_files/genesis-generation-config/el-cl/values.env.tmpl @@ -15,6 +15,7 @@ export DENEB_FORK_EPOCH="{{ .DenebForkEpoch }}" export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}" export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}" export EIP7594_FORK_EPOCH="{{ .EIP7594ForkEpoch }}" +export EIP7594_FORK_VERSION="{{ .EIP7594ForkVersion }}" export WITHDRAWAL_TYPE="0x00" export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134 export GENESIS_TIMESTAMP={{ .UnixTimestamp }} From 83c173b6c8647dd7642f666c3583d4e63fee76cd Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 6 May 2024 12:07:02 +0200 Subject: [PATCH 05/11] fix typo --- src/participant_network.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/participant_network.star b/src/participant_network.star index 529be9b8b..aeada3ad0 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -343,7 +343,7 @@ def launch_participant_network( network=network_params.network, electra_fork_epoch=network_params.electra_fork_epoch, eip7594_fork_epoch=network_params.eip7594_fork_epoch, - eip_7594_fork_version=network_params.eip7594_fork_version, + eip7594_fork_version=network_params.eip7594_fork_version, ) all_vc_contexts.append(vc_context) From 19905c3365f8282ad268d2e6d4c16f5d91d4bde0 Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 6 May 2024 12:09:16 +0200 Subject: [PATCH 06/11] fix typo --- src/participant_network.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/participant_network.star b/src/participant_network.star index aeada3ad0..bb69b5082 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -102,7 +102,7 @@ def launch_participant_network( network_params.deneb_fork_epoch, network_params.electra_fork_epoch, network_params.eip7594_fork_epoch, - network_params.eip_7594_fork_version, + network_params.eip7594_fork_version, latest_block.files_artifacts[0] if latest_block != "" else "", network_params.min_validator_withdrawability_delay, network_params.shard_committee_period, From 67d663683af537d85b077e42e9426c6d2dfd28fc Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 6 May 2024 12:12:28 +0200 Subject: [PATCH 07/11] change unsupported fork config --- src/network_launcher/kurtosis.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network_launcher/kurtosis.star b/src/network_launcher/kurtosis.star index 2b1390f98..662580a2f 100644 --- a/src/network_launcher/kurtosis.star +++ b/src/network_launcher/kurtosis.star @@ -57,7 +57,7 @@ def launch(plan, network_params, participants, parallel_keystore_generation): constants.ETHEREUM_GENESIS_GENERATOR.capella_genesis ) # we are running in deneb genesis, but only one fork is allowed to be active at a time - elif network_params.electra_fork_epoch == network_params.eip7594_fork_epoch: + elif (network_params.electra_fork_epoch != None) and (network_params.eip7594_fork_epoch != None): fail( "Unsupported fork epoch configuration, need to define either electra_fork_epoch or eip7594_fork_epoch" ) From d80c971dc7a529c1f9f735fd6aa49537a90a15a2 Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 6 May 2024 12:27:27 +0200 Subject: [PATCH 08/11] update peerdas check --- src/network_launcher/kurtosis.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network_launcher/kurtosis.star b/src/network_launcher/kurtosis.star index 662580a2f..2b1390f98 100644 --- a/src/network_launcher/kurtosis.star +++ b/src/network_launcher/kurtosis.star @@ -57,7 +57,7 @@ def launch(plan, network_params, participants, parallel_keystore_generation): constants.ETHEREUM_GENESIS_GENERATOR.capella_genesis ) # we are running in deneb genesis, but only one fork is allowed to be active at a time - elif (network_params.electra_fork_epoch != None) and (network_params.eip7594_fork_epoch != None): + elif network_params.electra_fork_epoch == network_params.eip7594_fork_epoch: fail( "Unsupported fork epoch configuration, need to define either electra_fork_epoch or eip7594_fork_epoch" ) From 676ae181693692e809a7bce5fcd837f8c59090f4 Mon Sep 17 00:00:00 2001 From: Parithosh Jayanthi Date: Mon, 6 May 2024 12:27:55 +0200 Subject: [PATCH 09/11] Update .github/tests/peerdas-fork.yaml Co-authored-by: Barnabas Busa --- .github/tests/peerdas-fork.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/tests/peerdas-fork.yaml b/.github/tests/peerdas-fork.yaml index 92768f578..1436a3383 100644 --- a/.github/tests/peerdas-fork.yaml +++ b/.github/tests/peerdas-fork.yaml @@ -12,6 +12,5 @@ participants: - el_type: ethereumjs cl_type: teku network_params: - deneb_fork_epoch: 0 eip7594_fork_epoch: 1 additional_services: [] From 3f1ef6cf6cc5f03a321593973b386aa4e4934278 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Mon, 6 May 2024 12:31:56 +0200 Subject: [PATCH 10/11] fix lint, fix vc part --- src/package_io/input_parser.star | 4 ++-- src/participant_network.star | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 3d4939bba..19bfe1895 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -267,8 +267,8 @@ def input_parser(plan, input_args): eth1_follow_distance=result["network_params"]["eth1_follow_distance"], deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"], electra_fork_epoch=result["network_params"]["electra_fork_epoch"], - eip7594_fork_epoch =result["network_params"]["eip7594_fork_epoch"], - eip7594_fork_version = result["network_params"]["eip7594_fork_version"], + eip7594_fork_epoch=result["network_params"]["eip7594_fork_epoch"], + eip7594_fork_version=result["network_params"]["eip7594_fork_version"], network=result["network_params"]["network"], min_validator_withdrawability_delay=result["network_params"][ "min_validator_withdrawability_delay" diff --git a/src/participant_network.star b/src/participant_network.star index bb69b5082..f86e8f999 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -342,8 +342,6 @@ def launch_participant_network( preset=network_params.preset, network=network_params.network, electra_fork_epoch=network_params.electra_fork_epoch, - eip7594_fork_epoch=network_params.eip7594_fork_epoch, - eip7594_fork_version=network_params.eip7594_fork_version, ) all_vc_contexts.append(vc_context) From ae5da0736dde1e83a2e04de6efe59e63f4243758 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Mon, 6 May 2024 12:40:10 +0200 Subject: [PATCH 11/11] convert hex to string --- README.md | 2 +- network_params.yaml | 2 +- src/package_io/input_parser.star | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 844f92ec0..51a6d3707 100644 --- a/README.md +++ b/README.md @@ -515,7 +515,7 @@ network_params: eip7594_fork_epoch: 1000 # The fork version to set if the eip7594 fork is active - eip7594_fork_version: 0x70000038 + eip7594_fork_version: "0x70000038" # Network sync base url for syncing public networks from a custom snapshot (mostly useful for shadowforks) # Defaults to "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/ diff --git a/network_params.yaml b/network_params.yaml index f05694559..fdac45851 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -73,7 +73,7 @@ network_params: deneb_fork_epoch: 0 electra_fork_epoch: 500 eip7594_fork_epoch: 1000 - eip7594_fork_version: 0x70000038 + eip7594_fork_version: "0x70000038" network_sync_base_url: https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/ additional_services: - tx_spammer diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 19bfe1895..2c6b17523 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -695,7 +695,7 @@ def default_network_params(): "deneb_fork_epoch": 0, "electra_fork_epoch": 500, "eip7594_fork_epoch": 1000, - "eip7594_fork_version": 0x70000038, + "eip7594_fork_version": "0x70000038", "network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/", "preset": "mainnet", } @@ -719,7 +719,7 @@ def default_minimal_network_params(): "deneb_fork_epoch": 0, "electra_fork_epoch": 500, "eip7594_fork_epoch": 1000, - "eip7594_fork_version": 0x70000038, + "eip7594_fork_version": "0x70000038", "network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/", "preset": "minimal", }