Skip to content

Commit e611b58

Browse files
janjakubnanistajanjakubnanista
authored
chore: Update devnet SDK with support for multiple sequencers in kurtosis (ethereum-optimism#16432)
* chore: Bump optimism-package * chore: Adjust args files * fix: Test * fix: MEV params * fix: Test * fix: YAML * chore: bump * fix: Network name * fix: Protocols * fix: Commit hash * chore: bump * chore: names * fix: Additional services * chore: bump * chore: bump * fix: Tests * fix: Tests * wip: Reverse the order of parsing * chore: bump * chore: bump * chore: Cleanup
1 parent 57931bf commit e611b58

14 files changed

Lines changed: 223 additions & 275 deletions

File tree

‎devnet-sdk/shell/env/testdata/kurtosis/args--simple.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
optimism_package:
22
chains:
3-
- whatakey:
3+
op-kurtosis:
4+
whatakey:
45
- el_type: op-geth
56
cl_type: op-node

‎kurtosis-devnet/flash.yaml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,25 @@ optimism_package:
33
enabled: true
44
image: {{ localDockerImage "op-faucet" }}
55
chains:
6-
- participants:
7-
- el_type: op-geth
8-
cl_type: op-node
9-
cl_image: {{ localDockerImage "op-node" }}
10-
el_builder_type: "op-rbuilder"
11-
el_builder_image: "us-docker.pkg.dev/oplabs-tools-artifacts/dev-images/op-rbuilder:sha-4aee498"
12-
count: 2
6+
op-kurtosis:
7+
participants:
8+
node0: &x-node
9+
el:
10+
type: op-geth
11+
cl:
12+
type: op-node
13+
image: {{ localDockerImage "op-node" }}
14+
builder_type: "op-rbuilder"
15+
builder_image: "us-docker.pkg.dev/oplabs-tools-artifacts/dev-images/op-rbuilder:sha-4aee498"
16+
mev_params:
17+
enabled: true
18+
type: "rollup-boost"
19+
image: "docker.io/flashbots/rollup-boost:0.6.2"
20+
node1: *x-node
1321
network_params:
1422
network: "kurtosis"
1523
network_id: "2151908"
1624
seconds_per_slot: 2
17-
name: "op-kurtosis"
1825
fjord_time_offset: 0
1926
granite_time_offset: 0
2027
holocene_time_offset: 0
@@ -31,12 +38,6 @@ optimism_package:
3138
extra_params: []
3239
game_type: 1
3340
proposal_interval: 10m
34-
mev_params:
35-
type: "rollup-boost"
36-
image: "docker.io/flashbots/rollup-boost:0.6.2"
37-
additional_services: [
38-
"rollup-boost",
39-
]
4041
challengers:
4142
challenger:
4243
enabled: true

‎kurtosis-devnet/interop.yaml‎

Lines changed: 36 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -35,39 +35,43 @@ optimism_package:
3535
extra_params:
3636
- {{ $flags.log_level }}
3737
chains:
38-
- participants:
39-
- el_type: op-geth
40-
el_image: ""
41-
el_log_level: ""
42-
el_extra_env_vars: {}
43-
el_extra_labels: {}
44-
el_extra_params: []
45-
el_tolerations: []
46-
el_volume_size: 0
47-
el_min_cpu: 0
48-
el_max_cpu: 0
49-
el_min_mem: 0
50-
el_max_mem: 0
51-
cl_type: op-node
52-
cl_image: {{ $local_images.op_node }}
53-
cl_log_level: ""
54-
cl_extra_env_vars: {}
55-
cl_extra_labels: {}
56-
cl_extra_params: []
57-
cl_tolerations: []
58-
cl_volume_size: 0
59-
cl_min_cpu: 0
60-
cl_max_cpu: 0
61-
cl_min_mem: 0
62-
cl_max_mem: 0
63-
node_selectors: {}
64-
tolerations: []
65-
count: 1
38+
op-kurtosis1:
39+
participants:
40+
node0: &x-node
41+
el:
42+
type: op-geth
43+
image: ""
44+
log_level: ""
45+
extra_env_vars: {}
46+
extra_labels: {}
47+
extra_params: []
48+
tolerations: []
49+
volume_size: 0
50+
min_cpu: 0
51+
max_cpu: 0
52+
min_mem: 0
53+
max_mem: 0
54+
cl:
55+
type: op-node
56+
image: {{ $local_images.op_node }}
57+
log_level: ""
58+
extra_env_vars: {}
59+
extra_labels: {}
60+
extra_params: []
61+
tolerations: []
62+
volume_size: 0
63+
min_cpu: 0
64+
max_cpu: 0
65+
min_mem: 0
66+
max_mem: 0
67+
mev_params:
68+
image: ""
69+
builder_host: ""
70+
builder_port: ""
6671
network_params:
6772
network: "kurtosis"
6873
network_id: "2151908"
6974
seconds_per_slot: 2
70-
name: "op-kurtosis-1"
7175
fjord_time_offset: 0
7276
granite_time_offset: 0
7377
holocene_time_offset: 0
@@ -84,44 +88,13 @@ optimism_package:
8488
- {{ $flags.log_level }}
8589
game_type: 1
8690
proposal_interval: 10m
87-
mev_params:
88-
image: ""
89-
builder_host: ""
90-
builder_port: ""
91-
additional_services: []
92-
- participants:
93-
- el_type: op-geth
94-
el_image: ""
95-
el_log_level: ""
96-
el_extra_env_vars: {}
97-
el_extra_labels: {}
98-
el_extra_params: []
99-
el_tolerations: []
100-
el_volume_size: 0
101-
el_min_cpu: 0
102-
el_max_cpu: 0
103-
el_min_mem: 0
104-
el_max_mem: 0
105-
cl_type: op-node
106-
cl_image: {{ $local_images.op_node }}
107-
cl_log_level: ""
108-
cl_extra_env_vars: {}
109-
cl_extra_labels: {}
110-
cl_extra_params: []
111-
cl_tolerations: []
112-
cl_volume_size: 0
113-
cl_min_cpu: 0
114-
cl_max_cpu: 0
115-
cl_min_mem: 0
116-
cl_max_mem: 0
117-
node_selectors: {}
118-
tolerations: []
119-
count: 1
91+
op-kurtosis2:
92+
participants:
93+
node0: *x-node
12094
network_params:
12195
network: "kurtosis"
12296
network_id: "2151909"
12397
seconds_per_slot: 2
124-
name: "op-kurtosis-2"
12598
fjord_time_offset: 0
12699
granite_time_offset: 0
127100
holocene_time_offset: 0
@@ -137,11 +110,6 @@ optimism_package:
137110
- {{ $flags.log_level }}
138111
game_type: 1
139112
proposal_interval: 10m
140-
mev_params:
141-
image: ""
142-
builder_host: ""
143-
builder_port: ""
144-
additional_services: []
145113
challengers:
146114
challenger:
147115
enabled: true

‎kurtosis-devnet/isthmus.yaml‎

Lines changed: 44 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -3,67 +3,54 @@ optimism_package:
33
enabled: true
44
image: {{ localDockerImage "op-faucet" }}
55
chains:
6-
- participants:
7-
- el_type: op-geth
8-
el_image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101503.2-rc.3"
9-
el_log_level: ""
10-
el_extra_env_vars: {}
11-
el_extra_labels: {}
12-
el_extra_params: []
13-
el_tolerations: []
14-
el_volume_size: 0
15-
el_min_cpu: 0
16-
el_max_cpu: 0
17-
el_min_mem: 0
18-
el_max_mem: 0
19-
cl_type: op-node
20-
cl_image: {{ localDockerImage "op-node" }}
21-
cl_log_level: ""
22-
cl_extra_env_vars: {}
23-
cl_extra_labels: {}
24-
cl_extra_params: []
25-
cl_tolerations: []
26-
cl_volume_size: 0
27-
cl_min_cpu: 0
28-
cl_max_cpu: 0
29-
cl_min_mem: 0
30-
cl_max_mem: 0
31-
node_selectors: {}
32-
tolerations: []
33-
count: 1
34-
- el_type: op-reth
35-
# Pinning op-reth nightly image: "Created": "2025-03-31T02:09:09.704214502Z"
36-
el_image: "ghcr.io/paradigmxyz/op-reth@sha256:7d83174c900a623897d5cf3a42764f19047ca47034f9726f5a9fad2c7ed32fee"
37-
el_log_level: ""
38-
el_extra_env_vars: {}
39-
el_extra_labels: {}
40-
el_extra_params: []
41-
el_tolerations: []
42-
el_volume_size: 0
43-
el_min_cpu: 0
44-
el_max_cpu: 0
45-
el_min_mem: 0
46-
el_max_mem: 0
47-
cl_type: op-node
48-
cl_image: {{ localDockerImage "op-node" }}
49-
cl_log_level: ""
50-
cl_extra_env_vars: {}
51-
cl_extra_labels: {}
52-
cl_extra_params: []
53-
cl_tolerations: []
54-
cl_volume_size: 0
55-
cl_min_cpu: 0
56-
cl_max_cpu: 0
57-
cl_min_mem: 0
58-
cl_max_mem: 0
59-
node_selectors: {}
60-
tolerations: []
61-
count: 1
6+
op-kurtosis:
7+
participants:
8+
node0:
9+
el:
10+
type: op-geth
11+
image: "us-docker.pkg.dev/oplabs-tools-artifacts/images/op-geth:v1.101503.2-rc.3"
12+
log_level: ""
13+
extra_env_vars: {}
14+
extra_labels: {}
15+
extra_params: []
16+
tolerations: []
17+
volume_size: 0
18+
min_cpu: 0
19+
max_cpu: 0
20+
min_mem: 0
21+
max_mem: 0
22+
cl: &x-node-cl
23+
type: op-node
24+
image: {{ localDockerImage "op-node" }}
25+
log_level: ""
26+
extra_env_vars: {}
27+
extra_labels: {}
28+
extra_params: []
29+
tolerations: []
30+
volume_size: 0
31+
min_cpu: 0
32+
max_cpu: 0
33+
min_mem: 0
34+
max_mem: 0
35+
node1:
36+
el:
37+
type: op-reth
38+
image: "ghcr.io/paradigmxyz/op-reth@sha256:7d83174c900a623897d5cf3a42764f19047ca47034f9726f5a9fad2c7ed32fee"
39+
log_level: ""
40+
extra_env_vars: {}
41+
extra_labels: {}
42+
extra_params: []
43+
tolerations: []
44+
volume_size: 0
45+
min_cpu: 0
46+
max_cpu: 0
47+
min_mem: 0
48+
max_mem: 0
49+
cl: *x-node-cl
6250
network_params:
6351
network: "kurtosis"
6452
network_id: "2151908"
6553
seconds_per_slot: 2
66-
name: "op-kurtosis"
6754
fjord_time_offset: 0
6855
granite_time_offset: 0
6956
holocene_time_offset: 0
@@ -77,11 +64,6 @@ optimism_package:
7764
extra_params: []
7865
game_type: 1
7966
proposal_interval: 10m
80-
mev_params:
81-
image: ""
82-
builder_host: ""
83-
builder_port: ""
84-
additional_services: []
8567
challengers:
8668
challenger:
8769
enabled: true

‎kurtosis-devnet/optimism-package-trampoline/kurtosis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: github.com/ethereum-optimism/optimism/kurtosis-devnet/optimism-package-tra
22
description: |-
33
A trampoline package for optimism-package. This one is reproducible, due to the replace directives below.
44
replace:
5-
github.com/ethpandaops/optimism-package: github.com/ethpandaops/optimism-package@52ed3e6e8f1788adcac15baf4b65b408cf13961a
5+
github.com/ethpandaops/optimism-package: github.com/ethpandaops/optimism-package@d7f3c8bbb666ffa49910f59e9204541c213bb807
66
github.com/ethpandaops/ethereum-package: github.com/ethpandaops/ethereum-package@83830d44823767af65eda7dfe6b26c87c536c4cf
77
github.com/kurtosis-tech/prometheus-package: github.com/kurtosis-tech/prometheus-package@637c9dea933be18e47f96cadc0d9bb0e3a5aa9d6 # v1.0.0
88
github.com/kurtosis-tech/postgres-package: github.com/kurtosis-tech/postgres-package@9cbdde2c55e8d1656deb87821465a2ad244d8b33 # v1.0.0

0 commit comments

Comments
 (0)