Skip to content

E
ethereum-package
Commit b6d73bf2 authored by Gyanendra Mishra's avatar Gyanendra Mishra Committed by GitHub
Browse files
Options

Merge branch 'master' into gyani/run-main

parents b8cf1d5d 98566425
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 13 deletions
docs/changelog.md
View file @ b6d73bf2
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
- Moved away from `store_files_from_service` to `store_service_files` - Moved away from `store_files_from_service` to `store_service_files`
- Removed empty `ports` from a few service configs as passing it is now optional - Removed empty `ports` from a few service configs as passing it is now optional
- Adjusted to the new render templates config - Adjusted to the new render templates config
- Moved away from passing json string to struct/dict for render templates
### Changes ### Changes
- Move from `main` to `run` in `main.star` - Move from `main` to `run` in `main.star`
......
src/forkmon/forkmon_launcher.star
View file @ b6d73bf2
...@@ -31,9 +31,8 @@ def launch_forkmon( ...@@ -31,9 +31,8 @@ def launch_forkmon(
all_cl_client_info.append(client_info) all_cl_client_info.append(client_info)
template_data = new_config_template_data(HTTP_PORT_NUMBER, all_cl_client_info, seconds_per_slot, slots_per_epoch, genesis_unix_timestamp) template_data = new_config_template_data(HTTP_PORT_NUMBER, all_cl_client_info, seconds_per_slot, slots_per_epoch, genesis_unix_timestamp)
template_data_json = json.encode(template_data)
template_and_data = shared_utils.new_template_and_data(config_template, template_data_json) template_and_data = shared_utils.new_template_and_data(config_template, template_data)
template_and_data_by_rel_dest_filepath = {} template_and_data_by_rel_dest_filepath = {}
template_and_data_by_rel_dest_filepath[FORKMON_CONFIG_FILENAME] = template_and_data template_and_data_by_rel_dest_filepath[FORKMON_CONFIG_FILENAME] = template_and_data
......
src/grafana/grafana_launcher.star
View file @ b6d73bf2
...@@ -37,12 +37,10 @@ def launch_grafana(datasource_config_template, dashboard_providers_config_templa ...@@ -37,12 +37,10 @@ def launch_grafana(datasource_config_template, dashboard_providers_config_templa
def get_grafana_config_dir_artifact_uuid(datasource_config_template, dashboard_providers_config_template, prometheus_private_url): def get_grafana_config_dir_artifact_uuid(datasource_config_template, dashboard_providers_config_template, prometheus_private_url):
datasource_data = new_datasource_config_template_data(prometheus_private_url) datasource_data = new_datasource_config_template_data(prometheus_private_url)
datasource_data_as_json = json.encode(datasource_data) datasource_template_and_data = shared_utils.new_template_and_data(datasource_config_template, datasource_data)
datasource_template_and_data = shared_utils.new_template_and_data(datasource_config_template, datasource_data_as_json)
dashboard_providers_data = new_dashboard_providers_config_template_data(GRAFANA_DASHBOARDS_FILEPATH_ON_SERVICE) dashboard_providers_data = new_dashboard_providers_config_template_data(GRAFANA_DASHBOARDS_FILEPATH_ON_SERVICE)
dashboard_providers_data_json = json.encode(dashboard_providers_data) dashboard_providers_template_and_data = shared_utils.new_template_and_data(dashboard_providers_config_template, dashboard_providers_data)
dashboard_providers_template_and_data = shared_utils.new_template_and_data(dashboard_providers_config_template, dashboard_providers_data_json)
template_and_data_by_rel_dest_filepath = {} template_and_data_by_rel_dest_filepath = {}
template_and_data_by_rel_dest_filepath[DATASOURCE_CONFIG_REL_FILEPATH] = datasource_template_and_data template_and_data_by_rel_dest_filepath[DATASOURCE_CONFIG_REL_FILEPATH] = datasource_template_and_data
......
src/participant_network/prelaunch_data_generator/cl_genesis/cl_genesis_data_generator.star
View file @ b6d73bf2
...@@ -34,14 +34,14 @@ def generate_cl_genesis_data( ...@@ -34,14 +34,14 @@ def generate_cl_genesis_data(
preregistered_validator_keys_mnemonic, preregistered_validator_keys_mnemonic,
total_num_validator_keys_to_preregister): total_num_validator_keys_to_preregister):
template_data = json.encode(new_cl_genesis_config_template_data( template_data = new_cl_genesis_config_template_data(
network_id, network_id,
seconds_per_slot, seconds_per_slot,
genesis_unix_timestamp, genesis_unix_timestamp,
total_num_validator_keys_to_preregister, total_num_validator_keys_to_preregister,
preregistered_validator_keys_mnemonic, preregistered_validator_keys_mnemonic,
deposit_contract_address, deposit_contract_address,
)) )
genesis_generation_mnemonics_template_and_data = shared_utils.new_template_and_data(genesis_generation_mnemonics_yml_template, template_data) genesis_generation_mnemonics_template_and_data = shared_utils.new_template_and_data(genesis_generation_mnemonics_yml_template, template_data)
genesis_generation_config_template_and_data = shared_utils.new_template_and_data(genesis_generation_config_yml_template, template_data) genesis_generation_config_template_and_data = shared_utils.new_template_and_data(genesis_generation_config_yml_template, template_data)
......
src/participant_network/prelaunch_data_generator/el_genesis/el_genesis_data_generator.star
View file @ b6d73bf2
...@@ -31,11 +31,11 @@ def generate_el_genesis_data( ...@@ -31,11 +31,11 @@ def generate_el_genesis_data(
network_id, network_id,
deposit_contract_address): deposit_contract_address):
template_data = json.encode(genesis_generation_config_template_data( template_data = genesis_generation_config_template_data(
network_id, network_id,
deposit_contract_address, deposit_contract_address,
genesis_unix_timestamp, genesis_unix_timestamp,
)) )
genesis_config_file_template_and_data = shared_utils.new_template_and_data(genesis_generation_config_template, template_data) genesis_config_file_template_and_data = shared_utils.new_template_and_data(genesis_generation_config_template, template_data)
......
src/prometheus/prometheus_launcher.star
View file @ b6d73bf2
...@@ -24,9 +24,7 @@ def launch_prometheus(config_template, cl_client_contexts): ...@@ -24,9 +24,7 @@ def launch_prometheus(config_template, cl_client_contexts):
all_cl_nodes_metrics_info.extend(client.cl_nodes_metrics_info) all_cl_nodes_metrics_info.extend(client.cl_nodes_metrics_info)
template_data = new_config_template_data(all_cl_nodes_metrics_info) template_data = new_config_template_data(all_cl_nodes_metrics_info)
template_data_json = json.encode(template_data) template_and_data = shared_utils.new_template_and_data(config_template, template_data)
template_and_data = shared_utils.new_template_and_data(config_template, template_data_json)
template_and_data_by_rel_dest_filepath = {} template_and_data_by_rel_dest_filepath = {}
template_and_data_by_rel_dest_filepath[CONFIG_FILENAME] = template_and_data template_and_data_by_rel_dest_filepath[CONFIG_FILENAME] = template_and_data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment