Skip to content

Commit 1396bdd

Browse files
authored
chore: update to the latest version of kurtosis (#1437)
1 parent e230ae8 commit 1396bdd

File tree

7 files changed

+33
-30
lines changed

7 files changed

+33
-30
lines changed

.github/config/assertoor/cl-stability-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ tasks:
3434
name: check_consensus_block_proposals
3535
title: "Wait for block proposal from ${validatorPairName}"
3636
config:
37-
minTransactionCount: 240
37+
minTransactionCount: 80 # For some reason the tx fuzz is working different than the old spammer, we need to check it
3838
configVars:
3939
validatorNamePattern: "validatorPairName"
4040

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
participants:
22
- el_type: geth
3-
el_image: ethereum/client-go:v1.14.12
3+
el_image: ethereum/client-go:v1.15.6
44
cl_type: lighthouse
5-
cl_image: sigp/lighthouse:v5.3.0
5+
cl_image: sigp/lighthouse:v7.0.0-beta.5
66
validator_count: 32
77
- el_type: geth
8-
el_image: ethereum/client-go:v1.14.12
8+
el_image: ethereum/client-go:v1.15.6
99
cl_type: lighthouse
10-
cl_image: sigp/lighthouse:v5.3.0
10+
cl_image: sigp/lighthouse:v7.0.0-beta.5
1111
validator_count: 32
1212
- el_type: geth
13-
el_image: ethereum/client-go:v1.14.12
13+
el_image: ethereum/client-go:v1.15.6
1414
cl_type: lambda
1515
cl_image: lambda_ethereum_consensus:latest
1616
use_separate_vc: false
@@ -21,8 +21,7 @@ participants:
2121

2222
additional_services:
2323
- assertoor
24-
- tx_spammer
25-
- blob_spammer
24+
- tx_fuzz
2625
- dora
2726

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

34-
tx_spammer_params:
35-
tx_spammer_extra_args: ["--txcount=3", "--accounts=80"]
33+
tx_fuzz_params:
34+
tx_fuzz_extra_args: ["--txcount=3", "--accounts=80"]

.github/workflows/assertoor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: ethpandaops/kurtosis-assertoor-github-action@v1
3030
with:
3131
enclave_name: "elixir-consensus-assertoor"
32-
kurtosis_version: "1.4.2"
32+
kurtosis_version: "1.6.0"
3333
ethereum_package_url: 'github.com/lambdaclass/ethereum-package'
34-
ethereum_package_branch: 'lecc-integration-and-assertoor'
34+
ethereum_package_branch: 'lecc-integration-electra'
3535
ethereum_package_args: './.github/config/assertoor/network-params.yml'

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ kurtosis.connect:
105105
kurtosis.connect.iex:
106106
iex --sname client --remsh lambdaconsensus --cookie $(KURTOSIS_COOKIE)
107107

108+
#💻 kurtosis.assertoor: @ Execute the assertoor network params in .github
109+
kurtosis.assertoor: kurtosis.clean kurtosis.setup.lambdaconsensus
110+
kurtosis run --enclave $(KURTOSIS_ENCLAVE) $(KURTOSIS_DIR) --args-file .github/config/assertoor/network-params.yml
111+
108112
#💻 nix: @ Start a nix environment.
109113
nix:
110114
nix develop

ethereum-package

Submodule ethereum-package updated 292 files

lib/beacon_api/controllers/v1/config_controller.ex

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,6 @@ defmodule BeaconApi.V1.ConfigController do
1717
]
1818
@chain_spec_hex_fields [
1919
"TERMINAL_BLOCK_HASH",
20-
"GENESIS_FORK_VERSION",
21-
"ALTAIR_FORK_VERSION",
22-
"BELLATRIX_FORK_VERSION",
23-
"CAPELLA_FORK_VERSION",
24-
"DENEB_FORK_VERSION",
25-
"ELECTRA_FORK_VERSION",
2620
"DEPOSIT_CONTRACT_ADDRESS",
2721
"MESSAGE_DOMAIN_INVALID_SNAPPY",
2822
"MESSAGE_DOMAIN_VALID_SNAPPY"
@@ -43,9 +37,17 @@ defmodule BeaconApi.V1.ConfigController do
4337
|> Map.drop(@chain_spec_removed_keys)
4438
|> rename_keys(@chain_spec_renamed_keys)
4539
|> Map.new(fn
46-
{k, v} when is_integer(v) -> {k, Integer.to_string(v)}
47-
{k, v} when k in @chain_spec_hex_fields -> {k, Utils.hex_encode(v)}
48-
{k, v} -> {k, v}
40+
{k, v} when is_integer(v) ->
41+
{k, Integer.to_string(v)}
42+
43+
{k, v} when k in @chain_spec_hex_fields ->
44+
{k, Utils.hex_encode(v)}
45+
46+
{k, v} when is_binary(v) ->
47+
if String.ends_with?(k, "_FORK_VERSION"), do: {k, Utils.hex_encode(v)}, else: {k, v}
48+
49+
{k, v} ->
50+
{k, v}
4951
end)
5052
end
5153

network_params.yaml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
participants:
22
- el_type: geth
3-
el_image: ethereum/client-go:v1.14.12
3+
el_image: ethereum/client-go:v1.15.6
44
cl_type: lighthouse
5-
cl_image: sigp/lighthouse:v5.3.0
5+
cl_image: sigp/lighthouse:v7.0.0-beta.5
66
count: 2
77
validator_count: 32
88
- el_type: geth
9-
el_image: ethereum/client-go:v1.14.12
9+
el_image: ethereum/client-go:v1.15.6
1010
cl_type: lambda
1111
cl_image: lambda_ethereum_consensus:latest
1212
use_separate_vc: false
@@ -18,10 +18,8 @@ participants:
1818
# network_params:
1919
# preset: minimal
2020
additional_services:
21-
- tx_spammer
22-
- blob_spammer
21+
- tx_fuzz
2322
- dora
24-
- beacon_metrics_gazer
2523
- prometheus_grafana
2624
# Uncomment the following lines to run the the network with the assertoor tests
2725
# - assertoor
@@ -32,5 +30,5 @@ additional_services:
3230
# tests:
3331
# - https://raw.githubusercontent.com/lambdaclass/lambda_ethereum_consensus/refs/heads/main/.github/config/assertoor/cl-stability-check.yml
3432

35-
# tx_spammer_params:
36-
# tx_spammer_extra_args: ["--txcount=3", "--accounts=80"]
33+
# tx_fuzz_params:
34+
# tx_fuzz_extra_args: ["--txcount=3", "--accounts=80"]

0 commit comments

Comments
 (0)