Skip to content

Commit 65cd9fb

Browse files
ndetondeto
authored
Merge branch 'main' into ndeto/feat/add-txpool-viz
2 parents ddef3b6 + 459a931 commit 65cd9fb

20 files changed

+278
-154
lines changed

‎src/assertoor/assertoor_launcher.star‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def launch_assertoor(
6666
cl_client.beacon_http_url,
6767
el_client.ip_addr,
6868
el_client.rpc_port_num,
69-
participant.snooper_engine_context,
69+
participant.snooper_el_engine_context,
7070
participant.snooper_beacon_context,
7171
full_name,
7272
)
@@ -75,7 +75,7 @@ def launch_assertoor(
7575

7676
if participant_config.validator_count != 0:
7777
clients_with_validators.append(client_info)
78-
if participant.snooper_engine_context != None:
78+
if participant.snooper_el_engine_context != None:
7979
clients_with_el_snooper.append(client_info)
8080
if participant.snooper_beacon_context != None:
8181
clients_with_cl_snooper.append(client_info)

‎src/cl/cl_context.star‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def new_cl_context(
1010
multiaddr="",
1111
peer_id="",
1212
snooper_enabled=False,
13-
snooper_engine_context=None,
13+
snooper_el_engine_context=None,
1414
validator_keystore_files_artifact_uuid="",
1515
supernode=False,
1616
):
@@ -26,7 +26,7 @@ def new_cl_context(
2626
multiaddr=multiaddr,
2727
peer_id=peer_id,
2828
snooper_enabled=snooper_enabled,
29-
snooper_engine_context=snooper_engine_context,
29+
snooper_el_engine_context=snooper_el_engine_context,
3030
validator_keystore_files_artifact_uuid=validator_keystore_files_artifact_uuid,
3131
supernode=supernode,
3232
)

‎src/cl/cl_launcher.star‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ constants = import_module("../package_io/constants.star")
99
input_parser = import_module("../package_io/input_parser.star")
1010
shared_utils = import_module("../shared_utils/shared_utils.star")
1111

12-
engine_snooper = import_module("../snooper/snooper_engine_launcher.star")
12+
snooper_el_launcher = import_module("../snooper/snooper_el_launcher.star")
1313

1414
cl_context_BOOTNODE = None
1515

@@ -74,7 +74,7 @@ def launch(
7474
},
7575
}
7676

