From af1ee7d435924961a9ac4d344aeb3c31b8d4b0f2 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Mon, 3 Jun 2024 11:46:52 +0200 Subject: [PATCH] feat: add http url to el context --- src/el/besu/besu_launcher.star | 2 ++ src/el/el_context.star | 2 ++ src/el/erigon/erigon_launcher.star | 3 +++ src/el/ethereumjs/ethereumjs_launcher.star | 3 +++ src/el/geth/geth_launcher.star | 3 +++ src/el/nethermind/nethermind_launcher.star | 3 +++ src/el/nimbus-eth1/nimbus_launcher.star | 3 +++ src/el/reth/reth_launcher.star | 3 +++ 8 files changed, 22 insertions(+) diff --git a/src/el/besu/besu_launcher.star b/src/el/besu/besu_launcher.star index a76c6b174..ff0cfca4e 100644 --- a/src/el/besu/besu_launcher.star +++ b/src/el/besu/besu_launcher.star @@ -146,6 +146,7 @@ def launch( 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) return el_context.new_el_context( "besu", @@ -155,6 +156,7 @@ def launch( RPC_PORT_NUM, WS_PORT_NUM, ENGINE_HTTP_RPC_PORT_NUM, + http_url, service_name, [besu_metrics_info], ) diff --git a/src/el/el_context.star b/src/el/el_context.star index a2dd8d77e..1f9032545 100644 --- a/src/el/el_context.star +++ b/src/el/el_context.star @@ -6,6 +6,7 @@ def new_el_context( rpc_port_num, ws_port_num, engine_rpc_port_num, + rpc_http_url, service_name="", el_metrics_info=None, ): @@ -18,5 +19,6 @@ def new_el_context( rpc_port_num=rpc_port_num, ws_port_num=ws_port_num, engine_rpc_port_num=engine_rpc_port_num, + rpc_http_url=rpc_http_url, el_metrics_info=el_metrics_info, ) diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star index 9c96b7744..ff21a44fd 100644 --- a/src/el/erigon/erigon_launcher.star +++ b/src/el/erigon/erigon_launcher.star @@ -147,6 +147,8 @@ def launch( service_name, METRICS_PATH, metrics_url ) + http_url = "http://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM) + return el_context.new_el_context( "erigon", enr, @@ -155,6 +157,7 @@ def launch( WS_RPC_PORT_NUM, WS_RPC_PORT_NUM, ENGINE_RPC_PORT_NUM, + http_url, service_name, [erigon_metrics_info], ) diff --git a/src/el/ethereumjs/ethereumjs_launcher.star b/src/el/ethereumjs/ethereumjs_launcher.star index 187e422e9..b8e0ef0cd 100644 --- a/src/el/ethereumjs/ethereumjs_launcher.star +++ b/src/el/ethereumjs/ethereumjs_launcher.star @@ -147,6 +147,8 @@ def launch( # metrics_url = "http://{0}:{1}".format(service.ip_address, METRICS_PORT_NUM) ethjs_metrics_info = None + http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM) + return el_context.new_el_context( "ethereumjs", "", # ethereumjs has no enr @@ -155,6 +157,7 @@ def launch( RPC_PORT_NUM, WS_PORT_NUM, ENGINE_RPC_PORT_NUM, + http_url, service_name, [ethjs_metrics_info], ) diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star index cff68c758..acb1a9373 100644 --- a/src/el/geth/geth_launcher.star +++ b/src/el/geth/geth_launcher.star @@ -163,6 +163,8 @@ def launch( service_name, METRICS_PATH, metrics_url ) + http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM) + return el_context.new_el_context( "geth", enr, @@ -171,6 +173,7 @@ def launch( RPC_PORT_NUM, WS_PORT_NUM, ENGINE_RPC_PORT_NUM, + http_url, service_name, [geth_metrics_info], ) diff --git a/src/el/nethermind/nethermind_launcher.star b/src/el/nethermind/nethermind_launcher.star index 4e8ae8dc9..ba2c8d2dc 100644 --- a/src/el/nethermind/nethermind_launcher.star +++ b/src/el/nethermind/nethermind_launcher.star @@ -144,6 +144,8 @@ def launch( service_name, METRICS_PATH, metrics_url ) + http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM) + return el_context.new_el_context( "nethermind", "", # nethermind has no ENR in the eth2-merge-kurtosis-module either @@ -153,6 +155,7 @@ def launch( RPC_PORT_NUM, WS_PORT_NUM, ENGINE_RPC_PORT_NUM, + http_url, service_name, [nethermind_metrics_info], ) diff --git a/src/el/nimbus-eth1/nimbus_launcher.star b/src/el/nimbus-eth1/nimbus_launcher.star index 30fdd0966..cfc2cc7b1 100644 --- a/src/el/nimbus-eth1/nimbus_launcher.star +++ b/src/el/nimbus-eth1/nimbus_launcher.star @@ -146,6 +146,8 @@ def launch( service_name, METRICS_PATH, metric_url ) + http_url = "http://{0}:{1}".format(service.ip_address, WS_RPC_PORT_NUM) + return el_context.new_el_context( "nimbus", "", # nimbus has no enr @@ -154,6 +156,7 @@ def launch( WS_RPC_PORT_NUM, WS_RPC_PORT_NUM, ENGINE_RPC_PORT_NUM, + http_url, service_name, [nimbus_metrics_info], ) diff --git a/src/el/reth/reth_launcher.star b/src/el/reth/reth_launcher.star index 2158d5eb8..2a24a46d3 100644 --- a/src/el/reth/reth_launcher.star +++ b/src/el/reth/reth_launcher.star @@ -149,6 +149,8 @@ def launch( service_name, METRICS_PATH, metric_url ) + http_url = "http://{0}:{1}".format(service.ip_address, RPC_PORT_NUM) + return el_context.new_el_context( "reth", "", # reth has no enr @@ -157,6 +159,7 @@ def launch( RPC_PORT_NUM, WS_PORT_NUM, ENGINE_RPC_PORT_NUM, + http_url, service_name, [reth_metrics_info], )