From 60ffb27f85b3acd6423f78844609a1f919703dab Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Fri, 29 Mar 2024 09:47:38 +0100 Subject: [PATCH 1/2] fix: beaconchain explorer --- src/full_beaconchain/full_beaconchain_launcher.star | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/full_beaconchain/full_beaconchain_launcher.star b/src/full_beaconchain/full_beaconchain_launcher.star index 1da4c260a..c2c8761bb 100644 --- a/src/full_beaconchain/full_beaconchain_launcher.star +++ b/src/full_beaconchain/full_beaconchain_launcher.star @@ -357,8 +357,8 @@ def new_config_template_data( cl_node_info, el_uri, lbt_host, lbt_port, db_host, db_port, redis_url, frontend_port ): return { - "CLNodeHost": cl_node_info.ip_addr, - "CLNodePort": cl_node_info.http_port_num, + "CLNodeHost": cl_node_info.beacon_http_url[7:], + "CLNodePort": cl_node_info.beacon_http_url.split(":")[2], "ELNodeEndpoint": el_uri, "LBTHost": lbt_host, "LBTPort": lbt_port, @@ -369,5 +369,5 @@ def new_config_template_data( } -def new_cl_client_info(ip_addr, port_num, service_name): - return {"IPAddr": ip_addr, "PortNum": port_num, "Name": service_name} +def new_cl_client_info(beacon_http_url, service_name): + return {"Beacon_HTTP_URL": beacon_http_url, "Name": service_name} From fe677d9441818b850485049eb3df1dd3ebeb1b8d Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Fri, 29 Mar 2024 10:54:03 +0100 Subject: [PATCH 2/2] fix variable --- .../full_beaconchain_launcher.star | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/full_beaconchain/full_beaconchain_launcher.star b/src/full_beaconchain/full_beaconchain_launcher.star index c2c8761bb..3de037a2d 100644 --- a/src/full_beaconchain/full_beaconchain_launcher.star +++ b/src/full_beaconchain/full_beaconchain_launcher.star @@ -147,8 +147,12 @@ def launch_full_beacon( ) redis_url = "{}:{}".format(redis_output.hostname, redis_output.port_number) + cl_url = cl_contexts[0].beacon_http_url[7:] # Remove the "http://" + cl_port = cl_contexts[0].beacon_http_url.split(":")[2] # Get the port number + template_data = new_config_template_data( - cl_contexts[0], + cl_url, + cl_port, el_uri, little_bigtable.ip_address, LITTLE_BIGTABLE_PORT_NUMBER, @@ -354,11 +358,19 @@ def launch_full_beacon( def new_config_template_data( - cl_node_info, el_uri, lbt_host, lbt_port, db_host, db_port, redis_url, frontend_port + cl_url, + cl_port, + el_uri, + lbt_host, + lbt_port, + db_host, + db_port, + redis_url, + frontend_port, ): return { - "CLNodeHost": cl_node_info.beacon_http_url[7:], - "CLNodePort": cl_node_info.beacon_http_url.split(":")[2], + "CLNodeHost": cl_url, + "CLNodePort": cl_port, "ELNodeEndpoint": el_uri, "LBTHost": lbt_host, "LBTPort": lbt_port, @@ -367,7 +379,3 @@ def new_config_template_data( "RedisEndpoint": redis_url, "FrontendPort": frontend_port, } - - -def new_cl_client_info(beacon_http_url, service_name): - return {"Beacon_HTTP_URL": beacon_http_url, "Name": service_name}