From de3c663da55de5af90c22f6da5261594615c5eeb Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 26 Jun 2023 12:42:28 +0200 Subject: [PATCH 1/8] updating source for fork --- kurtosis.yml | 2 +- main.star | 24 ++++++++++++------------ src/forkmon/forkmon_launcher.star | 2 +- src/grafana/grafana_launcher.star | 4 ++-- src/mev_boost/mev_boost_launcher.star | 4 ++-- src/prometheus/prometheus_launcher.star | 2 +- src/static_files/static_files.star | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/kurtosis.yml b/kurtosis.yml index 93b422339..448c787aa 100644 --- a/kurtosis.yml +++ b/kurtosis.yml @@ -1 +1 @@ -name: "github.com/kurtosis-tech/eth2-package" +name: "github.com/parithosh/eth2-package" diff --git a/main.star b/main.star index 8ef542481..f9b042a06 100644 --- a/main.star +++ b/main.star @@ -1,15 +1,15 @@ -parse_input = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/parse_input.star") - -static_files = import_module("github.com/kurtosis-tech/eth2-package/src/static_files/static_files.star") -genesis_constants = import_module("github.com/kurtosis-tech/eth-network-package/src/prelaunch_data_generator/genesis_constants/genesis_constants.star") - -eth_network_module = import_module("github.com/kurtosis-tech/eth-network-package/main.star") -transaction_spammer = import_module("github.com/kurtosis-tech/eth2-package/src/transaction_spammer/transaction_spammer.star") -forkmon = import_module("github.com/kurtosis-tech/eth2-package/src/forkmon/forkmon_launcher.star") -prometheus = import_module("github.com/kurtosis-tech/eth2-package/src/prometheus/prometheus_launcher.star") -grafana =import_module("github.com/kurtosis-tech/eth2-package/src/grafana/grafana_launcher.star") -testnet_verifier = import_module("github.com/kurtosis-tech/eth2-package/src/testnet_verifier/testnet_verifier.star") -mev_boost_launcher_module = import_module("github.com/kurtosis-tech/eth2-package/src/mev_boost/mev_boost_launcher.star") +parse_input = import_module("github.com/parithosh/eth2-package/src/package_io/parse_input.star") + +static_files = import_module("github.com/parithosh/eth2-package/src/static_files/static_files.star") +genesis_constants = import_module("github.com/parithosh/eth-network-package/src/prelaunch_data_generator/genesis_constants/genesis_constants.star") + +eth_network_module = import_module("github.com/parithosh/eth-network-package/main.star") +transaction_spammer = import_module("github.com/parithosh/eth2-package/src/transaction_spammer/transaction_spammer.star") +forkmon = import_module("github.com/parithosh/eth2-package/src/forkmon/forkmon_launcher.star") +prometheus = import_module("github.com/parithosh/eth2-package/src/prometheus/prometheus_launcher.star") +grafana =import_module("github.com/parithosh/eth2-package/src/grafana/grafana_launcher.star") +testnet_verifier = import_module("github.com/parithosh/eth2-package/src/testnet_verifier/testnet_verifier.star") +mev_boost_launcher_module = import_module("github.com/parithosh/eth2-package/src/mev_boost/mev_boost_launcher.star") GRAFANA_USER = "admin" GRAFANA_PASSWORD = "admin" diff --git a/src/forkmon/forkmon_launcher.star b/src/forkmon/forkmon_launcher.star index 3c99d89f5..eb66565fb 100644 --- a/src/forkmon/forkmon_launcher.star +++ b/src/forkmon/forkmon_launcher.star @@ -1,4 +1,4 @@ -shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star") +shared_utils = import_module("github.com/parithosh/eth2-package/src/shared_utils/shared_utils.star") SERVICE_NAME = "forkmon" diff --git a/src/grafana/grafana_launcher.star b/src/grafana/grafana_launcher.star index 06f297ff0..910d8d6d2 100644 --- a/src/grafana/grafana_launcher.star +++ b/src/grafana/grafana_launcher.star @@ -1,5 +1,5 @@ -shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star") -static_files = import_module("github.com/kurtosis-tech/eth2-package/src/static_files/static_files.star") +shared_utils = import_module("github.com/parithosh/eth2-package/src/shared_utils/shared_utils.star") +static_files = import_module("github.com/parithosh/eth2-package/src/static_files/static_files.star") SERVICE_NAME = "grafana" diff --git a/src/mev_boost/mev_boost_launcher.star b/src/mev_boost/mev_boost_launcher.star index 9000f7123..c9f26e64b 100644 --- a/src/mev_boost/mev_boost_launcher.star +++ b/src/mev_boost/mev_boost_launcher.star @@ -1,5 +1,5 @@ -shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star") -mev_boost_context = ("github.com/kurtosis-tech/eth2-package/src/mev_boost/mev_boost_context.star") +shared_utils = import_module("github.com/parithosh/eth2-package/src/shared_utils/shared_utils.star") +mev_boost_context = ("github.com/parithosh/eth2-package/src/mev_boost/mev_boost_context.star") FLASHBOTS_MEV_BOOST_IMAGE = "flashbots/mev-boost" FLASHBOTS_MEV_BOOST_PORT = 18550 diff --git a/src/prometheus/prometheus_launcher.star b/src/prometheus/prometheus_launcher.star index 201c963e2..eb92e0e17 100644 --- a/src/prometheus/prometheus_launcher.star +++ b/src/prometheus/prometheus_launcher.star @@ -1,4 +1,4 @@ -shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star") +shared_utils = import_module("github.com/parithosh/eth2-package/src/shared_utils/shared_utils.star") SERVICE_NAME = "prometheus" diff --git a/src/static_files/static_files.star b/src/static_files/static_files.star index 6e0985f4e..a8b5c9db7 100644 --- a/src/static_files/static_files.star +++ b/src/static_files/static_files.star @@ -1,5 +1,5 @@ # The path on the module container where static files are housed -STATIC_FILES_DIRPATH = "github.com/kurtosis-tech/eth2-package/static_files" +STATIC_FILES_DIRPATH = "github.com/parithosh/eth2-package/static_files" # Forkmon config FORKMON_CONFIG_TEMPLATE_FILEPATH = STATIC_FILES_DIRPATH + \ From 3af93e38c48698b323bf439f5df185d898e8171b Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 26 Jun 2023 17:06:30 +0200 Subject: [PATCH 2/8] updating readme --- README.md | 3 --- main.star | 24 ++++++++++++------------ src/forkmon/forkmon_launcher.star | 2 +- src/grafana/grafana_launcher.star | 4 ++-- src/mev_boost/mev_boost_launcher.star | 4 ++-- src/package_io/parse_input.star | 7 ++++++- src/prometheus/prometheus_launcher.star | 2 +- src/static_files/static_files.star | 2 +- 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 8430f3574..6dde2f11b 100644 --- a/README.md +++ b/README.md @@ -179,9 +179,6 @@ To configure the package behaviour, you can modify your `eth2-package-params.yam ``` -Note: Following an update starting the network post-merge, `erigon`, and `prysm` clients don't work anymore. Fixes are tracked in the following Github issues: -- Prysm: [#11508][prysm-issue] -- Erigon: [#154][erigon-issue] You can find the latest Kiln compatible docker images here: https://notes.ethereum.org/@launchpad/kiln diff --git a/main.star b/main.star index f9b042a06..8ef542481 100644 --- a/main.star +++ b/main.star @@ -1,15 +1,15 @@ -parse_input = import_module("github.com/parithosh/eth2-package/src/package_io/parse_input.star") - -static_files = import_module("github.com/parithosh/eth2-package/src/static_files/static_files.star") -genesis_constants = import_module("github.com/parithosh/eth-network-package/src/prelaunch_data_generator/genesis_constants/genesis_constants.star") - -eth_network_module = import_module("github.com/parithosh/eth-network-package/main.star") -transaction_spammer = import_module("github.com/parithosh/eth2-package/src/transaction_spammer/transaction_spammer.star") -forkmon = import_module("github.com/parithosh/eth2-package/src/forkmon/forkmon_launcher.star") -prometheus = import_module("github.com/parithosh/eth2-package/src/prometheus/prometheus_launcher.star") -grafana =import_module("github.com/parithosh/eth2-package/src/grafana/grafana_launcher.star") -testnet_verifier = import_module("github.com/parithosh/eth2-package/src/testnet_verifier/testnet_verifier.star") -mev_boost_launcher_module = import_module("github.com/parithosh/eth2-package/src/mev_boost/mev_boost_launcher.star") +parse_input = import_module("github.com/kurtosis-tech/eth2-package/src/package_io/parse_input.star") + +static_files = import_module("github.com/kurtosis-tech/eth2-package/src/static_files/static_files.star") +genesis_constants = import_module("github.com/kurtosis-tech/eth-network-package/src/prelaunch_data_generator/genesis_constants/genesis_constants.star") + +eth_network_module = import_module("github.com/kurtosis-tech/eth-network-package/main.star") +transaction_spammer = import_module("github.com/kurtosis-tech/eth2-package/src/transaction_spammer/transaction_spammer.star") +forkmon = import_module("github.com/kurtosis-tech/eth2-package/src/forkmon/forkmon_launcher.star") +prometheus = import_module("github.com/kurtosis-tech/eth2-package/src/prometheus/prometheus_launcher.star") +grafana =import_module("github.com/kurtosis-tech/eth2-package/src/grafana/grafana_launcher.star") +testnet_verifier = import_module("github.com/kurtosis-tech/eth2-package/src/testnet_verifier/testnet_verifier.star") +mev_boost_launcher_module = import_module("github.com/kurtosis-tech/eth2-package/src/mev_boost/mev_boost_launcher.star") GRAFANA_USER = "admin" GRAFANA_PASSWORD = "admin" diff --git a/src/forkmon/forkmon_launcher.star b/src/forkmon/forkmon_launcher.star index eb66565fb..3c99d89f5 100644 --- a/src/forkmon/forkmon_launcher.star +++ b/src/forkmon/forkmon_launcher.star @@ -1,4 +1,4 @@ -shared_utils = import_module("github.com/parithosh/eth2-package/src/shared_utils/shared_utils.star") +shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star") SERVICE_NAME = "forkmon" diff --git a/src/grafana/grafana_launcher.star b/src/grafana/grafana_launcher.star index 910d8d6d2..06f297ff0 100644 --- a/src/grafana/grafana_launcher.star +++ b/src/grafana/grafana_launcher.star @@ -1,5 +1,5 @@ -shared_utils = import_module("github.com/parithosh/eth2-package/src/shared_utils/shared_utils.star") -static_files = import_module("github.com/parithosh/eth2-package/src/static_files/static_files.star") +shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star") +static_files = import_module("github.com/kurtosis-tech/eth2-package/src/static_files/static_files.star") SERVICE_NAME = "grafana" diff --git a/src/mev_boost/mev_boost_launcher.star b/src/mev_boost/mev_boost_launcher.star index c9f26e64b..9000f7123 100644 --- a/src/mev_boost/mev_boost_launcher.star +++ b/src/mev_boost/mev_boost_launcher.star @@ -1,5 +1,5 @@ -shared_utils = import_module("github.com/parithosh/eth2-package/src/shared_utils/shared_utils.star") -mev_boost_context = ("github.com/parithosh/eth2-package/src/mev_boost/mev_boost_context.star") +shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star") +mev_boost_context = ("github.com/kurtosis-tech/eth2-package/src/mev_boost/mev_boost_context.star") FLASHBOTS_MEV_BOOST_IMAGE = "flashbots/mev-boost" FLASHBOTS_MEV_BOOST_PORT = 18550 diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 525fcd75f..1768ecc8a 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -88,6 +88,9 @@ def parse_input(input_args): if result["network_params"]["capella_fork_epoch"] == 0: fail("capella_fork_epoch is 0 needs to be > 0 ") + if result["network_params"]["deneb_fork_epoch"] == 0: + fail("deneb_fork_epoch is 0 needs to be > 0 ") + required_num_validtors = 2 * result["network_params"]["slots_per_epoch"] actual_num_validators = len(result["participants"]) * result["network_params"]["num_validator_keys_per_node"] if required_num_validtors > actual_num_validators: @@ -118,6 +121,7 @@ def parse_input(input_args): seconds_per_slot=result["network_params"]["seconds_per_slot"], slots_per_epoch=result["network_params"]["slots_per_epoch"], capella_fork_epoch=result["network_params"]["capella_fork_epoch"], + deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"], genesis_delay=result["network_params"]["genesis_delay"] ), launch_additional_services=result["launch_additional_services"], @@ -158,7 +162,8 @@ def default_network_params(): "seconds_per_slot": 12, "slots_per_epoch": 32, "genesis_delay": 120, - "capella_fork_epoch": 5, + "capella_fork_epoch": 2, + "deneb_fork_epoch": 5 } def default_participant(): diff --git a/src/prometheus/prometheus_launcher.star b/src/prometheus/prometheus_launcher.star index eb92e0e17..201c963e2 100644 --- a/src/prometheus/prometheus_launcher.star +++ b/src/prometheus/prometheus_launcher.star @@ -1,4 +1,4 @@ -shared_utils = import_module("github.com/parithosh/eth2-package/src/shared_utils/shared_utils.star") +shared_utils = import_module("github.com/kurtosis-tech/eth2-package/src/shared_utils/shared_utils.star") SERVICE_NAME = "prometheus" diff --git a/src/static_files/static_files.star b/src/static_files/static_files.star index a8b5c9db7..6e0985f4e 100644 --- a/src/static_files/static_files.star +++ b/src/static_files/static_files.star @@ -1,5 +1,5 @@ # The path on the module container where static files are housed -STATIC_FILES_DIRPATH = "github.com/parithosh/eth2-package/static_files" +STATIC_FILES_DIRPATH = "github.com/kurtosis-tech/eth2-package/static_files" # Forkmon config FORKMON_CONFIG_TEMPLATE_FILEPATH = STATIC_FILES_DIRPATH + \ From e6f977e4d9417f44d319509fbbe877102cbe1171 Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 26 Jun 2023 17:10:38 +0200 Subject: [PATCH 3/8] fixing package --- kurtosis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kurtosis.yml b/kurtosis.yml index 448c787aa..93b422339 100644 --- a/kurtosis.yml +++ b/kurtosis.yml @@ -1 +1 @@ -name: "github.com/parithosh/eth2-package" +name: "github.com/kurtosis-tech/eth2-package" From 64e21db895e2990b1f69a003346c234c97216061 Mon Sep 17 00:00:00 2001 From: parithosh Date: Tue, 27 Jun 2023 10:41:01 +0200 Subject: [PATCH 4/8] fixing indentation --- src/package_io/parse_input.star | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 1768ecc8a..d81f781b8 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -88,8 +88,8 @@ def parse_input(input_args): if result["network_params"]["capella_fork_epoch"] == 0: fail("capella_fork_epoch is 0 needs to be > 0 ") - if result["network_params"]["deneb_fork_epoch"] == 0: - fail("deneb_fork_epoch is 0 needs to be > 0 ") + if result["network_params"]["deneb_fork_epoch"] == 0: + fail("deneb_fork_epoch is 0 needs to be > 0 ") required_num_validtors = 2 * result["network_params"]["slots_per_epoch"] actual_num_validators = len(result["participants"]) * result["network_params"]["num_validator_keys_per_node"] From bfa110fb9d7f48fe3f6f4218dbb58662a292005d Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 3 Jul 2023 16:58:45 +0200 Subject: [PATCH 5/8] switching default images to latest --- src/package_io/parse_input.star | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 36e598994..e2c67fe7f 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -1,16 +1,16 @@ DEFAULT_EL_IMAGES = { - "geth": "ethereum/client-go:v1.11.5", + "geth": "ethereum/client-go:latest", "erigon": "thorax/erigon:devel", - "nethermind": "nethermind/nethermind:1.14.0", + "nethermind": "nethermind/nethermind:latest", "besu": "hyperledger/besu:develop" } DEFAULT_CL_IMAGES = { - "lighthouse": "sigp/lighthouse:v3.5.0", - "teku": "consensys/teku:23.1", + "lighthouse": "sigp/lighthouse:latest", + "teku": "consensys/teku:latest", "nimbus": "statusim/nimbus-eth2:multiarch-latest", "prysm": "prysmaticlabs/prysm/beacon-chain:latest,prysmaticlabs/prysm/validator:latest", - "lodestar": "chainsafe/lodestar:v1.7.2", + "lodestar": "chainsafe/lodestar:latest", } BESU_NODE_NAME = "besu" From e240e7a4528a2f799e16f9db90e0409832d01389 Mon Sep 17 00:00:00 2001 From: parithosh Date: Mon, 3 Jul 2023 17:12:42 +0200 Subject: [PATCH 6/8] changing image --- src/package_io/parse_input.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index e2c67fe7f..760966cae 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -9,7 +9,7 @@ DEFAULT_CL_IMAGES = { "lighthouse": "sigp/lighthouse:latest", "teku": "consensys/teku:latest", "nimbus": "statusim/nimbus-eth2:multiarch-latest", - "prysm": "prysmaticlabs/prysm/beacon-chain:latest,prysmaticlabs/prysm/validator:latest", + "prysm": "prysmaticlabs/prysm-beacon-chain:latest,prysmaticlabs/prysm-validator:latest", "lodestar": "chainsafe/lodestar:latest", } From f8f1f3c9090c5c75db379c48ac080ad0981e5b7a Mon Sep 17 00:00:00 2001 From: parithosh Date: Fri, 7 Jul 2023 12:56:26 +0200 Subject: [PATCH 7/8] adding nimbus restriction --- src/package_io/parse_input.star | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 760966cae..39aa37df8 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -51,7 +51,8 @@ def parse_input(input_args): if index == 0 and el_client_type in (BESU_NODE_NAME, NETHERMIND_NODE_NAME): fail("besu/nethermind cant be the first participant") - + if cl_client_type in (NIMBUS_NODE_NAME) and (result["network_params"]["seconds_per_slot"] < 12): + fail("nimbus can't be run with slot times below 12 seconds") el_image = participant["el_client_image"] if el_image == "": default_image = DEFAULT_EL_IMAGES.get(el_client_type, "") From 85a59440862259241b99c547ba337a70a7791cfb Mon Sep 17 00:00:00 2001 From: parithosh Date: Fri, 7 Jul 2023 13:00:09 +0200 Subject: [PATCH 8/8] add nimbus const --- src/package_io/parse_input.star | 1 + 1 file changed, 1 insertion(+) diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index 39aa37df8..9716a98f2 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -15,6 +15,7 @@ DEFAULT_CL_IMAGES = { BESU_NODE_NAME = "besu" NETHERMIND_NODE_NAME = "nethermind" +NIMBUS_NODE_NAME = "nimbus" ATTR_TO_BE_SKIPPED_AT_ROOT = ("network_params", "participants")