Skip to content

chore: update to the latest version of kurtosis #1437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rodrigo-o merged 5 commits into from
Apr 22, 2025
Merged

chore: update to the latest version of kurtosis #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c1d2d4
support electra version of kurtosis
rodrigo-o Apr 21, 2025
5fa94b8
fix tx_fuzz and removed old services
rodrigo-o Apr 21, 2025
568b75f
Fixed an issue with assertoor and being able to run it locally
rodrigo-o Apr 22, 2025
7faf349
point to the correct el-stability check and formatting
rodrigo-o Apr 22, 2025
a002d8a
point back to main in the network params before merging
rodrigo-o Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/config/assertoor/cl-stability-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tasks:
name: check_consensus_block_proposals
title: "Wait for block proposal from ${validatorPairName}"
config:
minTransactionCount: 240
minTransactionCount: 80 # For some reason the tx fuzz is working different than the old spammer, we need to check it
Copy link
Collaborator Author

@rodrigo-o rodrigo-o Apr 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is an issue for tracking this: #1440

configVars:
validatorNamePattern: "validatorPairName"

Expand Down
17 changes: 8 additions & 9 deletions .github/config/assertoor/network-params.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
participants:
- el_type: geth
el_image: ethereum/client-go:v1.14.12
el_image: ethereum/client-go:v1.15.6
cl_type: lighthouse
cl_image: sigp/lighthouse:v5.3.0
cl_image: sigp/lighthouse:v7.0.0-beta.5
validator_count: 32
- el_type: geth
el_image: ethereum/client-go:v1.14.12
el_image: ethereum/client-go:v1.15.6
cl_type: lighthouse
cl_image: sigp/lighthouse:v5.3.0
cl_image: sigp/lighthouse:v7.0.0-beta.5
validator_count: 32
- el_type: geth
el_image: ethereum/client-go:v1.14.12
el_image: ethereum/client-go:v1.15.6
cl_type: lambda
cl_image: lambda_ethereum_consensus:latest
use_separate_vc: false
Expand All @@ -21,8 +21,7 @@ participants:

additional_services:
- assertoor
- tx_spammer
- blob_spammer
- tx_fuzz
- dora

assertoor_params:
Expand All @@ -31,5 +30,5 @@ assertoor_params:
tests:
- https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/refs/heads/main/.github/config/assertoor/cl-stability-check.yml

tx_spammer_params:
tx_spammer_extra_args: ["--txcount=3", "--accounts=80"]
tx_fuzz_params:
tx_fuzz_extra_args: ["--txcount=3", "--accounts=80"]
4 changes: 2 additions & 2 deletions .github/workflows/assertoor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
uses: ethpandaops/kurtosis-assertoor-github-action@v1
with:
enclave_name: "elixir-consensus-assertoor"
kurtosis_version: "1.4.2"
kurtosis_version: "1.6.0"
ethereum_package_url: 'github.com/lambdaclass/ethereum-package'
ethereum_package_branch: 'lecc-integration-and-assertoor'
ethereum_package_branch: 'lecc-integration-electra'
ethereum_package_args: './.github/config/assertoor/network-params.yml'
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ kurtosis.connect:
kurtosis.connect.iex:
iex --sname client --remsh lambdaconsensus --cookie $(KURTOSIS_COOKIE)

#💻 kurtosis.assertoor: @ Execute the assertoor network params in .github
kurtosis.assertoor: kurtosis.clean kurtosis.setup.lambdaconsensus
kurtosis run --enclave $(KURTOSIS_ENCLAVE) $(KURTOSIS_DIR) --args-file .github/config/assertoor/network-params.yml

Comment on lines +108 to +111
Copy link
Collaborator Author

@rodrigo-o rodrigo-o Apr 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a convenient way to run the assertoor step locally

#💻 nix: @ Start a nix environment.
nix:
nix develop
Expand Down
2 changes: 1 addition & 1 deletion ethereum-package
Open in desktop
Submodule ethereum-package updated 292 files
20 changes: 11 additions & 9 deletions lib/beacon_api/controllers/v1/config_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ defmodule BeaconApi.V1.ConfigController do
]
@chain_spec_hex_fields [
"TERMINAL_BLOCK_HASH",
"GENESIS_FORK_VERSION",
"ALTAIR_FORK_VERSION",
"BELLATRIX_FORK_VERSION",
"CAPELLA_FORK_VERSION",
"DENEB_FORK_VERSION",
"ELECTRA_FORK_VERSION",
"DEPOSIT_CONTRACT_ADDRESS",
"MESSAGE_DOMAIN_INVALID_SNAPPY",
"MESSAGE_DOMAIN_VALID_SNAPPY"
Expand All @@ -43,9 +37,17 @@ defmodule BeaconApi.V1.ConfigController do
|> Map.drop(@chain_spec_removed_keys)
|> rename_keys(@chain_spec_renamed_keys)
|> Map.new(fn
{k, v} when is_integer(v) -> {k, Integer.to_string(v)}
{k, v} when k in @chain_spec_hex_fields -> {k, Utils.hex_encode(v)}
{k, v} -> {k, v}
{k, v} when is_integer(v) ->
{k, Integer.to_string(v)}

{k, v} when k in @chain_spec_hex_fields ->
{k, Utils.hex_encode(v)}

{k, v} when is_binary(v) ->
if String.ends_with?(k, "_FORK_VERSION"), do: {k, Utils.hex_encode(v)}, else: {k, v}

{k, v} ->
{k, v}
end)
end

Expand Down
14 changes: 6 additions & 8 deletions network_params.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
participants:
- el_type: geth
el_image: ethereum/client-go:v1.14.12
el_image: ethereum/client-go:v1.15.6
cl_type: lighthouse
cl_image: sigp/lighthouse:v5.3.0
cl_image: sigp/lighthouse:v7.0.0-beta.5
count: 2
validator_count: 32
- el_type: geth
el_image: ethereum/client-go:v1.14.12
el_image: ethereum/client-go:v1.15.6
cl_type: lambda
cl_image: lambda_ethereum_consensus:latest
use_separate_vc: false
Expand All @@ -18,10 +18,8 @@ participants:
# network_params:
# preset: minimal
additional_services:
- tx_spammer
- blob_spammer
- tx_fuzz
- dora
- beacon_metrics_gazer
- prometheus_grafana
# Uncomment the following lines to run the the network with the assertoor tests
# - assertoor
Expand All @@ -32,5 +30,5 @@ additional_services:
# tests:
# - https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/refs/heads/main/.github/config/assertoor/cl-stability-check.yml

# tx_spammer_params:
# tx_spammer_extra_args: ["--txcount=3", "--accounts=80"]
# tx_fuzz_params:
# tx_fuzz_extra_args: ["--txcount=3", "--accounts=80"]
Loading