From 607d9baae9ec638067eba386bb69baf04d0838fe Mon Sep 17 00:00:00 2001 From: Barnabas Busa Date: Thu, 26 Oct 2023 14:40:32 +0200 Subject: [PATCH] make everything a constant --- src/cl/lighthouse/lighthouse_launcher.star | 10 ++++++++-- src/cl/lodestar/lodestar_launcher.star | 10 ++++++++-- src/cl/nimbus/nimbus_launcher.star | 5 ++++- src/cl/prysm/prysm_launcher.star | 10 ++++++++-- src/cl/teku/teku_launcher.star | 5 ++++- src/el/besu/besu_launcher.star | 7 ++++++- src/el/erigon/erigon_launcher.star | 7 ++++++- src/el/ethereumjs/ethereumjs_launcher.star | 5 ++++- src/el/geth/geth_launcher.star | 7 ++++++- src/el/nethermind/nethermind_launcher.star | 5 ++++- src/el/reth/reth_launcher.star | 7 ++++++- src/package_io/constants.star | 6 ++++++ 12 files changed, 70 insertions(+), 14 deletions(-) diff --git a/src/cl/lighthouse/lighthouse_launcher.star b/src/cl/lighthouse/lighthouse_launcher.star index ace8b633e..6349a93ce 100644 --- a/src/cl/lighthouse/lighthouse_launcher.star +++ b/src/cl/lighthouse/lighthouse_launcher.star @@ -343,7 +343,10 @@ def get_beacon_config( min_memory=bn_min_mem, max_memory=bn_max_mem, labels=shared_utils.label_maker( - "lighthouse", "beacon", image, el_client_context.client_name + constants.CL_CLIENT_TYPE.lighthouse, + constants.CLIENT_TYPES.cl, + image, + el_client_context.client_name, ), ) @@ -413,7 +416,10 @@ def get_validator_config( min_memory=v_min_mem, max_memory=v_max_mem, labels=shared_utils.label_maker( - "lighthouse", "validator", image, el_client_context.client_name + constants.CL_CLIENT_TYPE.lighthouse, + constants.CLIENT_TYPES.validator, + image, + el_client_context.client_name, ), ) diff --git a/src/cl/lodestar/lodestar_launcher.star b/src/cl/lodestar/lodestar_launcher.star index ed795d8dd..cd7a62086 100644 --- a/src/cl/lodestar/lodestar_launcher.star +++ b/src/cl/lodestar/lodestar_launcher.star @@ -288,7 +288,10 @@ def get_beacon_config( min_memory=bn_min_mem, max_memory=bn_max_mem, labels=shared_utils.label_maker( - "lodestar", "beacon", image, el_client_context.client_name + constants.CL_CLIENT_TYPE.lodestar, + constants.CLIENT_TYPES.cl, + image, + el_client_context.client_name, ), ) @@ -357,7 +360,10 @@ def get_validator_config( min_memory=v_min_mem, max_memory=v_max_mem, labels=shared_utils.label_maker( - "lodestar", "validator", image, el_client_context.client_name + constants.CL_CLIENT_TYPE.lodestar, + constants.CLIENT_TYPES.validator, + image, + el_client_context.client_name, ), ) diff --git a/src/cl/nimbus/nimbus_launcher.star b/src/cl/nimbus/nimbus_launcher.star index 099a326d5..2af4c2c0b 100644 --- a/src/cl/nimbus/nimbus_launcher.star +++ b/src/cl/nimbus/nimbus_launcher.star @@ -316,7 +316,10 @@ def get_config( min_memory=bn_min_mem, max_memory=bn_max_mem, labels=shared_utils.label_maker( - "nimbus", "beacon", image, el_client_context.client_name + constants.CL_CLIENT_TYPE.nimbus, + constants.CLIENT_TYPES.cl, + image, + el_client_context.client_name, ), ) diff --git a/src/cl/prysm/prysm_launcher.star b/src/cl/prysm/prysm_launcher.star index 2b4d26897..2e1a782d6 100644 --- a/src/cl/prysm/prysm_launcher.star +++ b/src/cl/prysm/prysm_launcher.star @@ -317,7 +317,10 @@ def get_beacon_config( min_memory=bn_min_mem, max_memory=bn_max_mem, labels=shared_utils.label_maker( - "prysm", "beacon", beacon_image, el_client_context.client_name + constants.CL_CLIENT_TYPE.prysm, + constants.CLIENT_TYPES.cl, + beacon_image, + el_client_context.client_name, ), ) @@ -388,7 +391,10 @@ def get_validator_config( min_memory=v_min_mem, max_memory=v_max_mem, labels=shared_utils.label_maker( - "prysm", "validator", validator_image, el_client_context.client_name + constants.CL_CLIENT_TYPE.prysm, + constants.CLIENT_TYPES.validator, + validator_image, + el_client_context.client_name, ), ) diff --git a/src/cl/teku/teku_launcher.star b/src/cl/teku/teku_launcher.star index fcdf19629..faedc6c60 100644 --- a/src/cl/teku/teku_launcher.star +++ b/src/cl/teku/teku_launcher.star @@ -321,7 +321,10 @@ def get_config( min_memory=bn_min_mem, max_memory=bn_max_mem, labels=shared_utils.label_maker( - "teku", "beacon", image, el_client_context.client_name + constants.CL_CLIENT_TYPE.teku, + constants.CLIENT_TYPES.cl, + image, + el_client_context.client_name, ), ) diff --git a/src/el/besu/besu_launcher.star b/src/el/besu/besu_launcher.star index 8d930b62d..9500503dd 100644 --- a/src/el/besu/besu_launcher.star +++ b/src/el/besu/besu_launcher.star @@ -201,7 +201,12 @@ def get_config( min_memory=el_min_mem, max_memory=el_max_mem, env_vars=extra_env_vars, - labels=shared_utils.label_maker("besu", "execution", image, cl_client_name), + labels=shared_utils.label_maker( + constants.EL_CLIENT_TYPE.besu, + constants.CLIENT_TYPES.el, + image, + cl_client_name, + ), ) diff --git a/src/el/erigon/erigon_launcher.star b/src/el/erigon/erigon_launcher.star index bcb8c320b..952f8c645 100644 --- a/src/el/erigon/erigon_launcher.star +++ b/src/el/erigon/erigon_launcher.star @@ -213,7 +213,12 @@ def get_config( min_memory=el_min_mem, max_memory=el_max_mem, env_vars=extra_env_vars, - labels=shared_utils.label_maker("erigon", "execution", image, cl_client_name), + labels=shared_utils.label_maker( + constants.EL_CLIENT_TYPE.erigon, + constants.CLIENT_TYPES.el, + image, + cl_client_name, + ), ) diff --git a/src/el/ethereumjs/ethereumjs_launcher.star b/src/el/ethereumjs/ethereumjs_launcher.star index bbebbc93c..e6a62f000 100644 --- a/src/el/ethereumjs/ethereumjs_launcher.star +++ b/src/el/ethereumjs/ethereumjs_launcher.star @@ -194,7 +194,10 @@ def get_config( max_memory=el_max_mem, env_vars=extra_env_vars, labels=shared_utils.label_maker( - "ethereumjs", "execution", image, cl_client_name + constants.EL_CLIENT_TYPE.ethereumjs, + constants.CLIENT_TYPES.el, + image, + cl_client_name, ), ) diff --git a/src/el/geth/geth_launcher.star b/src/el/geth/geth_launcher.star index 40b4a7a83..044f679a7 100644 --- a/src/el/geth/geth_launcher.star +++ b/src/el/geth/geth_launcher.star @@ -263,7 +263,12 @@ def get_config( min_memory=el_min_mem, max_memory=el_max_mem, env_vars=extra_env_vars, - labels=shared_utils.label_maker("geth", "execution", image, cl_client_name), + labels=shared_utils.label_maker( + constants.EL_CLIENT_TYPE.geth, + constants.CLIENT_TYPES.el, + image, + cl_client_name, + ), ) diff --git a/src/el/nethermind/nethermind_launcher.star b/src/el/nethermind/nethermind_launcher.star index 6aaaefaee..999a7091c 100644 --- a/src/el/nethermind/nethermind_launcher.star +++ b/src/el/nethermind/nethermind_launcher.star @@ -189,7 +189,10 @@ def get_config( max_memory=el_max_mem, env_vars=extra_env_vars, labels=shared_utils.label_maker( - "nethermind", "execution", image, cl_client_name + constants.EL_CLIENT_TYPE.nethermind, + constants.CLIENT_TYPES.el, + image, + cl_client_name, ), ) diff --git a/src/el/reth/reth_launcher.star b/src/el/reth/reth_launcher.star index 59fc8a1cc..5eb15c0ad 100644 --- a/src/el/reth/reth_launcher.star +++ b/src/el/reth/reth_launcher.star @@ -205,7 +205,12 @@ def get_config( min_memory=el_min_mem, max_memory=el_max_mem, env_vars=extra_env_vars, - labels=shared_utils.label_maker("reth", "execution", image, cl_client_name), + labels=shared_utils.label_maker( + constants.EL_CLIENT_TYPE.reth, + constants.CLIENT_TYPES.el, + image, + cl_client_name, + ), ) diff --git a/src/package_io/constants.star b/src/package_io/constants.star index b48322337..660ec4fd2 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -23,6 +23,12 @@ GLOBAL_CLIENT_LOG_LEVEL = struct( trace="trace", ) +CLIENT_TYPES = struct( + el="execution", + cl="beacon", + validator="validator", +) + VALIDATING_REWARDS_ACCOUNT = "0x878705ba3f8Bc32FCf7F4CAa1A35E72AF65CF766" MAX_ENR_ENTRIES = 20 MAX_ENODE_ENTRIES = 20