Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ethereum-package
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
ethereum-package
Commits
23be10e9
Commit
23be10e9
authored
Nov 22, 2022
by
Gyanendra Mishra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix prysm and erigon
parent
3e96d959
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
15 deletions
+13
-15
prysm_launcher.star
src/participant_network/cl/prysm/prysm_launcher.star
+2
-4
erigon_launcher.star
src/participant_network/el/erigon/erigon_launcher.star
+11
-11
No files found.
src/participant_network/cl/prysm/prysm_launcher.star
View file @
23be10e9
...
@@ -48,7 +48,7 @@ BEACON_NODE_USED_PORTS = {
...
@@ -48,7 +48,7 @@ BEACON_NODE_USED_PORTS = {
}
}
VALIDATOR_NODE_USED_PORTS = {
VALIDATOR_NODE_USED_PORTS = {
VALIDATOR_MONITORING_PORT_ID: shared_utils.new_port_spec(VALIDATOR_MONITORING_PORT_NUM, TCP_PROTOCOL),
VALIDATOR_MONITORING_PORT_ID: shared_utils.new_port_spec(VALIDATOR_MONITORING_PORT_NUM,
shared_utils.
TCP_PROTOCOL),
}
}
PRYSM_LOG_LEVELS = {
PRYSM_LOG_LEVELS = {
...
@@ -146,7 +146,7 @@ def launch(
...
@@ -146,7 +146,7 @@ def launch(
nodes_metrics_info = [beacon_node_metrics_info, validator_node_metrics_info]
nodes_metrics_info = [beacon_node_metrics_info, validator_node_metrics_info]
re
sult =
new_cl_client_context(
re
turn cl_client_context.
new_cl_client_context(
"prysm",
"prysm",
beacon_node_enr,
beacon_node_enr,
beacon_service.ip_address,
beacon_service.ip_address,
...
@@ -155,8 +155,6 @@ def launch(
...
@@ -155,8 +155,6 @@ def launch(
beacon_node_service_id
beacon_node_service_id
)
)
return result
def get_beacon_config(
def get_beacon_config(
genesis_data,
genesis_data,
...
...
src/participant_network/el/erigon/erigon_launcher.star
View file @
23be10e9
load("github.com/kurtosis-tech/eth2-module/src/shared_utils/shared_utils.star", "new_port_spec", "path_join", "TCP_PROTOCOL", "UDP_PROTOCOL
")
shared_utils = import_module("github.com/kurtosis-tech/eth2-module/src/shared_utils/shared_utils.star
")
load("github.com/kurtosis-tech/eth2-module/src/module_io/parse_input.star", "get_client_log_level_or_default
")
parse_input = import_module("github.com/kurtosis-tech/eth2-module/src/module_io/parse_input.star
")
load("github.com/kurtosis-tech/eth2-module/src/participant_network/el/el_client_context.star", "new_el_client_context
")
el_client_context = import_module("github.com/kurtosis-tech/eth2-module/src/participant_network/el/el_client_context.star
")
module_io = import_types("github.com/kurtosis-tech/eth2-module/types.proto")
module_io = import_types("github.com/kurtosis-tech/eth2-module/types.proto")
...
@@ -25,10 +25,10 @@ ENGINE_RPC_PORT_ID = "engine-rpc"
...
@@ -25,10 +25,10 @@ ENGINE_RPC_PORT_ID = "engine-rpc"
PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER"
PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER"
USED_PORTS = {
USED_PORTS = {
RPC_PORT_ID:
new_port_spec(RPC_PORT_NUM,
TCP_PROTOCOL),
RPC_PORT_ID:
shared_utils.new_port_spec(RPC_PORT_NUM, shared_utils.
TCP_PROTOCOL),
WS_PORT_ID:
new_port_spec(WS_PORT_NUM,
TCP_PROTOCOL),
WS_PORT_ID:
shared_utils.new_port_spec(WS_PORT_NUM, shared_utils.
TCP_PROTOCOL),
TCP_DISCOVERY_PORT_ID:
new_port_spec(DISCOVERY_PORT_NUM,
TCP_PROTOCOL),
TCP_DISCOVERY_PORT_ID:
shared_utils.new_port_spec(DISCOVERY_PORT_NUM, shared_utils.
TCP_PROTOCOL),
UDP_DISCOVERY_PORT_ID:
new_port_spec(DISCOVERY_PORT_NUM,
UDP_PROTOCOL),
UDP_DISCOVERY_PORT_ID:
shared_utils.new_port_spec(DISCOVERY_PORT_NUM, shared_utils.
UDP_PROTOCOL),
}
}
ENTRYPOINT_ARGS = ["sh", "-c"]
ENTRYPOINT_ARGS = ["sh", "-c"]
...
@@ -53,7 +53,7 @@ def launch(
...
@@ -53,7 +53,7 @@ def launch(
existing_el_clients,
existing_el_clients,
extra_params):
extra_params):
log_level = get_client_log_level_or_default(participant_log_level, global_log_level, ERIGON_LOG_LEVELS)
log_level =
parse_input.
get_client_log_level_or_default(participant_log_level, global_log_level, ERIGON_LOG_LEVELS)
config = get_config(launcher.network_id, launcher.el_genesis_data,
config = get_config(launcher.network_id, launcher.el_genesis_data,
image, existing_el_clients, log_level, extra_params)
image, existing_el_clients, log_level, extra_params)
...
@@ -66,7 +66,7 @@ def launch(
...
@@ -66,7 +66,7 @@ def launch(
define_fact(service_id = service_id, fact_name = ENODE_FACT_NAME, fact_recipe = struct(method= "POST", endpoint = "", field_extractor = ".result.enode", body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}', content_type = "application/json", port_id = RPC_PORT_ID))
define_fact(service_id = service_id, fact_name = ENODE_FACT_NAME, fact_recipe = struct(method= "POST", endpoint = "", field_extractor = ".result.enode", body = '{"method":"admin_nodeInfo","params":[],"id":1,"jsonrpc":"2.0"}', content_type = "application/json", port_id = RPC_PORT_ID))
enode = wait(service_id = service_id, fact_name = ENODE_FACT_NAME)
enode = wait(service_id = service_id, fact_name = ENODE_FACT_NAME)
return new_el_client_context(
return
el_client_context.
new_el_client_context(
"erigon",
"erigon",
enr,
enr,
enode,
enode,
...
@@ -80,8 +80,8 @@ def launch(
...
@@ -80,8 +80,8 @@ def launch(
def get_config(network_id, genesis_data, image, existing_el_clients, verbosity_level, extra_params):
def get_config(network_id, genesis_data, image, existing_el_clients, verbosity_level, extra_params):
network_id = network_id
network_id = network_id
genesis_json_filepath_on_client = path_join(GENESIS_DATA_MOUNT_DIRPATH, genesis_data.erigon_genesis_json_relative_filepath)
genesis_json_filepath_on_client =
shared_utils.
path_join(GENESIS_DATA_MOUNT_DIRPATH, genesis_data.erigon_genesis_json_relative_filepath)
jwt_secret_json_filepath_on_client = path_join(GENESIS_DATA_MOUNT_DIRPATH, genesis_data.jwt_secret_relative_filepath)
jwt_secret_json_filepath_on_client =
shared_utils.
path_join(GENESIS_DATA_MOUNT_DIRPATH, genesis_data.jwt_secret_relative_filepath)
init_datadir_cmd_str = "erigon init --datadir={0} {1}".format(
init_datadir_cmd_str = "erigon init --datadir={0} {1}".format(
EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
EXECUTION_DATA_DIRPATH_ON_CLIENT_CONTAINER,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment