Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 main.star
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ def run(plan, args={}):
global_tolerations,
)
fuzz_target = "http://{0}:{1}".format(
broadcaster_service.ip_address,
broadcaster_service.name,
broadcaster.PORT,
)

Expand Down
2 changes: 1 addition & 1 deletion src/blobber/blobber_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def launch(

blobber_service = plan.add_service(blobber_service_name, blobber_config)
return blobber_context.new_blobber_context(
blobber_service.ip_address,
blobber_service.name,
blobber_service.ports[BLOBBER_VALIDATOR_PROXY_PORT_ID].number,
)

Expand Down
2 changes: 1 addition & 1 deletion src/blockscout/blockscout_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ HTTP_PORT_NUMBER_FRONTEND = 3000
def get_api_host(blockscout_service, port_publisher):
if port_publisher.additional_services_enabled:
return port_publisher.additional_services_nat_exit_ip
return blockscout_service.ip_address
return blockscout_service.name


def get_api_port(blockscout_service, port_publisher):
Expand Down
10 changes: 3 additions & 7 deletions src/cl/grandine/grandine_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -384,14 +384,10 @@ def get_cl_context(
node_selectors,
):
beacon_http_port = service.ports[constants.HTTP_PORT_ID]
beacon_http_url = "http://{0}:{1}".format(
service.ip_address, beacon_http_port.number
)
beacon_http_url = "http://{0}:{1}".format(service.name, beacon_http_port.number)

beacon_metrics_port = service.ports[constants.METRICS_PORT_ID]
beacon_metrics_url = "{0}:{1}".format(
service.ip_address, beacon_metrics_port.number
)
beacon_metrics_url = "{0}:{1}".format(service.name, beacon_metrics_port.number)

beacon_node_identity_recipe = GetHttpRequestRecipe(
endpoint="/eth/v1/node/identity",
Expand All @@ -416,7 +412,7 @@ def get_cl_context(
return cl_context.new_cl_context(
client_name="grandine",
enr=beacon_node_enr,
ip_addr=service.ip_address,
ip_addr=service.name,
http_port=beacon_http_port.number,
beacon_http_url=beacon_http_url,
cl_nodes_metrics_info=nodes_metrics_info,
Expand Down
10 changes: 3 additions & 7 deletions src/cl/lighthouse/lighthouse_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -355,9 +355,7 @@ def get_cl_context(
node_selectors,
):
beacon_http_port = service.ports[constants.HTTP_PORT_ID]
beacon_http_url = "http://{0}:{1}".format(
service.ip_address, beacon_http_port.number
)
beacon_http_url = "http://{0}:{1}".format(service.name, beacon_http_port.number)

# TODO(old) add validator availability using the validator API: https://ethereum.github.io/beacon-APIs/?urls.primaryName=v1#/ValidatorRequiredApi | from eth2-merge-kurtosis-module
beacon_node_identity_recipe = GetHttpRequestRecipe(
Expand All @@ -377,17 +375,15 @@ def get_cl_context(
beacon_peer_id = response["extract.peer_id"]

beacon_metrics_port = service.ports[constants.METRICS_PORT_ID]
beacon_metrics_url = "{0}:{1}".format(
service.ip_address, beacon_metrics_port.number
)
beacon_metrics_url = "{0}:{1}".format(service.name, beacon_metrics_port.number)
beacon_node_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, beacon_metrics_url
)
nodes_metrics_info = [beacon_node_metrics_info]
return cl_context.new_cl_context(
client_name="lighthouse",
enr=beacon_node_enr,
ip_addr=service.ip_address,
ip_addr=service.name,
http_port=beacon_http_port.number,
beacon_http_url=beacon_http_url,
cl_nodes_metrics_info=nodes_metrics_info,
Expand Down
10 changes: 3 additions & 7 deletions src/cl/lodestar/lodestar_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,7 @@ def get_cl_context(
):
beacon_http_port = service.ports[constants.HTTP_PORT_ID]

beacon_http_url = "http://{0}:{1}".format(
service.ip_address, beacon_http_port.number
)
beacon_http_url = "http://{0}:{1}".format(service.name, beacon_http_port.number)

# TODO(old) add validator availability using the validator API: https://ethereum.github.io/beacon-APIs/?urls.primaryName=v1#/ValidatorRequiredApi | from eth2-merge-kurtosis-module

Expand All @@ -359,9 +357,7 @@ def get_cl_context(
beacon_peer_id = response["extract.peer_id"]

beacon_metrics_port = service.ports[constants.METRICS_PORT_ID]
beacon_metrics_url = "{0}:{1}".format(
service.ip_address, beacon_metrics_port.number
)
beacon_metrics_url = "{0}:{1}".format(service.name, beacon_metrics_port.number)

beacon_node_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, beacon_metrics_url
Expand All @@ -371,7 +367,7 @@ def get_cl_context(
return cl_context.new_cl_context(
client_name="lodestar",
enr=beacon_node_enr,
ip_addr=service.ip_address,
ip_addr=service.name,
http_port=beacon_http_port.number,
beacon_http_url=beacon_http_url,
cl_nodes_metrics_info=nodes_metrics_info,
Expand Down
10 changes: 3 additions & 7 deletions src/cl/nimbus/nimbus_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,8 @@ def get_cl_context(
):
beacon_http_port = service.ports[constants.HTTP_PORT_ID]
beacon_metrics_port = service.ports[constants.METRICS_PORT_ID]
beacon_http_url = "http://{0}:{1}".format(
service.ip_address, beacon_http_port.number
)
beacon_metrics_url = "{0}:{1}".format(
service.ip_address, beacon_metrics_port.number
)
beacon_http_url = "http://{0}:{1}".format(service.name, beacon_http_port.number)
beacon_metrics_url = "{0}:{1}".format(service.name, beacon_metrics_port.number)

beacon_node_identity_recipe = GetHttpRequestRecipe(
endpoint="/eth/v1/node/identity",
Expand All @@ -418,7 +414,7 @@ def get_cl_context(
return cl_context.new_cl_context(
client_name="nimbus",
enr=beacon_node_enr,
ip_addr=service.ip_address,
ip_addr=service.name,
http_port=beacon_http_port.number,
beacon_http_url=beacon_http_url,
cl_nodes_metrics_info=nodes_metrics_info,
Expand Down
10 changes: 4 additions & 6 deletions src/cl/prysm/prysm_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,8 @@ def get_cl_context(
):
beacon_http_port = service.ports[constants.HTTP_PORT_ID]

beacon_http_url = "http://{0}:{1}".format(service.ip_address, BEACON_HTTP_PORT_NUM)
beacon_grpc_url = "{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
beacon_http_url = "http://{0}:{1}".format(service.name, BEACON_HTTP_PORT_NUM)
beacon_grpc_url = "{0}:{1}".format(service.name, RPC_PORT_NUM)

# TODO(old) add validator availability using the validator API: https://ethereum.github.io/beacon-APIs/?urls.primaryName=v1#/ValidatorRequiredApi | from eth2-merge-kurtosis-module
beacon_node_identity_recipe = GetHttpRequestRecipe(
Expand All @@ -385,9 +385,7 @@ def get_cl_context(
beacon_peer_id = response["extract.peer_id"]

beacon_metrics_port = service.ports[constants.METRICS_PORT_ID]
beacon_metrics_url = "{0}:{1}".format(
service.ip_address, beacon_metrics_port.number
)
beacon_metrics_url = "{0}:{1}".format(service.name, beacon_metrics_port.number)
beacon_node_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, beacon_metrics_url
)
Expand All @@ -396,7 +394,7 @@ def get_cl_context(
return cl_context.new_cl_context(
client_name="prysm",
enr=beacon_node_enr,
ip_addr=service.ip_address,
ip_addr=service.name,
http_port=beacon_http_port.number,
beacon_http_url=beacon_http_url,
cl_nodes_metrics_info=nodes_metrics_info,
Expand Down
10 changes: 3 additions & 7 deletions src/cl/teku/teku_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,10 @@ def get_cl_context(
node_selectors,
):
beacon_http_port = service.ports[constants.HTTP_PORT_ID]
beacon_http_url = "http://{0}:{1}".format(
service.ip_address, beacon_http_port.number
)
beacon_http_url = "http://{0}:{1}".format(service.name, beacon_http_port.number)

beacon_metrics_port = service.ports[constants.METRICS_PORT_ID]
beacon_metrics_url = "{0}:{1}".format(
service.ip_address, beacon_metrics_port.number
)
beacon_metrics_url = "{0}:{1}".format(service.name, beacon_metrics_port.number)

beacon_node_identity_recipe = GetHttpRequestRecipe(
endpoint="/eth/v1/node/identity",
Expand All @@ -429,7 +425,7 @@ def get_cl_context(
return cl_context.new_cl_context(
client_name="teku",
enr=beacon_node_enr,
ip_addr=service.ip_address,
ip_addr=service.name,
http_port=beacon_http_port.number,
beacon_http_url=beacon_http_url,
cl_nodes_metrics_info=nodes_metrics_info,
Expand Down
8 changes: 4 additions & 4 deletions src/el/besu/besu_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -280,17 +280,17 @@ def get_el_context(
plan, service_name, constants.RPC_PORT_ID
)

metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metrics_url = "{0}:{1}".format(service.name, METRICS_PORT_NUM)
besu_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, metrics_url
)
http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
http_url = "http://{0}:{1}".format(service.name, RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.name, WS_PORT_NUM)

return el_context.new_el_context(
client_name="besu",
enode=enode,
ip_addr=service.ip_address,
ip_addr=service.name,
rpc_port_num=RPC_PORT_NUM,
ws_port_num=WS_PORT_NUM,
engine_rpc_port_num=ENGINE_HTTP_RPC_PORT_NUM,
Expand Down
8 changes: 4 additions & 4 deletions src/el/erigon/erigon_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -286,18 +286,18 @@ def get_el_context(
plan, service_name, constants.WS_RPC_PORT_ID
)

metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metrics_url = "{0}:{1}".format(service.name, METRICS_PORT_NUM)
erigon_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, metrics_url
)

http_url = "http://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
http_url = "http://{0}:{1}".format(service.name, WS_RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.name, WS_RPC_PORT_NUM)

return el_context.new_el_context(
client_name="erigon",
enode=enode,
ip_addr=service.ip_address,
ip_addr=service.name,
rpc_port_num=WS_RPC_PORT_NUM,
ws_port_num=WS_RPC_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
Expand Down
8 changes: 4 additions & 4 deletions src/el/ethereumjs/ethereumjs_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -277,16 +277,16 @@ def get_el_context(
)

# TODO: Passing empty string for metrics_url for now https://github.com/ethpandaops/ethereum-package/issues/127
# metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
# metrics_url = "http://{0}:{1}".format(service.name, METRICS_PORT_NUM)
ethjs_metrics_info = None

http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
http_url = "http://{0}:{1}".format(service.name, RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.name, WS_PORT_NUM)

return el_context.new_el_context(
client_name="ethereumjs",
enode=enode,
ip_addr=service.ip_address,
ip_addr=service.name,
rpc_port_num=RPC_PORT_NUM,
ws_port_num=WS_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
Expand Down
8 changes: 4 additions & 4 deletions src/el/ethrex/ethrex_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -264,18 +264,18 @@ def get_el_context(
plan, service_name, constants.RPC_PORT_ID
)

metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metrics_url = "{0}:{1}".format(service.name, METRICS_PORT_NUM)
ethrex_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, metrics_url
)

http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
# ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
http_url = "http://{0}:{1}".format(service.name, RPC_PORT_NUM)
# ws_url = "ws://{0}:{1}".format(service.name, WS_PORT_NUM)

return el_context.new_el_context(
client_name="ethrex",
enode=enode,
ip_addr=service.ip_address,
ip_addr=service.name,
rpc_port_num=RPC_PORT_NUM,
ws_port_num=WS_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
Expand Down
8 changes: 4 additions & 4 deletions src/el/geth/geth_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -332,18 +332,18 @@ def get_el_context(
plan, service_name, constants.RPC_PORT_ID
)

metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metrics_url = "{0}:{1}".format(service.name, METRICS_PORT_NUM)
geth_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, metrics_url
)

http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
http_url = "http://{0}:{1}".format(service.name, RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.name, WS_PORT_NUM)

return el_context.new_el_context(
client_name="geth",
enode=enode,
ip_addr=service.ip_address,
ip_addr=service.name,
rpc_port_num=RPC_PORT_NUM,
ws_port_num=WS_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
Expand Down
8 changes: 4 additions & 4 deletions src/el/nethermind/nethermind_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -266,18 +266,18 @@ def get_el_context(
plan, service_name, constants.RPC_PORT_ID
)

metrics_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metrics_url = "{0}:{1}".format(service.name, METRICS_PORT_NUM)
nethermind_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, metrics_url
)

http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
http_url = "http://{0}:{1}".format(service.name, RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.name, WS_PORT_NUM)

return el_context.new_el_context(
client_name="nethermind",
enode=enode,
ip_addr=service.ip_address,
ip_addr=service.name,
rpc_port_num=RPC_PORT_NUM,
ws_port_num=WS_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
Expand Down
8 changes: 4 additions & 4 deletions src/el/nimbus-eth1/nimbus_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -258,18 +258,18 @@ def get_el_context(
plan, service_name, constants.WS_RPC_PORT_ID
)

metric_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metric_url = "{0}:{1}".format(service.name, METRICS_PORT_NUM)
nimbus_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, metric_url
)

http_url = "http://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM)
http_url = "http://{0}:{1}".format(service.name, WS_RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.name, WS_RPC_PORT_NUM)

return el_context.new_el_context(
client_name="nimbus",
enode=enode,
ip_addr=service.ip_address,
ip_addr=service.name,
rpc_port_num=WS_RPC_PORT_NUM,
ws_port_num=WS_RPC_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
Expand Down
8 changes: 4 additions & 4 deletions src/el/reth/reth_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -329,18 +329,18 @@ def get_el_context(
plan, service_name, constants.RPC_PORT_ID
)

metric_url = "{0}:{1}".format(service.ip_address, METRICS_PORT_NUM)
metric_url = "{0}:{1}".format(service.name, METRICS_PORT_NUM)
reth_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, metric_url
)

http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.ip_address, WS_PORT_NUM)
http_url = "http://{0}:{1}".format(service.name, RPC_PORT_NUM)
ws_url = "ws://{0}:{1}".format(service.name, WS_PORT_NUM)

return el_context.new_el_context(
client_name="reth-builder" if launcher.builder_type else "reth",
enode=enode,
ip_addr=service.ip_address,
ip_addr=service.name,
rpc_port_num=RPC_PORT_NUM,
ws_port_num=WS_PORT_NUM,
engine_rpc_port_num=ENGINE_RPC_PORT_NUM,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def launch(

return ethereum_metrics_exporter_context.new_ethereum_metrics_exporter_context(
pair_name,
exporter_service.ip_address,
exporter_service.name,
METRICS_PORT_NUMBER,
cl_context.client_name,
el_context.client_name,
Expand Down
2 changes: 1 addition & 1 deletion src/mev/commit-boost/mev_boost/mev_boost_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def launch(
mev_boost_service = plan.add_service(service_name, config)

return mev_boost_context_module.new_mev_boost_context(
mev_boost_service.ip_address, constants.MEV_BOOST_PORT
mev_boost_service.name, constants.MEV_BOOST_PORT
)


Expand Down
Loading