Skip to content

E
ethereum-package
Commit 51f76bd1 authored by Barnabas Busa's avatar Barnabas Busa Committed by GitHub
Browse files
Options

feat: enable teku split beacon <> validator setup (#409)

parent f49185b2
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 118 deletions
.github/tests/split-teku.yaml 0 → 100644
View file @ 51f76bd1
participants:
- el_client_type: geth
cl_client_type: teku
cl_split_mode_enabled: true
validator_count: 0
- el_client_type: nethermind
cl_client_type: teku
cl_split_mode_enabled: true
- el_client_type: erigon
cl_client_type: teku
cl_split_mode_enabled: true
- el_client_type: besu
cl_client_type: teku
cl_split_mode_enabled: true
- el_client_type: reth
cl_client_type: teku
cl_split_mode_enabled: true
- el_client_type: ethereumjs
cl_client_type: teku
cl_split_mode_enabled: true
additional_services: []
src/cl/nimbus/nimbus_launcher.star
View file @ 51f76bd1
...@@ -47,10 +47,6 @@ VALIDATOR_MAX_MEMORY = 512 ...@@ -47,10 +47,6 @@ VALIDATOR_MAX_MEMORY = 512
DEFAULT_VALIDATOR_IMAGE_ENTRYPOINT = ["nimbus_validator_client"] DEFAULT_VALIDATOR_IMAGE_ENTRYPOINT = ["nimbus_validator_client"]
VALIDATOR_METRICS_PATH = "/metrics" VALIDATOR_METRICS_PATH = "/metrics"
VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER = "$HOME/validator-keys"
VALIDATOR_SECRETS_DIRPATH_ON_SERVICE_CONTAINER = "$HOME/validator-secrets"
# ---------------------------------- Genesis Files ---------------------------------- # ---------------------------------- Genesis Files ----------------------------------
# Nimbus requires that its data directory already exists (because it expects you to bind-mount it), so we # Nimbus requires that its data directory already exists (because it expects you to bind-mount it), so we
...@@ -360,7 +356,7 @@ def get_beacon_config( ...@@ -360,7 +356,7 @@ def get_beacon_config(
files = { files = {
constants.GENESIS_DATA_MOUNTPOINT_ON_CLIENTS: el_cl_genesis_data.files_artifact_uuid, constants.GENESIS_DATA_MOUNTPOINT_ON_CLIENTS: el_cl_genesis_data.files_artifact_uuid,
} }
if node_keystore_files: if node_keystore_files != None and not split_mode_enabled:
files[ files[
VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS
] = node_keystore_files.files_artifact_uuid ] = node_keystore_files.files_artifact_uuid
......
src/cl/teku/teku_launcher.star
View file @ 51f76bd1
...@@ -14,16 +14,17 @@ CONSENSUS_DATA_DIRPATH_ON_SERVICE_CONTAINER = "/opt/teku/consensus-data" ...@@ -14,16 +14,17 @@ CONSENSUS_DATA_DIRPATH_ON_SERVICE_CONTAINER = "/opt/teku/consensus-data"
# into the Teku user's home directory to get around it # into the Teku user's home directory to get around it
VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER = "/validator-keys" VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER = "/validator-keys"
# ---------------------------------- Beacon client -------------------------------------
# Port IDs # Port IDs
TCP_DISCOVERY_PORT_ID = "tcp-discovery" BEACON_TCP_DISCOVERY_PORT_ID = "tcp-discovery"
UDP_DISCOVERY_PORT_ID = "udp-discovery" BEACON_UDP_DISCOVERY_PORT_ID = "udp-discovery"
HTTP_PORT_ID = "http" BEACON_HTTP_PORT_ID = "http"
METRICS_PORT_ID = "metrics" BEACON_METRICS_PORT_ID = "metrics"
# Port nums # Port nums
DISCOVERY_PORT_NUM = 9000 BEACON_DISCOVERY_PORT_NUM = 9000
HTTP_PORT_NUM = 4000 BEACON_HTTP_PORT_NUM = 4000
METRICS_PORT_NUM = 8008 BEACON_METRICS_PORT_NUM = 8008
# The min/max CPU/memory that the beacon node can use # The min/max CPU/memory that the beacon node can use
BEACON_MIN_CPU = 50 BEACON_MIN_CPU = 50
...@@ -31,37 +32,60 @@ BEACON_MAX_CPU = 1000 ...@@ -31,37 +32,60 @@ BEACON_MAX_CPU = 1000
BEACON_MIN_MEMORY = 1024 BEACON_MIN_MEMORY = 1024
BEACON_MAX_MEMORY = 2048 BEACON_MAX_MEMORY = 2048
# 1) The Teku container runs as the "teku" user BEACON_METRICS_PATH = "/metrics"
# 2) Teku requires write access to the validator secrets directory, so it can write a lockfile into it as it uses the keys # ---------------------------------- Validator client -------------------------------------
# 3) The module container runs as 'root' VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS = "/validator-keys"
# With these three things combined, it means that when the module container tries to write the validator keys/secrets into VALIDATOR_HTTP_PORT_ID = "http"
# the shared directory, it does so as 'root'. When Teku tries to consum the same files, it will get a failure because it VALIDATOR_METRICS_PORT_ID = "metrics"
# doesn't have permission to write to the 'validator-secrets' directory. VALIDATOR_HTTP_PORT_NUM = 5042
# To get around this, we copy the files AGAIN from VALIDATOR_METRICS_PORT_NUM = 5064
DEST_VALIDATOR_KEYS_DIRPATH_IN_SERVICE_CONTAINER = "$HOME/validator-keys" VALIDATOR_HTTP_PORT_WAIT_DISABLED = None
DEST_VALIDATOR_SECRETS_DIRPATH_IN_SERVICE_CONTAINER = "$HOME/validator-secrets"
MIN_PEERS = 1 VALIDATOR_SUFFIX_SERVICE_NAME = "validator"
# The min/max CPU/memory that the validator node can use
VALIDATOR_MIN_CPU = 50
VALIDATOR_MAX_CPU = 300
VALIDATOR_MIN_MEMORY = 128
VALIDATOR_MAX_MEMORY = 512
METRICS_PATH = "/metrics" VALIDATOR_METRICS_PATH = "/metrics"
MIN_PEERS = 1
PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER" PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER"
USED_PORTS = { BEACON_USED_PORTS = {
TCP_DISCOVERY_PORT_ID: shared_utils.new_port_spec( BEACON_TCP_DISCOVERY_PORT_ID: shared_utils.new_port_spec(
DISCOVERY_PORT_NUM, shared_utils.TCP_PROTOCOL BEACON_DISCOVERY_PORT_NUM, shared_utils.TCP_PROTOCOL
), ),
UDP_DISCOVERY_PORT_ID: shared_utils.new_port_spec( BEACON_UDP_DISCOVERY_PORT_ID: shared_utils.new_port_spec(
DISCOVERY_PORT_NUM, shared_utils.UDP_PROTOCOL BEACON_DISCOVERY_PORT_NUM, shared_utils.UDP_PROTOCOL
), ),
HTTP_PORT_ID: shared_utils.new_port_spec(HTTP_PORT_NUM, shared_utils.TCP_PROTOCOL), BEACON_HTTP_PORT_ID: shared_utils.new_port_spec(
METRICS_PORT_ID: shared_utils.new_port_spec( BEACON_HTTP_PORT_NUM, shared_utils.TCP_PROTOCOL
METRICS_PORT_NUM, shared_utils.TCP_PROTOCOL ),
BEACON_METRICS_PORT_ID: shared_utils.new_port_spec(
BEACON_METRICS_PORT_NUM, shared_utils.TCP_PROTOCOL
),
}
VALIDATOR_USED_PORTS = {
VALIDATOR_HTTP_PORT_ID: shared_utils.new_port_spec(
VALIDATOR_HTTP_PORT_NUM,
shared_utils.TCP_PROTOCOL,
shared_utils.NOT_PROVIDED_APPLICATION_PROTOCOL,
VALIDATOR_HTTP_PORT_WAIT_DISABLED,
),
VALIDATOR_METRICS_PORT_ID: shared_utils.new_port_spec(
VALIDATOR_METRICS_PORT_NUM,
shared_utils.TCP_PROTOCOL,
shared_utils.HTTP_APPLICATION_PROTOCOL,
), ),
} }
ENTRYPOINT_ARGS = ["sh", "-c"]
ENTRYPOINT_ARGS = ["sh", "-c"]
TEKU_LOG_LEVELS = { TEKU_LOG_LEVELS = {
constants.GLOBAL_CLIENT_LOG_LEVEL.error: "ERROR", constants.GLOBAL_CLIENT_LOG_LEVEL.error: "ERROR",
...@@ -100,6 +124,10 @@ def launch( ...@@ -100,6 +124,10 @@ def launch(
extra_validator_labels, extra_validator_labels,
split_mode_enabled, split_mode_enabled,
): ):
beacon_service_name = "{0}".format(service_name)
validator_service_name = "{0}-{1}".format(
service_name, VALIDATOR_SUFFIX_SERVICE_NAME
)
log_level = input_parser.get_client_log_level_or_default( log_level = input_parser.get_client_log_level_or_default(
participant_log_level, global_log_level, TEKU_LOG_LEVELS participant_log_level, global_log_level, TEKU_LOG_LEVELS
) )
...@@ -113,15 +141,7 @@ def launch( ...@@ -113,15 +141,7 @@ def launch(
bn_min_mem = int(bn_min_mem) if int(bn_min_mem) > 0 else BEACON_MIN_MEMORY bn_min_mem = int(bn_min_mem) if int(bn_min_mem) > 0 else BEACON_MIN_MEMORY
bn_max_mem = int(bn_max_mem) if int(bn_max_mem) > 0 else BEACON_MAX_MEMORY bn_max_mem = int(bn_max_mem) if int(bn_max_mem) > 0 else BEACON_MAX_MEMORY
# Set the min/max CPU/memory for the beacon node to be the max of the beacon node and validator node values, unless this is defined, it will use the default beacon values config = get_beacon_config(
bn_min_cpu = int(v_min_cpu) if (int(v_min_cpu) > bn_min_cpu) else bn_min_cpu
bn_max_cpu = int(v_max_cpu) if (int(v_max_cpu) > bn_max_cpu) else bn_max_cpu
bn_min_mem = int(v_min_mem) if (int(v_min_mem) > bn_min_mem) else bn_min_mem
bn_max_mem = int(v_max_mem) if (int(v_max_mem) > bn_max_mem) else bn_max_mem
extra_labels = extra_beacon_labels | extra_validator_labels
config = get_config(
launcher.el_cl_genesis_data, launcher.el_cl_genesis_data,
image, image,
bootnode_context, bootnode_context,
...@@ -134,52 +154,97 @@ def launch( ...@@ -134,52 +154,97 @@ def launch(
bn_max_mem, bn_max_mem,
snooper_enabled, snooper_enabled,
snooper_engine_context, snooper_engine_context,
service_name, beacon_service_name,
extra_params, extra_beacon_params,
extra_labels, extra_beacon_labels,
split_mode_enabled,
)
beacon_service = plan.add_service(service_name, config)
beacon_http_port = beacon_service.ports[BEACON_HTTP_PORT_ID]
beacon_http_url = "http://{0}:{1}".format(
beacon_service.ip_address, beacon_http_port.number
) )
teku_service = plan.add_service(service_name, config) beacon_metrics_port = beacon_service.ports[BEACON_METRICS_PORT_ID]
beacon_metrics_url = "{0}:{1}".format(
beacon_service.ip_address, beacon_metrics_port.number
)
node_identity_recipe = GetHttpRequestRecipe( beacon_node_identity_recipe = GetHttpRequestRecipe(
endpoint="/eth/v1/node/identity", endpoint="/eth/v1/node/identity",
port_id=HTTP_PORT_ID, port_id=BEACON_HTTP_PORT_ID,
extract={ extract={
"enr": ".data.enr", "enr": ".data.enr",
"multiaddr": ".data.discovery_addresses[0]", "multiaddr": ".data.p2p_addresses[0]",
"peer_id": ".data.peer_id", "peer_id": ".data.peer_id",
}, },
) )
response = plan.request(recipe=node_identity_recipe, service_name=service_name) response = plan.request(
node_enr = response["extract.enr"] recipe=beacon_node_identity_recipe, service_name=service_name
multiaddr = response["extract.multiaddr"]
peer_id = response["extract.peer_id"]
teku_metrics_port = teku_service.ports[METRICS_PORT_ID]
teku_metrics_url = "{0}:{1}".format(
teku_service.ip_address, teku_metrics_port.number
) )
beacon_node_enr = response["extract.enr"]
beacon_multiaddr = response["extract.multiaddr"]
beacon_peer_id = response["extract.peer_id"]
teku_node_metrics_info = node_metrics.new_node_metrics_info( beacon_node_metrics_info = node_metrics.new_node_metrics_info(
service_name, METRICS_PATH, teku_metrics_url service_name, BEACON_METRICS_PATH, beacon_metrics_url
) )
nodes_metrics_info = [teku_node_metrics_info] nodes_metrics_info = [beacon_node_metrics_info]
# Launch validator node if we have a keystore
validator_service = None
if node_keystore_files != None and split_mode_enabled:
v_min_cpu = int(v_min_cpu) if int(v_min_cpu) > 0 else VALIDATOR_MIN_CPU
v_max_cpu = int(v_max_cpu) if int(v_max_cpu) > 0 else VALIDATOR_MAX_CPU
v_min_mem = int(v_min_mem) if int(v_min_mem) > 0 else VALIDATOR_MIN_MEMORY
v_max_mem = int(v_max_mem) if int(v_max_mem) > 0 else VALIDATOR_MAX_MEMORY
validator_config = get_validator_config(
launcher.el_cl_genesis_data,
image,
log_level,
beacon_http_url,
el_client_context,
node_keystore_files,
v_min_cpu,
v_max_cpu,
v_min_mem,
v_max_mem,
validator_service_name,
extra_validator_params,
extra_validator_labels,
)
validator_service = plan.add_service(validator_service_name, validator_config)
if validator_service:
validator_metrics_port = validator_service.ports[VALIDATOR_METRICS_PORT_ID]
validator_metrics_url = "{0}:{1}".format(
validator_service.ip_address, validator_metrics_port.number
)
validator_node_metrics_info = node_metrics.new_node_metrics_info(
validator_service_name, VALIDATOR_METRICS_PATH, validator_metrics_url
)
nodes_metrics_info.append(validator_node_metrics_info)
return cl_client_context.new_cl_client_context( return cl_client_context.new_cl_client_context(
"teku", "teku",
node_enr, beacon_node_enr,
teku_service.ip_address, beacon_service.ip_address,
HTTP_PORT_NUM, BEACON_HTTP_PORT_NUM,
nodes_metrics_info, nodes_metrics_info,
service_name, beacon_service_name,
multiaddr=multiaddr, validator_service_name,
peer_id=peer_id, multiaddr=beacon_multiaddr,
peer_id=beacon_peer_id,
snooper_enabled=snooper_enabled, snooper_enabled=snooper_enabled,
snooper_engine_context=snooper_engine_context, snooper_engine_context=snooper_engine_context,
) )
def get_config( def get_beacon_config(
el_cl_genesis_data, el_cl_genesis_data,
image, image,
bootnode_contexts, bootnode_contexts,
...@@ -195,19 +260,8 @@ def get_config( ...@@ -195,19 +260,8 @@ def get_config(
service_name, service_name,
extra_params, extra_params,
extra_labels, extra_labels,
split_mode_enabled,
): ):
# If snooper is enabled use the snooper engine context, otherwise use the execution client context
if snooper_enabled:
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
snooper_engine_context.ip_addr,
snooper_engine_context.engine_rpc_port_num,
)
else:
EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
el_client_context.ip_addr,
el_client_context.engine_rpc_port_num,
)
validator_keys_dirpath = "" validator_keys_dirpath = ""
validator_secrets_dirpath = "" validator_secrets_dirpath = ""
if node_keystore_files: if node_keystore_files:
...@@ -219,31 +273,18 @@ def get_config( ...@@ -219,31 +273,18 @@ def get_config(
VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER, VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER,
node_keystore_files.teku_secrets_relative_dirpath, node_keystore_files.teku_secrets_relative_dirpath,
) )
# If snooper is enabled use the snooper engine context, otherwise use the execution client context
validator_copy = [ if snooper_enabled:
# Needed because the generated keys are owned by root and the Teku image runs as the 'teku' user EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
"cp", snooper_engine_context.ip_addr,
"-R", snooper_engine_context.engine_rpc_port_num,
validator_keys_dirpath, )
DEST_VALIDATOR_KEYS_DIRPATH_IN_SERVICE_CONTAINER, else:
"&&", EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
# Needed because the generated keys are owned by root and the Teku image runs as the 'teku' user el_client_context.ip_addr,
"cp", el_client_context.engine_rpc_port_num,
"-R", )
validator_secrets_dirpath, cmd = [
DEST_VALIDATOR_SECRETS_DIRPATH_IN_SERVICE_CONTAINER,
"&&",
]
validator_flags = [
"--validator-keys={0}:{1}".format(
DEST_VALIDATOR_KEYS_DIRPATH_IN_SERVICE_CONTAINER,
DEST_VALIDATOR_SECRETS_DIRPATH_IN_SERVICE_CONTAINER,
),
"--validators-proposer-default-fee-recipient="
+ constants.VALIDATING_REWARDS_ACCOUNT,
]
beacon_start = [
TEKU_BINARY_FILEPATH_IN_IMAGE,
"--logging=" + log_level, "--logging=" + log_level,
"--log-destination=CONSOLE", "--log-destination=CONSOLE",
"--network=" "--network="
...@@ -265,7 +306,7 @@ def get_config( ...@@ -265,7 +306,7 @@ def get_config(
"--rest-api-enabled=true", "--rest-api-enabled=true",
"--rest-api-docs-enabled=true", "--rest-api-docs-enabled=true",
"--rest-api-interface=0.0.0.0", "--rest-api-interface=0.0.0.0",
"--rest-api-port={0}".format(HTTP_PORT_NUM), "--rest-api-port={0}".format(BEACON_HTTP_PORT_NUM),
"--rest-api-host-allowlist=*", "--rest-api-host-allowlist=*",
"--data-storage-non-canonical-blocks-enabled=true", "--data-storage-non-canonical-blocks-enabled=true",
"--ee-jwt-secret-file=" + constants.JWT_AUTH_PATH, "--ee-jwt-secret-file=" + constants.JWT_AUTH_PATH,
...@@ -275,23 +316,25 @@ def get_config( ...@@ -275,23 +316,25 @@ def get_config(
"--metrics-interface=0.0.0.0", "--metrics-interface=0.0.0.0",
"--metrics-host-allowlist='*'", "--metrics-host-allowlist='*'",
"--metrics-categories=BEACON,PROCESS,LIBP2P,JVM,NETWORK,PROCESS", "--metrics-categories=BEACON,PROCESS,LIBP2P,JVM,NETWORK,PROCESS",
"--metrics-port={0}".format(METRICS_PORT_NUM), "--metrics-port={0}".format(BEACON_METRICS_PORT_NUM),
# ^^^^^^^^^^^^^^^^^^^ METRICS CONFIG ^^^^^^^^^^^^^^^^^^^^^ # ^^^^^^^^^^^^^^^^^^^ METRICS CONFIG ^^^^^^^^^^^^^^^^^^^^^
"--Xtrusted-setup=" + constants.KZG_DATA_DIRPATH_ON_CLIENT_CONTAINER, "--Xtrusted-setup=" + constants.KZG_DATA_DIRPATH_ON_CLIENT_CONTAINER,
]
validator_flags = [
"--validator-keys={0}:{1}".format(
validator_keys_dirpath,
validator_secrets_dirpath,
),
"--validators-proposer-default-fee-recipient="
+ constants.VALIDATING_REWARDS_ACCOUNT,
"--validators-graffiti=" "--validators-graffiti="
+ constants.CL_CLIENT_TYPE.teku + constants.CL_CLIENT_TYPE.teku
+ "-" + "-"
+ el_client_context.client_name, + el_client_context.client_name,
] ]
# Depending on whether we're using a node keystore, we'll need to add the validator flags if node_keystore_files != None and not split_mode_enabled:
cmd = []
if node_keystore_files != None:
cmd.extend(validator_copy)
cmd.extend(beacon_start)
cmd.extend(validator_flags) cmd.extend(validator_flags)
else:
cmd.extend(beacon_start)
if bootnode_contexts != None: if bootnode_contexts != None:
cmd.append( cmd.append(
...@@ -317,19 +360,21 @@ def get_config( ...@@ -317,19 +360,21 @@ def get_config(
files = { files = {
constants.GENESIS_DATA_MOUNTPOINT_ON_CLIENTS: el_cl_genesis_data.files_artifact_uuid, constants.GENESIS_DATA_MOUNTPOINT_ON_CLIENTS: el_cl_genesis_data.files_artifact_uuid,
} }
if node_keystore_files: if node_keystore_files != None and not split_mode_enabled:
files[ files[
VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER VALIDATOR_KEYS_DIRPATH_ON_SERVICE_CONTAINER
] = node_keystore_files.files_artifact_uuid ] = node_keystore_files.files_artifact_uuid
cmd_str = " ".join(cmd) cmd_str = " ".join(cmd)
return ServiceConfig( return ServiceConfig(
image=image, image=image,
ports=USED_PORTS, ports=BEACON_USED_PORTS,
cmd=[cmd_str], cmd=cmd,
entrypoint=ENTRYPOINT_ARGS, # entrypoint=ENTRYPOINT_ARGS,
files=files, files=files,
private_ip_address_placeholder=PRIVATE_IP_ADDRESS_PLACEHOLDER, private_ip_address_placeholder=PRIVATE_IP_ADDRESS_PLACEHOLDER,
ready_conditions=cl_node_ready_conditions.get_ready_conditions(HTTP_PORT_ID), ready_conditions=cl_node_ready_conditions.get_ready_conditions(
BEACON_HTTP_PORT_ID
),
min_cpu=bn_min_cpu, min_cpu=bn_min_cpu,
max_cpu=bn_max_cpu, max_cpu=bn_max_cpu,
min_memory=bn_min_mem, min_memory=bn_min_mem,
...@@ -344,5 +389,84 @@ def get_config( ...@@ -344,5 +389,84 @@ def get_config(
) )
def get_validator_config(
el_cl_genesis_data,
image,
log_level,
beacon_http_url,
el_client_context,
node_keystore_files,
v_min_cpu,
v_max_cpu,
v_min_mem,
v_max_mem,
validator_service_name,
extra_params,
extra_labels,
):
validator_keys_dirpath = ""
validator_secrets_dirpath = ""
if node_keystore_files != None:
validator_keys_dirpath = shared_utils.path_join(
VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS,
node_keystore_files.teku_keys_relative_dirpath,
)
validator_secrets_dirpath = shared_utils.path_join(
VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS,
node_keystore_files.teku_secrets_relative_dirpath,
)
cmd = [
"validator-client",
"--logging=" + log_level,
"--network="
+ constants.GENESIS_CONFIG_MOUNT_PATH_ON_CONTAINER
+ "/config.yaml",
"--data-path=" + CONSENSUS_DATA_DIRPATH_ON_SERVICE_CONTAINER,
"--data-validator-path=" + CONSENSUS_DATA_DIRPATH_ON_SERVICE_CONTAINER,
"--beacon-node-api-endpoint=" + beacon_http_url,
"--validator-keys={0}:{1}".format(
validator_keys_dirpath,
validator_secrets_dirpath,
),
"--validators-proposer-default-fee-recipient="
+ constants.VALIDATING_REWARDS_ACCOUNT,
"--validators-graffiti="
+ constants.CL_CLIENT_TYPE.teku
+ "-"
+ el_client_context.client_name,
# vvvvvvvvvvvvvvvvvvv METRICS CONFIG vvvvvvvvvvvvvvvvvvvvv
"--metrics-enabled=true",
"--metrics-host-allowlist=*",
"--metrics-interface=0.0.0.0",
"--metrics-port={0}".format(VALIDATOR_METRICS_PORT_NUM),
]
if len(extra_params) > 0:
cmd.extend([param for param in extra_params if param != "--split=true"])
return ServiceConfig(
image=image,
ports=VALIDATOR_USED_PORTS,
cmd=cmd,
files={
constants.GENESIS_DATA_MOUNTPOINT_ON_CLIENTS: el_cl_genesis_data.files_artifact_uuid,
VALIDATOR_KEYS_MOUNTPOINT_ON_CLIENTS: node_keystore_files.files_artifact_uuid,
},
private_ip_address_placeholder=PRIVATE_IP_ADDRESS_PLACEHOLDER,
min_cpu=v_min_cpu,
max_cpu=v_max_cpu,
min_memory=v_min_mem,
max_memory=v_max_mem,
labels=shared_utils.label_maker(
constants.CL_CLIENT_TYPE.teku,
constants.CLIENT_TYPES.validator,
image,
el_client_context.client_name,
extra_labels,
),
)
def new_teku_launcher(el_cl_genesis_data): def new_teku_launcher(el_cl_genesis_data):
return struct(el_cl_genesis_data=el_cl_genesis_data) return struct(el_cl_genesis_data=el_cl_genesis_data)
src/prelaunch_data_generator/validator_keystores/validator_keystore_generator.star
View file @ 51f76bd1
...@@ -102,8 +102,15 @@ def generate_validator_keystores(plan, mnemonic, participants): ...@@ -102,8 +102,15 @@ def generate_validator_keystores(plan, mnemonic, participants):
start_index, start_index,
stop_index, stop_index,
) )
teku_permissions_cmd = (
"chmod 0777 -R " + output_dirpath + "/" + TEKU_KEYS_DIRNAME
)
raw_secret_permissions_cmd = (
"chmod 0600 -R " + output_dirpath + "/" + RAW_SECRETS_DIRNAME
)
all_sub_command_strs.append(generate_keystores_cmd) all_sub_command_strs.append(generate_keystores_cmd)
all_sub_command_strs.append(teku_permissions_cmd)
all_sub_command_strs.append(raw_secret_permissions_cmd)
all_output_dirpaths.append(output_dirpath) all_output_dirpaths.append(output_dirpath)
command_str = " && ".join(all_sub_command_strs) command_str = " && ".join(all_sub_command_strs)
......
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