Commit d0832dc6 authored by Gyanendra Mishra's avatar Gyanendra Mishra

got till execution

parent 9f319ceb
...@@ -157,13 +157,13 @@ def get_beacon_service_config( ...@@ -157,13 +157,13 @@ def get_beacon_service_config(
extra_params): extra_params):
el_client_engine_rpc_url_str = "http://%v:%v".format( el_client_engine_rpc_url_str = "http://%v:%v".format(
el_client_ctx.ip_address, el_client_ctx.ip_addr,
el_client_ctx.engine_rpc_port_num, el_client_ctx.engine_rpc_port_num,
) )
# For some reason, Lighthouse takes in the parent directory of the config file (rather than the path to the config file itself) # For some reason, Lighthouse takes in the parent directory of the config file (rather than the path to the config file itself)
genesis_config_parent_dirpath_on_client = path_join(GENESIS_DATA_MOUNTPOINT_ON_CLIENTS, path_dir(genesis_data.config_yml_rel_filepath)) genesis_config_parent_dirpath_on_client = path_join(GENESIS_DATA_MOUNTPOINT_ON_CLIENTS, path_dir(genesis_data.config_yml_rel_filepath))
jwt_secret_filepath = path_join(GENESIS_DATA_MOUNTPOINT_ON_CLIENTS, genesis_data.jwt_secret_relative_filepath) jwt_secret_filepath = path_join(GENESIS_DATA_MOUNTPOINT_ON_CLIENTS, genesis_data.jwt_secret_rel_filepath)
# NOTE: If connecting to the merge devnet remotely we DON'T want the following flags; when they're not set, the node's external IP address is auto-detected # NOTE: If connecting to the merge devnet remotely we DON'T want the following flags; when they're not set, the node's external IP address is auto-detected
# from the peers it communicates with but when they're set they basically say "override the autodetection and # from the peers it communicates with but when they're set they basically say "override the autodetection and
...@@ -244,8 +244,8 @@ def get_validator_service_config( ...@@ -244,8 +244,8 @@ def get_validator_service_config(
# For some reason, Lighthouse takes in the parent directory of the config file (rather than the path to the config file itself) # For some reason, Lighthouse takes in the parent directory of the config file (rather than the path to the config file itself)
genesis_config_parent_dirpath_on_client = path_join(GENESIS_DATA_MOUNTPOINT_ON_CLIENTS, path_dir(genesis_data.config_yml_rel_filepath)) genesis_config_parent_dirpath_on_client = path_join(GENESIS_DATA_MOUNTPOINT_ON_CLIENTS, path_dir(genesis_data.config_yml_rel_filepath))
validator_keys_dirpath = path_join(VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS, node_keystore_files.RawKeysRelativeDirpath) validator_keys_dirpath = path_join(VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS, node_keystore_files.raw_keys_relative_dirpath)
validator_secrets_dirpath = path_join(VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS, node_keystore_files.RawSecretsRelativeDirpath) validator_secrets_dirpath = path_join(VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS, node_keystore_files.raw_secrets_relative_dirpath)
cmd_args = [ cmd_args = [
"lighthouse", "lighthouse",
...@@ -295,7 +295,7 @@ def get_validator_service_config( ...@@ -295,7 +295,7 @@ def get_validator_service_config(
def new_lighthouse_launcher(cl_genesi_data): def new_lighthouse_launcher(cl_genesis_data):
return struct( return struct(
cl_genesi_data = cl_genesi_data, genesis_data = cl_genesis_data,
) )
\ No newline at end of file
...@@ -115,11 +115,11 @@ def get_service_config(network_id, genesis_data, prefunded_geth_keys_artifact_uu ...@@ -115,11 +115,11 @@ def get_service_config(network_id, genesis_data, prefunded_geth_keys_artifact_uu
KEYSTORE_DIRPATH_ON_CLIENT_CONTAINER, KEYSTORE_DIRPATH_ON_CLIENT_CONTAINER,
) )
create_passwords_file_cmd_str = "{ for i in $(seq 1 %v); do echo \"%v\" >> %v; done; }".format( create_passwords_file_cmd_str = '{' + ' for i in $(seq 1 {0}); do echo "{1}" >> {2}; done; '.format(
len(prefunded_account_info), len(prefunded_account_info),
GETH_ACCOUNT_PASSWORD, GETH_ACCOUNT_PASSWORD,
GETH_ACCOUNT_PASSWORDS_FILE, GETH_ACCOUNT_PASSWORDS_FILE,
) ) + '}'
launch_node_cmd_args = [ launch_node_cmd_args = [
"geth", "geth",
...@@ -156,7 +156,6 @@ def get_service_config(network_id, genesis_data, prefunded_geth_keys_artifact_uu ...@@ -156,7 +156,6 @@ def get_service_config(network_id, genesis_data, prefunded_geth_keys_artifact_uu
bootnode_enode = bootnode_context.enode bootnode_enode = bootnode_context.enode
launch_node_cmd_args.append( launch_node_cmd_args.append(
launch_node_cmd_args,
'--bootnodes="%s"'.format(bootnode_enode), '--bootnodes="%s"'.format(bootnode_enode),
) )
......
...@@ -162,7 +162,7 @@ def launch_participant_network(participants, network_params, global_log_level): ...@@ -162,7 +162,7 @@ def launch_participant_network(participants, network_params, global_log_level):
all_participants = [] all_participants = []
for index, participant in participants: for index, participant in enumerate(participants):
el_client_type = participant.el_client_type el_client_type = participant.el_client_type
cl_client_type = participant.cl_client_type cl_client_type = participant.cl_client_type
......
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