77-
all_snooper_engine_contexts = []
77+
all_snooper_el_engine_contexts = []
7878
all_cl_contexts = []
7979
preregistered_validator_keys_for_nodes = (
8080
validator_data.per_node_keystores
@@ -121,12 +121,12 @@ def launch(
121121
el_context = all_el_contexts[index]
122122

123123
cl_context = None
124-
snooper_engine_context = None
124+
snooper_el_engine_context = None
125125
if participant.snooper_enabled:
126126
snooper_service_name = "snooper-engine-{0}-{1}-{2}".format(
127127
index_str, cl_type, el_type
128128
)
129-
snooper_engine_context = engine_snooper.launch(
129+
snooper_el_engine_context = snooper_el_launcher.launch_snooper(
130130
plan,
131131
snooper_service_name,
132132
el_context,
@@ -138,7 +138,7 @@ def launch(
138138
global_other_index += 1
139139
plan.print(
140140
"Successfully added {0} snooper participants".format(
141-
snooper_engine_context
141+
snooper_el_engine_context
142142
)
143143
)
144144
checkpoint_sync_url = args_with_right_defaults.checkpoint_sync_url
@@ -162,7 +162,7 @@ def launch(
162162
"Checkpoint sync URL is required if you enabled checkpoint_sync for custom networks. Please provide a valid URL."
163163
)
164164

165-
all_snooper_engine_contexts.append(snooper_engine_context)
165+
all_snooper_el_engine_contexts.append(snooper_el_engine_context)
166166
full_name = "{0}-{1}-{2}".format(index_str, el_type, cl_type)
167167
if index == 0:
168168
cl_context = launch_method(
@@ -175,7 +175,7 @@ def launch(
175175
el_context,
176176
full_name,
177177
new_cl_node_validator_keystores,
178-
snooper_engine_context,
178+
snooper_el_engine_context,
179179
persistent,
180180
tolerations,
181181
node_selectors,
@@ -197,7 +197,7 @@ def launch(
197197
el_context,
198198
full_name,
199199
new_cl_node_validator_keystores,
200-
snooper_engine_context,
200+
snooper_el_engine_context,
201201
persistent,
202202
tolerations,
203203
node_selectors,
@@ -216,7 +216,7 @@ def launch(
216216
all_cl_contexts.append(cl_context)
217217
return (
218218
all_cl_contexts,
219-
all_snooper_engine_contexts,
219+
all_snooper_el_engine_contexts,
220220
preregistered_validator_keys_for_nodes,
221221
global_other_index,
222222
)

‎src/cl/grandine/grandine_launcher.star‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def launch(
4343
el_context,
4444
full_name,
4545
node_keystore_files,
46-
snooper_engine_context,
46+
snooper_el_engine_context,
4747
persistent,
4848
tolerations,
4949
node_selectors,
@@ -67,7 +67,7 @@ def launch(
6767
el_context,
6868
full_name,
6969
node_keystore_files,
70-
snooper_engine_context,
70+
snooper_el_engine_context,
7171
persistent,
7272
tolerations,
7373
node_selectors,
@@ -121,7 +121,7 @@ def launch(
121121
multiaddr=beacon_multiaddr,
122122
peer_id=beacon_peer_id,
123123
snooper_enabled=participant.snooper_enabled,
124-
snooper_engine_context=snooper_engine_context,
124+
snooper_el_engine_context=snooper_el_engine_context,
125125
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
126126
if node_keystore_files
127127
else "",
@@ -139,7 +139,7 @@ def get_beacon_config(
139139
el_context,
140140
full_name,
141141
node_keystore_files,
142-
snooper_engine_context,
142+
snooper_el_engine_context,
143143
persistent,
144144
tolerations,
145145
node_selectors,
@@ -163,8 +163,8 @@ def get_beacon_config(
163163
# If snooper is enabled use the snooper engine context, otherwise use the execution client context
164164
if participant.snooper_enabled:
165165
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
166-
snooper_engine_context.ip_addr,
167-
snooper_engine_context.engine_rpc_port_num,
166+
snooper_el_engine_context.ip_addr,
167+
snooper_el_engine_context.engine_rpc_port_num,
168168
)
169169
else:
170170
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(

‎src/cl/lighthouse/lighthouse_launcher.star‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def launch(
4848
el_context,
4949
full_name,
5050
node_keystore_files,
51-
snooper_engine_context,
51+
snooper_el_engine_context,
5252
persistent,
5353
tolerations,
5454
node_selectors,
@@ -72,7 +72,7 @@ def launch(
7272
el_context,
7373
full_name,
7474
node_keystore_files,
75-
snooper_engine_context,
75+
snooper_el_engine_context,
7676
persistent,
7777
tolerations,
7878
node_selectors,
@@ -145,7 +145,7 @@ def launch(
145145
multiaddr=beacon_multiaddr,
146146
peer_id=beacon_peer_id,
147147
snooper_enabled=participant.snooper_enabled,
148-
snooper_engine_context=snooper_engine_context,
148+
snooper_el_engine_context=snooper_el_engine_context,
149149
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
150150
if node_keystore_files
151151
else "",
@@ -163,7 +163,7 @@ def get_beacon_config(
163163
el_context,
164164
full_name,
165165
node_keystore_files,
166-
snooper_engine_context,
166+
snooper_el_engine_context,
167167
persistent,
168168
tolerations,
169169
node_selectors,
@@ -176,8 +176,8 @@ def get_beacon_config(
176176
# If snooper is enabled use the snooper engine context, otherwise use the execution client context
177177
if participant.snooper_enabled:
178178
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
179-
snooper_engine_context.ip_addr,
180-
snooper_engine_context.engine_rpc_port_num,
179+
snooper_el_engine_context.ip_addr,
180+
snooper_el_engine_context.engine_rpc_port_num,
181181
)
182182
else:
183183
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(

‎src/cl/lodestar/lodestar_launcher.star‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def launch(
3535
el_context,
3636
full_name,
3737
node_keystore_files,
38-
snooper_engine_context,
38+
snooper_el_engine_context,
3939
persistent,
4040
tolerations,
4141
node_selectors,
@@ -60,7 +60,7 @@ def launch(
6060
el_context,
6161
full_name,
6262
node_keystore_files,
63-
snooper_engine_context,
63+
snooper_el_engine_context,
6464
persistent,
6565
tolerations,
6666
node_selectors,
@@ -137,7 +137,7 @@ def launch(
137137
multiaddr=beacon_multiaddr,
138138
peer_id=beacon_peer_id,
139139
snooper_enabled=participant.snooper_enabled,
140-
snooper_engine_context=snooper_engine_context,
140+
snooper_el_engine_context=snooper_el_engine_context,
141141
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
142142
if node_keystore_files
143143
else "",
@@ -155,7 +155,7 @@ def get_beacon_config(
155155
el_context,
156156
full_name,
157157
node_keystore_files,
158-
snooper_engine_context,
158+
snooper_el_engine_context,
159159
persistent,
160160
tolerations,
161161
node_selectors,
@@ -173,8 +173,8 @@ def get_beacon_config(
173173
# If snooper is enabled use the snooper engine context, otherwise use the execution client context
174174
if participant.snooper_enabled:
175175
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
176-
snooper_engine_context.ip_addr,
177-
snooper_engine_context.engine_rpc_port_num,
176+
snooper_el_engine_context.ip_addr,
177+
snooper_el_engine_context.engine_rpc_port_num,
178178
)
179179
else:
180180
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(

‎src/cl/nimbus/nimbus_launcher.star‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def launch(
5656
el_context,
5757
full_name,
5858
node_keystore_files,
59-
snooper_engine_context,
59+
snooper_el_engine_context,
6060
persistent,
6161
tolerations,
6262
node_selectors,
@@ -80,7 +80,7 @@ def launch(
8080
el_context,
8181
full_name,
8282
node_keystore_files,
83-
snooper_engine_context,
83+
snooper_el_engine_context,
8484
persistent,
8585
tolerations,
8686
node_selectors,
@@ -133,7 +133,7 @@ def launch(
133133
multiaddr=beacon_multiaddr,
134134
peer_id=beacon_peer_id,
135135
snooper_enabled=participant.snooper_enabled,
136-
snooper_engine_context=snooper_engine_context,
136+
snooper_el_engine_context=snooper_el_engine_context,
137137
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
138138
if node_keystore_files
139139
else "",
@@ -151,7 +151,7 @@ def get_beacon_config(
151151
el_context,
152152
full_name,
153153
node_keystore_files,
154-
snooper_engine_context,
154+
snooper_el_engine_context,
155155
persistent,
156156
tolerations,
157157
node_selectors,
@@ -175,8 +175,8 @@ def get_beacon_config(
175175
# If snooper is enabled use the snooper engine context, otherwise use the execution client context
176176
if participant.snooper_enabled:
177177
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
178-
snooper_engine_context.ip_addr,
179-
snooper_engine_context.engine_rpc_port_num,
178+
snooper_el_engine_context.ip_addr,
179+
snooper_el_engine_context.engine_rpc_port_num,
180180
)
181181
else:
182182
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(

‎src/cl/prysm/prysm_launcher.star‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def launch(
3939
el_context,
4040
full_name,
4141
node_keystore_files,
42-
snooper_engine_context,
42+
snooper_el_engine_context,
4343
persistent,
4444
tolerations,
4545
node_selectors,
@@ -63,7 +63,7 @@ def launch(
6363
el_context,
6464
full_name,
6565
node_keystore_files,
66-
snooper_engine_context,
66+
snooper_el_engine_context,
6767
persistent,
6868
tolerations,
6969
node_selectors,
@@ -121,7 +121,7 @@ def launch(
121121
multiaddr=beacon_multiaddr,
122122
peer_id=beacon_peer_id,
123123
snooper_enabled=participant.snooper_enabled,
124-
snooper_engine_context=snooper_engine_context,
124+
snooper_el_engine_context=snooper_el_engine_context,
125125
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
126126
if node_keystore_files
127127
else "",
@@ -139,7 +139,7 @@ def get_beacon_config(
139139
el_context,
140140
full_name,
141141
node_keystore_files,
142-
snooper_engine_context,
142+
snooper_el_engine_context,
143143
persistent,
144144
tolerations,
145145
node_selectors,
@@ -152,8 +152,8 @@ def get_beacon_config(
152152
# If snooper is enabled use the snooper engine context, otherwise use the execution client context
153153
if participant.snooper_enabled:
154154
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
155-
snooper_engine_context.ip_addr,
156-
snooper_engine_context.engine_rpc_port_num,
155+
snooper_el_engine_context.ip_addr,
156+
snooper_el_engine_context.engine_rpc_port_num,
157157
)
158158
else:
159159
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(

‎src/cl/teku/teku_launcher.star‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def launch(
4343
el_context,
4444
full_name,
4545
node_keystore_files,
46-
snooper_engine_context,
46+
snooper_el_engine_context,
4747
persistent,
4848
tolerations,
4949
node_selectors,
@@ -67,7 +67,7 @@ def launch(
6767
el_context,
6868
full_name,
6969
node_keystore_files,
70-
snooper_engine_context,
70+
snooper_el_engine_context,
7171
persistent,
7272
tolerations,
7373
node_selectors,
@@ -122,7 +122,7 @@ def launch(
122122
multiaddr=beacon_multiaddr,
123123
peer_id=beacon_peer_id,
124124
snooper_enabled=participant.snooper_enabled,
125-
snooper_engine_context=snooper_engine_context,
125+
snooper_el_engine_context=snooper_el_engine_context,
126126
validator_keystore_files_artifact_uuid=node_keystore_files.files_artifact_uuid
127127
if node_keystore_files
128128
else "",
@@ -140,7 +140,7 @@ def get_beacon_config(
140140
el_context,
141141
full_name,
142142
node_keystore_files,
143-
snooper_engine_context,
143+
snooper_el_engine_context,
144144
persistent,
145145
tolerations,
146146
node_selectors,
@@ -164,8 +164,8 @@ def get_beacon_config(
164164
# If snooper is enabled use the snooper engine context, otherwise use the execution client context
165165
if participant.snooper_enabled:
166166
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
167-
snooper_engine_context.ip_addr,
168-
snooper_engine_context.engine_rpc_port_num,
167+
snooper_el_engine_context.ip_addr,
168+
snooper_el_engine_context.engine_rpc_port_num,
169169
)
170170
else:
171171
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(

0 commit comments

Comments
 (0)