diff --git a/main.star b/main.star index facda439d..0d29bb7d8 100644 --- a/main.star +++ b/main.star @@ -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, ) diff --git a/src/blobber/blobber_launcher.star b/src/blobber/blobber_launcher.star index 9817dd116..4a02b80e0 100644 --- a/src/blobber/blobber_launcher.star +++ b/src/blobber/blobber_launcher.star @@ -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, ) diff --git a/src/blockscout/blockscout_launcher.star b/src/blockscout/blockscout_launcher.star index 8a8e69841..4a9b53eed 100644 --- a/src/blockscout/blockscout_launcher.star +++ b/src/blockscout/blockscout_launcher.star @@ -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): diff --git a/src/cl/grandine/grandine_launcher.star b/src/cl/grandine/grandine_launcher.star index 9c3cca6cf..be2414bfa 100644 --- a/src/cl/grandine/grandine_launcher.star +++ b/src/cl/grandine/grandine_launcher.star @@ -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", @@ -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, diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star index 06a8d0f99..5ccf0f59a 100644 --- a/src/cl/lighthouse/lighthouse_launcher.star +++ b/src/cl/lighthouse/lighthouse_launcher.star @@ -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( @@ -377,9 +375,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 ) @@ -387,7 +383,7 @@ def get_cl_context( 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, diff --git a/src/cl/lodestar/lodestar_launcher.star b/src/cl/lodestar/lodestar_launcher.star index eecc509ed..f2d421803 100644 --- a/src/cl/lodestar/lodestar_launcher.star +++ b/src/cl/lodestar/lodestar_launcher.star @@ -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 @@ -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 @@ -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, diff --git a/src/cl/nimbus/nimbus_launcher.star b/src/cl/nimbus/nimbus_launcher.star index 8196c69c9..1547f16d7 100644 --- a/src/cl/nimbus/nimbus_launcher.star +++ b/src/cl/nimbus/nimbus_launcher.star @@ -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", @@ -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, diff --git a/src/cl/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star index 9b52e77da..c3f929e3c 100644 --- a/src/cl/prysm/prysm_launcher.star +++ b/src/cl/prysm/prysm_launcher.star @@ -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( @@ -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 ) @@ -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, diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index 813e8c517..874322382 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -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", @@ -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, diff --git a/src/el/besu/besu_launcher.star b/src/el/besu/besu_launcher.star index accb8d879..155c9177b 100644 --- a/src/el/besu/besu_launcher.star +++ b/src/el/besu/besu_launcher.star @@ -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, diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star index d0de51485..9aac7daa9 100644 --- a/src/el/erigon/erigon_launcher.star +++ b/src/el/erigon/erigon_launcher.star @@ -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, diff --git a/src/el/ethereumjs/ethereumjs_launcher.star b/src/el/ethereumjs/ethereumjs_launcher.star index fc1ee76ad..754bd85c3 100644 --- a/src/el/ethereumjs/ethereumjs_launcher.star +++ b/src/el/ethereumjs/ethereumjs_launcher.star @@ -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, diff --git a/src/el/ethrex/ethrex_launcher.star b/src/el/ethrex/ethrex_launcher.star index 16e5495df..dd9c03abb 100644 --- a/src/el/ethrex/ethrex_launcher.star +++ b/src/el/ethrex/ethrex_launcher.star @@ -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, diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star index aa37bd4cf..0fa2b9490 100644 --- a/src/el/geth/geth_launcher.star +++ b/src/el/geth/geth_launcher.star @@ -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, diff --git a/src/el/nethermind/nethermind_launcher.star b/src/el/nethermind/nethermind_launcher.star index 068b08e53..d79436652 100644 --- a/src/el/nethermind/nethermind_launcher.star +++ b/src/el/nethermind/nethermind_launcher.star @@ -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, diff --git a/src/el/nimbus-eth1/nimbus_launcher.star b/src/el/nimbus-eth1/nimbus_launcher.star index 9b3b687c7..aedbe1673 100644 --- a/src/el/nimbus-eth1/nimbus_launcher.star +++ b/src/el/nimbus-eth1/nimbus_launcher.star @@ -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, diff --git a/src/el/reth/reth_launcher.star b/src/el/reth/reth_launcher.star index a6657cb53..790df9e36 100644 --- a/src/el/reth/reth_launcher.star +++ b/src/el/reth/reth_launcher.star @@ -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, diff --git a/src/ethereum_metrics_exporter/ethereum_metrics_exporter_launcher.star b/src/ethereum_metrics_exporter/ethereum_metrics_exporter_launcher.star index 011665e45..67af58770 100644 --- a/src/ethereum_metrics_exporter/ethereum_metrics_exporter_launcher.star +++ b/src/ethereum_metrics_exporter/ethereum_metrics_exporter_launcher.star @@ -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, diff --git a/src/mev/commit-boost/mev_boost/mev_boost_launcher.star b/src/mev/commit-boost/mev_boost/mev_boost_launcher.star index 41123917d..b2a4b429d 100644 --- a/src/mev/commit-boost/mev_boost/mev_boost_launcher.star +++ b/src/mev/commit-boost/mev_boost/mev_boost_launcher.star @@ -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 ) diff --git a/src/mev/flashbots/mev_boost/mev_boost_launcher.star b/src/mev/flashbots/mev_boost/mev_boost_launcher.star index 013cdd896..2d38f2dcc 100644 --- a/src/mev/flashbots/mev_boost/mev_boost_launcher.star +++ b/src/mev/flashbots/mev_boost/mev_boost_launcher.star @@ -65,7 +65,7 @@ def launch( 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 ), ) diff --git a/src/mev/mev-rs/mev_boost/mev_boost_launcher.star b/src/mev/mev-rs/mev_boost/mev_boost_launcher.star index b1ff67412..0b7787a5a 100644 --- a/src/mev/mev-rs/mev_boost/mev_boost_launcher.star +++ b/src/mev/mev-rs/mev_boost/mev_boost_launcher.star @@ -92,7 +92,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 ) diff --git a/src/mev/mev-rs/mev_relay/mev_relay_launcher.star b/src/mev/mev-rs/mev_relay/mev_relay_launcher.star index 492e20553..085d2ce0c 100644 --- a/src/mev/mev-rs/mev_relay/mev_relay_launcher.star +++ b/src/mev/mev-rs/mev_relay/mev_relay_launcher.star @@ -105,10 +105,10 @@ def launch_mev_relay( return ( "http://{0}@{1}:{2}".format( constants.DEFAULT_MEV_PUBKEY, - mev_relay_service.ip_address, + mev_relay_service.name, MEV_RELAY_ENDPOINT_PORT, ), - mev_relay_service.ip_address, + mev_relay_service.name, MEV_RELAY_ENDPOINT_PORT, ) diff --git a/src/remote_signer/remote_signer_launcher.star b/src/remote_signer/remote_signer_launcher.star index f55401853..897f9733f 100644 --- a/src/remote_signer/remote_signer_launcher.star +++ b/src/remote_signer/remote_signer_launcher.star @@ -70,14 +70,14 @@ def launch( remote_signer_http_port = remote_signer_service.ports[REMOTE_SIGNER_HTTP_PORT_ID] remote_signer_http_url = "http://{0}:{1}".format( - remote_signer_service.ip_address, remote_signer_http_port.number + remote_signer_service.name, remote_signer_http_port.number ) remote_signer_metrics_port = remote_signer_service.ports[ REMOTE_SIGNER_METRICS_PORT_ID ] validator_metrics_url = "{0}:{1}".format( - remote_signer_service.ip_address, remote_signer_metrics_port.number + remote_signer_service.name, remote_signer_metrics_port.number ) remote_signer_node_metrics_info = node_metrics.new_node_metrics_info( service_name, METRICS_PATH, validator_metrics_url diff --git a/src/snooper/snooper_beacon_launcher.star b/src/snooper/snooper_beacon_launcher.star index 20d8d33dd..e92b8efc7 100644 --- a/src/snooper/snooper_beacon_launcher.star +++ b/src/snooper/snooper_beacon_launcher.star @@ -54,7 +54,7 @@ def launch( snooper_service = plan.add_service(snooper_service_name, snooper_config) snooper_http_port = snooper_service.ports[SNOOPER_BEACON_RPC_PORT_ID] return snooper_beacon_context.new_snooper_beacon_client_context( - snooper_service.ip_address, SNOOPER_BEACON_RPC_PORT_NUM + snooper_service.name, SNOOPER_BEACON_RPC_PORT_NUM ) diff --git a/src/snooper/snooper_el_launcher.star b/src/snooper/snooper_el_launcher.star index 4cf9cae8f..4bd2d8f87 100644 --- a/src/snooper/snooper_el_launcher.star +++ b/src/snooper/snooper_el_launcher.star @@ -68,7 +68,7 @@ def launch_snooper( snooper_service = plan.add_service(snooper_service_name, snooper_config) return snooper_el_engine_context.new_snooper_el_client_context( - snooper_service.ip_address, + snooper_service.name, SNOOPER_ENGINE_RPC_PORT_NUM, SNOOPER_EL_RPC_PORT_NUM, ) diff --git a/src/tempo/tempo_launcher.star b/src/tempo/tempo_launcher.star index 99eae8c3f..f3919f0d3 100644 --- a/src/tempo/tempo_launcher.star +++ b/src/tempo/tempo_launcher.star @@ -76,13 +76,13 @@ def launch_tempo( # Return connection info for other services return struct( service_name=SERVICE_NAME, - ip_addr=service.ip_address, + ip_addr=service.name, http_port_num=HTTP_PORT_NUMBER, grpc_port_num=GRPC_PORT_NUMBER, otlp_grpc_port_num=OTLP_GRPC_PORT_NUMBER, otlp_http_port_num=OTLP_HTTP_PORT_NUMBER, - http_url="http://{}:{}".format(service.ip_address, HTTP_PORT_NUMBER), - grpc_url="{}:{}".format(service.ip_address, GRPC_PORT_NUMBER), + http_url="http://{}:{}".format(service.name, HTTP_PORT_NUMBER), + grpc_url="{}:{}".format(service.name, GRPC_PORT_NUMBER), otlp_grpc_url="{}:{}".format(SERVICE_NAME, OTLP_GRPC_PORT_NUMBER), otlp_http_url="http://{}:{}".format(SERVICE_NAME, OTLP_HTTP_PORT_NUMBER), ) diff --git a/src/vc/vc_launcher.star b/src/vc/vc_launcher.star index 04223b2b9..e40919e06 100644 --- a/src/vc/vc_launcher.star +++ b/src/vc/vc_launcher.star @@ -220,7 +220,7 @@ def get_vc_context( ): validator_metrics_port = service.ports[constants.METRICS_PORT_ID] validator_metrics_url = "{0}:{1}".format( - service.ip_address, validator_metrics_port.number + service.name, validator_metrics_port.number ) validator_node_metrics_info = node_metrics.new_node_metrics_info( service_name, vc_shared.METRICS_PATH, validator_metrics_url diff --git a/src/xatu_sentry/xatu_sentry_launcher.star b/src/xatu_sentry/xatu_sentry_launcher.star index 509da628e..6c2b75207 100644 --- a/src/xatu_sentry/xatu_sentry_launcher.star +++ b/src/xatu_sentry/xatu_sentry_launcher.star @@ -88,7 +88,7 @@ def launch( ) return xatu_sentry_context.new_xatu_sentry_context( - xatu_sentry_service.ip_address, + xatu_sentry_service.name, METRICS_PORT_NUMBER, pair_name, )