From e5d471f74b1a28891ccc04ed02335f991dee7e40 Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Wed, 13 Dec 2023 17:12:07 +0100 Subject: [PATCH 1/2] fix: fixing too long graffitis --- src/cl/lighthouse/lighthouse_launcher.star | 2 +- src/cl/lodestar/lodestar_launcher.star | 2 +- src/cl/nimbus/nimbus_launcher.star | 4 ++-- src/cl/prysm/prysm_launcher.star | 2 +- src/cl/teku/teku_launcher.star | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star index 8730a8ca1..d08688fbe 100644 --- a/src/cl/lighthouse/lighthouse_launcher.star +++ b/src/cl/lighthouse/lighthouse_launcher.star @@ -430,7 +430,7 @@ def get_validator_config( "--metrics-allow-origin=*", "--metrics-port={0}".format(VALIDATOR_METRICS_PORT_NUM), # ^^^^^^^^^^^^^^^^^^^ PROMETHEUS CONFIG ^^^^^^^^^^^^^^^^^^^^^ - "--graffiti=" + validator_node_service_name, + "--graffiti=" + constants.CL_CLIENT_TYPE.lighthouse + "-" + el_client_context.client_name, ] if len(extra_params): diff --git a/src/cl/lodestar/lodestar_launcher.star b/src/cl/lodestar/lodestar_launcher.star index bf0dd096d..e3929b1bf 100644 --- a/src/cl/lodestar/lodestar_launcher.star +++ b/src/cl/lodestar/lodestar_launcher.star @@ -375,7 +375,7 @@ def get_validator_config( "--metrics.address=0.0.0.0", "--metrics.port={0}".format(METRICS_PORT_NUM), # ^^^^^^^^^^^^^^^^^^^ PROMETHEUS CONFIG ^^^^^^^^^^^^^^^^^^^^^ - "--graffiti=" + validator_node_service_name, + "--graffiti=" + constants.CL_CLIENT_TYPE.lodestar + "-" + el_client_context.client_name, ] if len(extra_params) > 0: diff --git a/src/cl/nimbus/nimbus_launcher.star b/src/cl/nimbus/nimbus_launcher.star index 9e6220b0a..c5b7b79ba 100644 --- a/src/cl/nimbus/nimbus_launcher.star +++ b/src/cl/nimbus/nimbus_launcher.star @@ -336,7 +336,7 @@ def get_beacon_config( "--validators-dir=" + validator_keys_dirpath, "--secrets-dir=" + validator_secrets_dirpath, "--suggested-fee-recipient=" + constants.VALIDATING_REWARDS_ACCOUNT, - "--graffiti=" + beacon_node_service_name, + "--graffiti=" + constants.CL_CLIENT_TYPE.nimbus + "-" + el_client_context.client_name, ] if node_keystore_files != None and not split_mode_enabled: @@ -421,7 +421,7 @@ def get_validator_config( "--metrics", "--metrics-address=0.0.0.0", "--metrics-port={0}".format(VALIDATOR_METRICS_PORT_NUM), - "--graffiti=" + validator_node_service_name, + "--graffiti=" + constants.CL_CLIENT_TYPE.nimbus + "-" + el_client_context.client_name, ] if len(extra_params) > 0: diff --git a/src/cl/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star index d60965e7e..a29d227d7 100644 --- a/src/cl/prysm/prysm_launcher.star +++ b/src/cl/prysm/prysm_launcher.star @@ -384,7 +384,7 @@ def get_validator_config( "--monitoring-host=0.0.0.0", "--monitoring-port={0}".format(VALIDATOR_MONITORING_PORT_NUM), # ^^^^^^^^^^^^^^^^^^^ METRICS CONFIG ^^^^^^^^^^^^^^^^^^^^^ - "--graffiti=" + service_name, + "--graffiti=" + constants.CL_CLIENT_TYPE.prysm + "-" + el_client_context.client_name, ] if len(extra_params) > 0: diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index ce1cd4e09..d770f9e21 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -278,7 +278,7 @@ def get_config( "--metrics-port={0}".format(METRICS_PORT_NUM), # ^^^^^^^^^^^^^^^^^^^ METRICS CONFIG ^^^^^^^^^^^^^^^^^^^^^ "--Xtrusted-setup=" + constants.KZG_DATA_DIRPATH_ON_CLIENT_CONTAINER, - "--validators-graffiti=" + service_name, + "--validators-graffiti=" + constants.CL_CLIENT_TYPE.teku + "-" + el_client_context.client_name, ] # Depending on whether we're using a node keystore, we'll need to add the validator flags From 1e143ae7d1bd884d34bac35b55134585a33644bf Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Wed, 13 Dec 2023 17:14:17 +0100 Subject: [PATCH 2/2] fix lint --- src/cl/lighthouse/lighthouse_launcher.star | 5 ++++- src/cl/lodestar/lodestar_launcher.star | 5 ++++- src/cl/nimbus/nimbus_launcher.star | 10 ++++++++-- src/cl/prysm/prysm_launcher.star | 5 ++++- src/cl/teku/teku_launcher.star | 5 ++++- 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star index d08688fbe..07732fc02 100644 --- a/src/cl/lighthouse/lighthouse_launcher.star +++ b/src/cl/lighthouse/lighthouse_launcher.star @@ -430,7 +430,10 @@ def get_validator_config( "--metrics-allow-origin=*", "--metrics-port={0}".format(VALIDATOR_METRICS_PORT_NUM), # ^^^^^^^^^^^^^^^^^^^ PROMETHEUS CONFIG ^^^^^^^^^^^^^^^^^^^^^ - "--graffiti=" + constants.CL_CLIENT_TYPE.lighthouse + "-" + el_client_context.client_name, + "--graffiti=" + + constants.CL_CLIENT_TYPE.lighthouse + + "-" + + el_client_context.client_name, ] if len(extra_params): diff --git a/src/cl/lodestar/lodestar_launcher.star b/src/cl/lodestar/lodestar_launcher.star index e3929b1bf..73161f37e 100644 --- a/src/cl/lodestar/lodestar_launcher.star +++ b/src/cl/lodestar/lodestar_launcher.star @@ -375,7 +375,10 @@ def get_validator_config( "--metrics.address=0.0.0.0", "--metrics.port={0}".format(METRICS_PORT_NUM), # ^^^^^^^^^^^^^^^^^^^ PROMETHEUS CONFIG ^^^^^^^^^^^^^^^^^^^^^ - "--graffiti=" + constants.CL_CLIENT_TYPE.lodestar + "-" + el_client_context.client_name, + "--graffiti=" + + constants.CL_CLIENT_TYPE.lodestar + + "-" + + el_client_context.client_name, ] if len(extra_params) > 0: diff --git a/src/cl/nimbus/nimbus_launcher.star b/src/cl/nimbus/nimbus_launcher.star index c5b7b79ba..d9596c0b3 100644 --- a/src/cl/nimbus/nimbus_launcher.star +++ b/src/cl/nimbus/nimbus_launcher.star @@ -336,7 +336,10 @@ def get_beacon_config( "--validators-dir=" + validator_keys_dirpath, "--secrets-dir=" + validator_secrets_dirpath, "--suggested-fee-recipient=" + constants.VALIDATING_REWARDS_ACCOUNT, - "--graffiti=" + constants.CL_CLIENT_TYPE.nimbus + "-" + el_client_context.client_name, + "--graffiti=" + + constants.CL_CLIENT_TYPE.nimbus + + "-" + + el_client_context.client_name, ] if node_keystore_files != None and not split_mode_enabled: @@ -421,7 +424,10 @@ def get_validator_config( "--metrics", "--metrics-address=0.0.0.0", "--metrics-port={0}".format(VALIDATOR_METRICS_PORT_NUM), - "--graffiti=" + constants.CL_CLIENT_TYPE.nimbus + "-" + el_client_context.client_name, + "--graffiti=" + + constants.CL_CLIENT_TYPE.nimbus + + "-" + + el_client_context.client_name, ] if len(extra_params) > 0: diff --git a/src/cl/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star index a29d227d7..b460937a3 100644 --- a/src/cl/prysm/prysm_launcher.star +++ b/src/cl/prysm/prysm_launcher.star @@ -384,7 +384,10 @@ def get_validator_config( "--monitoring-host=0.0.0.0", "--monitoring-port={0}".format(VALIDATOR_MONITORING_PORT_NUM), # ^^^^^^^^^^^^^^^^^^^ METRICS CONFIG ^^^^^^^^^^^^^^^^^^^^^ - "--graffiti=" + constants.CL_CLIENT_TYPE.prysm + "-" + el_client_context.client_name, + "--graffiti=" + + constants.CL_CLIENT_TYPE.prysm + + "-" + + el_client_context.client_name, ] if len(extra_params) > 0: diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index d770f9e21..790720aee 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -278,7 +278,10 @@ def get_config( "--metrics-port={0}".format(METRICS_PORT_NUM), # ^^^^^^^^^^^^^^^^^^^ METRICS CONFIG ^^^^^^^^^^^^^^^^^^^^^ "--Xtrusted-setup=" + constants.KZG_DATA_DIRPATH_ON_CLIENT_CONTAINER, - "--validators-graffiti=" + constants.CL_CLIENT_TYPE.teku + "-" + el_client_context.client_name, + "--validators-graffiti=" + + constants.CL_CLIENT_TYPE.teku + + "-" + + el_client_context.client_name, ] # Depending on whether we're using a node keystore, we'll need to add the validator flags