diff --git a/.circleci/config.yml b/.circleci/config.yml index 31901500f..847e849b8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -273,7 +273,6 @@ workflows: <<: *setup_kurtosis_k3s - mix_with_tools_k8s: <<: *setup_kurtosis_k3s - - mix_with_tools_docker build: when: << pipeline.parameters.should-enable-build-workflow >> @@ -320,3 +319,9 @@ workflows: branches: ignore: - main + + - mix_with_tools_docker: + filters: + branches: + ignore: + - main diff --git a/.circleci/tests/mev.json b/.circleci/tests/mev.json index b7780d57a..866089343 100644 --- a/.circleci/tests/mev.json +++ b/.circleci/tests/mev.json @@ -14,6 +14,6 @@ }, "network_params": { "seconds_per_slot": 3, - "capella_fork_epoch": 0 + "capella_fork_epoch": 1 } } \ No newline at end of file diff --git a/.circleci/tests/mix-with-tools.json b/.circleci/tests/mix-with-tools.json index 8ac224dd5..fe0a6fd98 100644 --- a/.circleci/tests/mix-with-tools.json +++ b/.circleci/tests/mix-with-tools.json @@ -36,6 +36,9 @@ "full_beaconchain_explorer", "custom_flood" ], - "mev_type": "full" + "mev_type": "full", + "mev_params": { + "mev_relay_image": "flashbots/mev-boost-relay:0.27" + } } \ No newline at end of file diff --git a/main.star b/main.star index 2fed8a416..3ff66481f 100644 --- a/main.star +++ b/main.star @@ -253,6 +253,7 @@ def run(plan, args={}): genesis_constants.PRE_FUNDED_ACCOUNTS, all_el_client_contexts, all_cl_client_contexts[0], + network_params.seconds_per_slot, goomy_blob_params, ) plan.print("Succesfully launched goomy the blob spammer") diff --git a/src/package_io/parse_input.star b/src/package_io/parse_input.star index c39e9e317..2f59b6aa5 100644 --- a/src/package_io/parse_input.star +++ b/src/package_io/parse_input.star @@ -1,6 +1,6 @@ DEFAULT_EL_IMAGES = { "geth": "ethereum/client-go:latest", - "erigon": "thorax/erigon:devel", + "erigon": "ethpandaops/erigon:devel", "nethermind": "nethermind/nethermind:latest", "besu": "hyperledger/besu:develop", "reth": "ghcr.io/paradigmxyz/reth", @@ -15,7 +15,8 @@ DEFAULT_CL_IMAGES = { "lodestar": "chainsafe/lodestar:latest", } -MEV_BOOST_RELAY_DEFAULT_IMAGE = "flashbots/mev-boost-relay:0.26" +MEV_BOOST_RELAY_DEFAULT_IMAGE = "flashbots/mev-boost-relay:0.27" +MEV_BOOST_RELAY_IMAGE_NON_ZERO_CAPELLA = "flashbots/mev-boost-relay:0.26" NETHERMIND_NODE_NAME = "nethermind" NIMBUS_NODE_NAME = "nimbus" @@ -98,11 +99,12 @@ def parse_input(plan, input_args): if ( result.get("mev_type") == "full" and result["network_params"]["capella_fork_epoch"] == 0 - and result["mev_params"]["mev_relay_image"] == MEV_BOOST_RELAY_DEFAULT_IMAGE + and result["mev_params"]["mev_relay_image"] + == MEV_BOOST_RELAY_IMAGE_NON_ZERO_CAPELLA ): fail( "The default MEV image {0} requires a non-zero value for capella fork epoch set via network_params.capella_fork_epoch".format( - MEV_BOOST_RELAY_DEFAULT_IMAGE + MEV_BOOST_RELAY_IMAGE_NON_ZERO_CAPELLA ) )