Skip to content

Commit 7bef190

Browse files
chore: Update ethereum-package (#398)
Updates `ethereum-package` version. This triggered a little waterfall of changes: - `kurtosis` needed to be updated to `1.11.1` - `kurtosis-test` needed to be updated to use `1.11.1` too - `kurtosis-test` then needed to be released and updated to `0.0.6` - `_ethereum_package_input_parser.get_client_tolerations` has been moved to `_ethereum_package_shared_utils.get_tolerations` - The previously pinned `lighthouse` image can then be unpinned and the associated `registry` entry can be deleted Fixes ethereum-optimism/optimism#17521
1 parent 84cd096 commit 7bef190

19 files changed

Lines changed: 43 additions & 43 deletions

File tree

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ ethereum_package:
102102
participants:
103103
- el_type: geth
104104
cl_type: lighthouse
105-
cl_image: "ethpandaops/lighthouse:stable-e21198c"
106105
network_params:
107106
preset: minimal
108107
genesis_delay: 5

.github/tests/kona-node-signer.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ ethereum_package:
3737
participants:
3838
- el_type: geth
3939
cl_type: lighthouse
40-
cl_image: "ethpandaops/lighthouse:stable-e21198c"
4140
network_params:
4241
preset: minimal
4342
genesis_delay: 5

.github/tests/simple.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ ethereum_package:
6666
participants:
6767
- el_type: geth
6868
cl_type: teku
69-
cl_image: consensys/teku:25.7.1
7069
network_params:
7170
preset: minimal
7271
genesis_delay: 5

.github/workflows/reusable-run-k8s.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
payload:
1111
- { name: "single", file: "./.github/tests/single_l2.yaml" }
1212
- { name: "network-params", file: "./network_params.yaml" }
13-
- { name: "network-params-flashblocks", file: "./network_params_flashblocks.yaml" }
13+
- { name: "network-params-flashblocks", file: "./.github/tests/flashblocks.yaml" }
1414
fail-fast: false
1515
runs-on: ubuntu-latest
1616
steps:
@@ -36,7 +36,7 @@ jobs:
3636
id: testnet
3737
uses: ethpandaops/kurtosis-assertoor-github-action@5932604b244dbd2ddb811516b516a9094f4d2c2f # v1
3838
with:
39-
kurtosis_version: "1.10.3"
39+
kurtosis_version: "1.11.1"
4040
kurtosis_extra_args: "--image-download always --non-blocking-tasks --verbosity DETAILED"
4141
kurtosis_backend: "kubernetes"
4242
kubernetes_config: "${{ steps.kubeconfig.outputs.kubeconfig }}"

kurtosis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ description: |
33
# Optimism Package
44
This is a Kurtosis package for deploying an Optimism Rollup
55
replace:
6-
github.com/ethpandaops/ethereum-package: github.com/ethpandaops/ethereum-package@83830d44823767af65eda7dfe6b26c87c536c4cf
6+
github.com/ethpandaops/ethereum-package: github.com/ethpandaops/ethereum-package@e964e305a19d56b798800e84d264f97b87952c55
77
github.com/kurtosis-tech/prometheus-package: github.com/kurtosis-tech/prometheus-package@f5ce159aec728898e3deb827f6b921f8ecfc527f
88
github.com/kurtosis-tech/postgres-package: github.com/kurtosis-tech/postgres-package@2d363be1bc42524f6b0575cac0bbc0fd194ae173

main.star

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ def run(plan, args={}):
4646
)
4747
else:
4848
if "network_params" not in ethereum_args:
49-
ethereum_args.update(
50-
input_parser.default_ethereum_package_network_params(registry)
51-
)
49+
ethereum_args.update(input_parser.default_ethereum_package_network_params())
5250

5351
optimism_args = input_parser.input_parser(
5452
plan=plan,

mise.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
# Core dependencies
44
just = "1.40.0"
5-
"ubi:ethereum-optimism/kurtosis-test" = "0.0.5"
6-
"ubi:kurtosis-tech/kurtosis-cli-release-artifacts[exe=kurtosis]" = "1.10.3"
5+
"ubi:ethereum-optimism/kurtosis-test" = "0.0.6"
6+
"ubi:kurtosis-tech/kurtosis-cli-release-artifacts[exe=kurtosis]" = "1.11.1"
77
"yq" = "v4.44.3"
88

99
# lint

network_params.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ ethereum_package:
7878
participants:
7979
- el_type: geth
8080
cl_type: lighthouse
81-
cl_image: "ethpandaops/lighthouse:stable-e21198c"
8281
network_params:
8382
preset: minimal
8483
genesis_delay: 5

src/cl/hildr/launcher.star

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
_ethereum_package_cl_context = import_module(
22
"github.com/ethpandaops/ethereum-package/src/cl/cl_context.star"
33
)
4-
54
_ethereum_package_constants = import_module(
65
"github.com/ethpandaops/ethereum-package/src/package_io/constants.star"
76
)
8-
97
_ethereum_package_input_parser = import_module(
108
"github.com/ethpandaops/ethereum-package/src/package_io/input_parser.star"
119
)
10+
_ethereum_package_shared_utils = import_module(
11+
"github.com/ethpandaops/ethereum-package/src/shared_utils/shared_utils.star"
12+
)
1213

1314
_constants = import_module("../../package_io/constants.star")
1415
_observability = import_module("../../observability/observability.star")
@@ -59,7 +60,7 @@ def launch(
5960
node_selectors,
6061
)
6162

62-
cl_tolerations = _ethereum_package_input_parser.get_client_tolerations(
63+
cl_tolerations = _ethereum_package_shared_utils.get_tolerations(
6364
params.tolerations, [], tolerations
6465
)
6566

src/cl/kona-node/launcher.star

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
_ethereum_package_cl_context = import_module(
1010
"github.com/ethpandaops/ethereum-package/src/cl/cl_context.star"
1111
)
12-
1312
_ethereum_package_constants = import_module(
1413
"github.com/ethpandaops/ethereum-package/src/package_io/constants.star"
1514
)
16-
1715
_ethereum_package_input_parser = import_module(
1816
"github.com/ethpandaops/ethereum-package/src/package_io/input_parser.star"
1917
)
18+
_ethereum_package_shared_utils = import_module(
19+
"github.com/ethpandaops/ethereum-package/src/shared_utils/shared_utils.star"
20+
)
2021

2122
_filter = import_module("/src/util/filter.star")
2223
_net = import_module("/src/util/net.star")
@@ -79,7 +80,7 @@ def launch(
7980
node_selectors,
8081
)
8182

82-
cl_tolerations = _ethereum_package_input_parser.get_client_tolerations(
83+
cl_tolerations = _ethereum_package_shared_utils.get_tolerations(
8384
params.tolerations, [], tolerations
8485
)
8586

0 commit comments

Comments
 (0)