Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add http url to el context #656

Merged
merged 2 commits into from
Jun 3, 2024
Merged

feat: add http url to el context #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af1ee7d
feat: add http url to el context
barnabasbusa Jun 3, 2024
3fa3704
Merge branch 'main' into bbusa/el-context-http
barnabasbusa Jun 3, 2024
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: 2 additions & 0 deletions src/el/besu/besu_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -155,6 +156,7 @@ def launch(
RPC_PORT_NUM,
WS_PORT_NUM,
ENGINE_HTTP_RPC_PORT_NUM,
http_url,
service_name,
[besu_metrics_info],
)
Expand Down
2 changes: 2 additions & 0 deletions src/el/el_context.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
):
Expand All @@ -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,
)
3 changes: 3 additions & 0 deletions src/el/erigon/erigon_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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],
)
Expand Down
3 changes: 3 additions & 0 deletions src/el/ethereumjs/ethereumjs_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -155,6 +157,7 @@ def launch(
RPC_PORT_NUM,
WS_PORT_NUM,
ENGINE_RPC_PORT_NUM,
http_url,
service_name,
[ethjs_metrics_info],
)
Expand Down
3 changes: 3 additions & 0 deletions src/el/geth/geth_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -171,6 +173,7 @@ def launch(
RPC_PORT_NUM,
WS_PORT_NUM,
ENGINE_RPC_PORT_NUM,
http_url,
service_name,
[geth_metrics_info],
)
Expand Down
3 changes: 3 additions & 0 deletions src/el/nethermind/nethermind_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -153,6 +155,7 @@ def launch(
RPC_PORT_NUM,
WS_PORT_NUM,
ENGINE_RPC_PORT_NUM,
http_url,
service_name,
[nethermind_metrics_info],
)
Expand Down
3 changes: 3 additions & 0 deletions src/el/nimbus-eth1/nimbus_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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],
)
Expand Down
3 changes: 3 additions & 0 deletions src/el/reth/reth_launcher.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -157,6 +159,7 @@ def launch(
RPC_PORT_NUM,
WS_PORT_NUM,
ENGINE_RPC_PORT_NUM,
http_url,
service_name,
[reth_metrics_info],
)
Expand Down