From da290e8e2e9420a0d3f3a02012f052b90b5f6aab Mon Sep 17 00:00:00 2001
From: hopinheimer <48147533+hopinheimer@users.noreply.github.com>
Date: Thu, 10 Oct 2024 07:32:41 -0400
Subject: [PATCH] Added required `--force-bls-withdrawal-credentials`
description to `--disable-deposits` usage (#6436)
* cli description
* complied docs changes
* reverted changes and script amended
* fix
* reverting unwanted changes
* making linter happy
* requested changes
* Merge branch 'unstable' into cli-fix
* Merge branch 'unstable' into cli-fix
---
book/src/help_vm_create.md | 4 +++-
scripts/cli.sh | 2 +-
validator_manager/src/create_validators.rs | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/book/src/help_vm_create.md b/book/src/help_vm_create.md
index 1803bb534c..cde822e894 100644
--- a/book/src/help_vm_create.md
+++ b/book/src/help_vm_create.md
@@ -133,7 +133,9 @@ Flags:
When provided don't generate the deposits JSON file that is commonly
used for submitting validator deposits via a web UI. Using this flag
will save several seconds per validator if the user has an alternate
- strategy for submitting deposits.
+ strategy for submitting deposits. If used, the
+ --force-bls-withdrawal-credentials is also required to ensure users
+ are aware that an --eth1-withdrawal-address is not set.
--disable-log-timestamp
If present, do not include timestamps in logging output.
--disable-malloc-tuning
diff --git a/scripts/cli.sh b/scripts/cli.sh
index 6ca019b39e..e43c05a834 100755
--- a/scripts/cli.sh
+++ b/scripts/cli.sh
@@ -16,7 +16,7 @@ write_to_file() {
printf "# %s\n\n\`\`\`\n%s\n\`\`\`" "$program" "$cmd" > "$file"
# Adjust the width of the help text and append to the end of file
- sed -i -e '$a\'$'\n''\n''' "$file"
+ printf "\n\n%s\n" "" >> "$file"
}
CMD=./target/release/lighthouse
diff --git a/validator_manager/src/create_validators.rs b/validator_manager/src/create_validators.rs
index d06fce1d09..37a6040a9b 100644
--- a/validator_manager/src/create_validators.rs
+++ b/validator_manager/src/create_validators.rs
@@ -112,7 +112,9 @@ pub fn cli_app() -> Command {
"When provided don't generate the deposits JSON file that is \
commonly used for submitting validator deposits via a web UI. \
Using this flag will save several seconds per validator if the \
- user has an alternate strategy for submitting deposits.",
+ user has an alternate strategy for submitting deposits. \
+ If used, the --force-bls-withdrawal-credentials is also required \
+ to ensure users are aware that an --eth1-withdrawal-address is not set.",
)
.action(ArgAction::SetTrue)
.help_heading(FLAG_HEADER)