diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c0057d13..7161fef3a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -100,14 +100,14 @@ jobs: executor: ubuntu_vm steps: - checkout - - run: kurtosis run ${PWD} "$(cat ./.github/tests/mev.yaml)" + - run: kurtosis run ${PWD} --verbosity detailed --args-file=./.github/tests/mev.yaml mix_with_tools_k8s: resource_class: xlarge executor: ubuntu_vm steps: - checkout - - run: kurtosis run ${PWD} "$(cat ./.github/tests/mix-with-tools-mev.yaml)" + - run: kurtosis run ${PWD} --verbosity detailed --args-file=./.github/tests/mev.yaml mix_persistence_k8s: resource_class: xlarge diff --git a/.github/tests/dencun-genesis.yaml b/.github/tests/dencun-genesis.yaml new file mode 100644 index 000000000..1c38e6597 --- /dev/null +++ b/.github/tests/dencun-genesis.yaml @@ -0,0 +1,28 @@ +participants: + - el_client_type: geth + el_client_image: ethpandaops/geth:master + cl_client_type: teku + cl_client_image: ethpandaops/teku:master + - el_client_type: nethermind + el_client_image: ethpandaops/nethermind:master + cl_client_type: prysm + cl_client_image: gcr.io/prysmaticlabs/prysm/beacon-chain:latest + - el_client_type: erigon + el_client_image: ethpandaops/erigon:devel + cl_client_type: nimbus + cl_client_image: ethpandaops/nimbus:unstable + - el_client_type: besu + el_client_image: ethpandaops/besu:main + cl_client_type: lighthouse + cl_client_image: ethpandaops/lighthouse:unstable + - el_client_type: reth + el_client_image: ethpandaops/reth:main + cl_client_type: lodestar + cl_client_image: ethpandaops/lodestar:unstable + - el_client_type: ethereumjs + el_client_image: ethpandaops/ethereumjs:master + cl_client_type: teku + cl_client_image: ethpandaops/teku:master +network_params: + deneb_fork_epoch: 0 +additional_services: [] diff --git a/.github/tests/holesky-shadowfork.yaml_norun b/.github/tests/holesky-shadowfork.yaml_norun index f26bd9c8c..ca2634a03 100644 --- a/.github/tests/holesky-shadowfork.yaml_norun +++ b/.github/tests/holesky-shadowfork.yaml_norun @@ -1,10 +1,10 @@ participants: - el_client_type: geth - el_client_image: ethereum/client-go:v1.13.11 + el_client_image: ethereum/client-go:v1.13.14 cl_client_type: teku - cl_client_image: consensys/teku:24.1.1 + cl_client_image: consensys/teku:24.2.0 network_params: - dencun_fork_epoch: 1 + dencun_fork_epoch: 0 network: holesky-shadowfork additional_services: - dora diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 75b9106ae..ffab067da 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -36,7 +36,7 @@ jobs: - name: Run Starlark run: | if [ "${{ matrix.file_name }}" != "./.github/tests/mix-with-tools-mev.yaml" ]; then - kurtosis run ${{ github.workspace }} --args-file ${{ matrix.file_name }} + kurtosis run ${{ github.workspace }} --verbosity detailed --args-file ${{ matrix.file_name }} else echo "Skipping ./.github/tests/mix-with-tools-mev.yaml" fi diff --git a/README.md b/README.md index c04ac0db4..b4eff39c2 100644 --- a/README.md +++ b/README.md @@ -222,7 +222,7 @@ participants: # Whether to use a separate validator client attached to the CL client. # Defaults to false for clients that can run both in one process (Teku, Nimbus) - use_separate_validator_client: true/false + use_separate_validator_client: false # The type of validator client that should be used # Valid values are nimbus, lighthouse, lodestar, teku, and prysm diff --git a/src/package_io/constants.star b/src/package_io/constants.star index 4c54c7501..8c45120b2 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -65,6 +65,7 @@ ELECTRA_FORK_VERSION = "0x60000038" ETHEREUM_GENESIS_GENERATOR = struct( bellatrix_genesis="ethpandaops/ethereum-genesis-generator:1.3.15", # EOL capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Default + deneb_genesis="ethpandaops/ethereum-genesis-generator:default-deneb-genesis", # Soon to become default verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis verkle_genesis="ethpandaops/ethereum-genesis-generator:4.0.0-rc.6", ) diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 0121de343..e29b91028 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -477,9 +477,6 @@ def parse_network_params(input_args): if result["network_params"]["seconds_per_slot"] == 0: fail("seconds_per_slot 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"]["electra_fork_epoch"] != None: # if electra is defined, then deneb needs to be set very high result["network_params"]["deneb_fork_epoch"] = HIGH_DENEB_VALUE_FORK_VERKLE diff --git a/src/participant_network.star b/src/participant_network.star index 9d93ea061..2364a46d6 100644 --- a/src/participant_network.star +++ b/src/participant_network.star @@ -241,10 +241,16 @@ def launch_participant_network( elif ( network_params.capella_fork_epoch == 0 and network_params.electra_fork_epoch == None + and network_params.deneb_fork_epoch > 0 ): ethereum_genesis_generator_image = ( constants.ETHEREUM_GENESIS_GENERATOR.capella_genesis ) + # we are running deneb genesis - experimental, soon to become default + elif network_params.deneb_fork_epoch == 0: + ethereum_genesis_generator_image = ( + constants.ETHEREUM_GENESIS_GENERATOR.deneb_genesis + ) # we are running electra - experimental elif network_params.electra_fork_epoch != None: if network_params.electra_fork_epoch == 0: