Skip to content

fix: participant redefining global flag #573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barnabasbusa merged 1 commit into from
Apr 23, 2024
Merged

fix: participant redefining global flag #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,16 +401,16 @@ participants:
count: 1

# Snooper can be enabled with the `snooper_enabled` flag per client or globally
# Defaults to false
snooper_enabled: false
# Defaults null and then set to global snooper default (false)
snooper_enabled: null

# Enables Ethereum Metrics Exporter for this participant. Can be set globally.
# Defaults to false
ethereum_metrics_exporter_enabled: false
# Defaults null and then set to global ethereum_metrics_exporter_enabled (false)
ethereum_metrics_exporter_enabled: null

# Enables Xatu Sentry for this participant. Can be set globally.
# Defaults to false
xatu_sentry_enabled: false
# Defaults null and then set to global xatu_sentry_enabled (false)
xatu_sentry_enabled: null

# Prometheus additional configuration for a given participant prometheus target.
# Execution, beacon and validator client targets on prometheus will include this
Expand Down Expand Up @@ -443,8 +443,8 @@ participants:

# Participant flag for keymanager api
# This will open up http ports to your validator services!
# Defaults to false
keymanager_enabled: false
# Defaults null and then set to default global keymanager_enabled (false)
keymanager_enabled: null

# Default configuration parameters for the network
network_params:
Expand Down
45 changes: 16 additions & 29 deletions src/package_io/input_parser.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,53 +425,40 @@ def parse_network_params(input_args):
participant["vc_image"] = default_image

snooper_enabled = participant["snooper_enabled"]
if snooper_enabled == False:
default_snooper_enabled = result["snooper_enabled"]
if default_snooper_enabled:
participant["snooper_enabled"] = default_snooper_enabled
if snooper_enabled == None:
participant["snooper_enabled"] = result["snooper_enabled"]

keymanager_enabled = participant["keymanager_enabled"]
if keymanager_enabled == False:
default_keymanager_enabled = result["keymanager_enabled"]
if default_keymanager_enabled:
participant["keymanager_enabled"] = default_keymanager_enabled
if keymanager_enabled == None:
participant["keymanager_enabled"] = result["keymanager_enabled"]

ethereum_metrics_exporter_enabled = participant[
"ethereum_metrics_exporter_enabled"
]
if ethereum_metrics_exporter_enabled == None:
participant["ethereum_metrics_exporter_enabled"] = result[
"ethereum_metrics_exporter_enabled"
]

xatu_sentry_enabled = participant["xatu_sentry_enabled"]
if xatu_sentry_enabled == None:
participant["xatu_sentry_enabled"] = result["xatu_sentry_enabled"]

blobber_enabled = participant["blobber_enabled"]
if blobber_enabled:
# unless we are running lighthouse, we don't support blobber
if participant["cl_type"] != "lighthouse":
if participant["cl_type"] != constants.CL_TYPE.lighthouse:
fail(
"blobber is not supported for {0} client".format(
participant["cl_type"]
)
)

if ethereum_metrics_exporter_enabled == False:
default_ethereum_metrics_exporter_enabled = result[
"ethereum_metrics_exporter_enabled"
]
if default_ethereum_metrics_exporter_enabled:
participant[
"ethereum_metrics_exporter_enabled"
] = default_ethereum_metrics_exporter_enabled

if xatu_sentry_enabled == False:
default_xatu_sentry_enabled = result["xatu_sentry_enabled"]
if default_xatu_sentry_enabled:
participant["xatu_sentry_enabled"] = default_xatu_sentry_enabled

validator_count = participant["validator_count"]
if validator_count == None:
default_validator_count = result["network_params"][
participant["validator_count"] = result["network_params"][
"num_validator_keys_per_node"
]
participant["validator_count"] = default_validator_count

actual_num_validators += participant["validator_count"]

Expand Down Expand Up @@ -692,17 +679,17 @@ def default_participant():
"node_selectors": {},
"tolerations": [],
"count": 1,
"snooper_enabled": False,
"ethereum_metrics_exporter_enabled": False,
"xatu_sentry_enabled": False,
"snooper_enabled": None,
"ethereum_metrics_exporter_enabled": None,
"xatu_sentry_enabled": None,
"prometheus_config": {
"scrape_interval": "15s",
"labels": None,
},
"blobber_enabled": False,
"blobber_extra_params": [],
"builder_network_params": None,
"keymanager_enabled": False,
"keymanager_enabled": None,
}


Expand Down