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
466f0a84
Commit
466f0a84
authored
Nov 11, 2022
by
Gyanendra Mishra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
marked more comments as old
parent
5c9ee67e
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
12 deletions
+9
-12
nimbus_launcher.star
src/participant_network/cl/nimbus/nimbus_launcher.star
+1
-1
erigon_launcher.star
src/participant_network/el/erigon/erigon_launcher.star
+2
-4
participant_network.star
src/participant_network/participant_network.star
+1
-2
cl_genesis_data_generator.star
..._data_generator/cl_genesis/cl_genesis_data_generator.star
+1
-1
el_genesis_data_generator.star
..._data_generator/el_genesis/el_genesis_data_generator.star
+1
-1
prometheus_launcher.star
src/prometheus/prometheus_launcher.star
+1
-1
datasource.yml.tmpl
static_files/grafana-config/templates/datasource.yml.tmpl
+2
-2
No files found.
src/participant_network/cl/nimbus/nimbus_launcher.star
View file @
466f0a84
...
...
@@ -146,7 +146,7 @@ def get_service_config(
"-m",
CONSENSUS_DATA_DIR_PERMS_STR,
"&&",
# TODO COMMENT THIS OUT?
# TODO
(old)
COMMENT THIS OUT?
"cp",
"-R",
validator_keys_dirpath,
...
...
src/participant_network/el/erigon/erigon_launcher.star
View file @
466f0a84
...
...
@@ -34,7 +34,6 @@ PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER"
TCP_PROTOCOL = "TCP"
UDP_PROTOCOL = "UDP"
## Engine port was removed from here
USED_PORTS = {
RPC_PORT_ID: new_port_spec(RPC_PORT_NUM, TCP_PROTOCOL),
WS_PORT_ID: new_port_spec(WS_PORT_NUM, TCP_PROTOCOL),
...
...
@@ -79,8 +78,8 @@ def launch(
return new_el_client_context(
"erigon",
"", # TODO fetch ENR from wait & fact
"", # TODO add Enode from wait & fact
,
enr,
enode
,
service.ip_address,
RPC_PORT_NUM,
WS_PORT_NUM,
...
...
@@ -120,7 +119,6 @@ def get_service_config(network_id, genesis_data, image, existing_el_clients, ver
"--allow-insecure-unlock",
"--nat=extip:" + PRIVATE_IP_ADDRESS_PLACEHOLDER,
"--authrpc.jwtsecret={0}".format(jwt_secret_json_filepath_on_client),
## TODO engine port was removed from here
"--nodiscover",
"--staticpeers={0}".format(boot_node.enode),
]
...
...
src/participant_network/participant_network.star
View file @
466f0a84
...
...
@@ -36,7 +36,7 @@ CL_GENESIS_DATA_GENERATION_TIME = 2 * time.minute
# Each CL node takes about this time to start up and start processing blocks, so when we create the CL
# genesis data we need to set the genesis timestamp in the future so that nodes don't miss important slots
# (e.g. Altair fork)
# TODO Make this client-specific (currently this is Nimbus)
# TODO
(old)
Make this client-specific (currently this is Nimbus)
CL_NODE_STARTUP_TIME = 45 * time.second
MEV_BOOST_SHOULD_CHECK_RELAY = True
...
...
@@ -129,7 +129,6 @@ def launch_participant_network(participants, network_params, global_log_level):
print("Launching CL network")
cl_launchers = {
# TODO Allow for other types here
module_io.CLClientType.lighthouse : {"launcher": new_lighthouse_launcher(cl_genesis_data), "launch_method": launch_lighthouse},
module_io.CLClientType.lodestar: {"launcher": new_lodestar_launcher(cl_genesis_data), "launch_method": launch_lodestar},
module_io.CLClientType.nimbus: {"launcher": new_nimbus_launcher(cl_genesis_data), "launch_method": launch_nimbus},
...
...
src/participant_network/prelaunch_data_generator/cl_genesis/cl_genesis_data_generator.star
View file @
466f0a84
...
...
@@ -52,7 +52,7 @@ def generate_cl_genesis_data(
genesis_generation_config_artifact_uuid = render_templates(template_and_data_by_rel_dest_filepath)
# TODO Make this the actual data generator - comment copied from the original module
# TODO
(old)
Make this the actual data generator - comment copied from the original module
launcher_service_id = launch_prelaunch_data_generator(
{
genesis_generation_config_artifact_uuid: CONFIG_DIRPATH_ON_GENERATOR,
...
...
src/participant_network/prelaunch_data_generator/el_genesis/el_genesis_data_generator.star
View file @
466f0a84
...
...
@@ -45,7 +45,7 @@ def generate_el_genesis_data(
genesis_generation_config_artifact_uuid = render_templates(template_and_data_by_rel_dest_filepath)
# TODO Make this the actual data generator - comment copied from the original module
# TODO
(old)
Make this the actual data generator - comment copied from the original module
launcher_service_id = launch_prelaunch_data_generator(
{
genesis_generation_config_artifact_uuid: CONFIG_DIRPATH_ON_GENERATOR,
...
...
src/prometheus/prometheus_launcher.star
View file @
466f0a84
...
...
@@ -2,7 +2,7 @@ load("github.com/kurtosis-tech/eth2-module/src/shared_utils/shared_utils.star",
SERVICE_ID = "prometheus"
# TODO I'm not sure if we should use latest version or ping an specific version instead
# TODO
(old)
I'm not sure if we should use latest version or ping an specific version instead
IMAGE_NAME = "prom/prometheus:latest"
HTTP_PORT_ID = "http"
...
...
static_files/grafana-config/templates/datasource.yml.tmpl
View file @
466f0a84
apiVersion: 1
# TODO we can improve this, adding an array that we can use to iterate
# TODO an get different datasource configurations
# TODO
(old)
we can improve this, adding an array that we can use to iterate
# TODO
(old)
an get different datasource configurations
datasources:
- name: Prometheus
type: prometheus
...
...
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