Added required `--force-bls-withdrawal-credentials` description to `--disable-deposits` usage #6436

hopinheimer · 2024-09-25T15:34:04Z

fixes #6391

CLAassistant · 2024-09-25T15:34:11Z

All committers have signed the CLA.

validator_manager/src/create_validators.rs

michaelsproul

You'll also need to rebuild the CLI docs in the book using ./scripts/cli.sh

michaelsproul · 2024-09-26T04:00:55Z

book/src/help_bn.md

-```
-
-<style> .content main {max-width:88%;} </style>
+```n<style> .content main {max-width:88%;} </style>


this looks wrong, did the script do this?

which OS did you run it on?

ran a make cli-local

yeah I thought something was off but the scripts/cli.sh had this

that regexp might need a tweak? it looks the same as the Linux one?

well today I learned I'm still a noob programmer, but yeah I was defeated by a linux command.
I think using a printf just like the command to add the code block quote right above this line just solves the problem in an easy way and sed is just a little ambiguous for different distros.

there's another issue I'd like to point out

when I run make cli which uses docker this happens, if that would have worked I would have not come across the current issue. do you want to create a separate tracking issue for that?

Hmm, I don't think that image is ever going to be public. Maybe that's just a doc issue

Oh, it is public but it doesn't work on ARM.

If you have Rosetta you can run x86_64 images on macOS using emulation. It's slower but it works.

michaelsproul · 2024-09-27T01:52:43Z

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''<style> .content main {max-width:88%;} </style>' "$file"
+    printf '%s\n\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file"


Suggested change

printf '%s\n\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file"

printf '%s\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file"

I think we might want to remove the 2nd newline. The markdown linter isn't happy

michaelsproul

Markdown linter needs appeasing

chong-he · 2024-09-27T03:13:31Z

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''<style> .content main {max-width:88%;} </style>' "$file"
+    printf '%s\n\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file"


For consistency, may I suggest we use double quote "" (as in the code above)? We can also remove the '' in the middle of the line for simplicity.
The following should do it:

Suggested change

printf '%s\n\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file"

printf "\n\n%s\n" "<style> .content main {max-width:88%;} </style>" >> "$file"

The \n\n is to create an empty line after the code block

I've made the requested changes @chong-he

chong-he · 2024-10-03T03:20:37Z

This looks good now, all checks passed

hopinheimer · 2024-10-07T22:44:14Z

can this be merged? I'm using the changes in a different PR and yes I will shift to ubuntu soon :)

jxs

LGTM! Thanks!

jxs · 2024-10-09T14:58:43Z

@Mergifyio queue

mergify · 2024-10-09T14:59:11Z

queue

🛑 Branch protection settings are not validated anymore

Branch protection is enabled and is preventing Mergify to merge the pull request. Mergify will merge when branch protection settings validate the pull request once again. (detail: 1 review requesting changes and 1 approving review by reviewers with write access.)

AgeManning · 2024-10-09T21:44:13Z

@Mergifyio queue

mergify · 2024-10-09T21:44:27Z

queue

🛑 The pull request has been removed from the queue `default`

Pull request #6436 has been dequeued. Branch protection settings are not validated anymore. Branch protection is enabled and is preventing Mergify to merge the pull request. Mergify will merge when branch protection settings validate the pull request once again. (detail: 1 review requesting changes and 1 approving review by reviewers with write access.).

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

AgeManning · 2024-10-09T21:45:14Z

@michaelsproul - I think you might need to unblock this

jxs · 2024-10-10T11:29:28Z

@Mergifyio queue

mergify · 2024-10-10T11:29:52Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at da290e8

…-disable-deposits` usage (sigp#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

cli description

9310f16

michaelsproul reviewed Sep 26, 2024

View reviewed changes

validator_manager/src/create_validators.rs Outdated Show resolved Hide resolved

michaelsproul requested changes Sep 26, 2024

View reviewed changes

michaelsproul added the docs Documentation label Sep 26, 2024

complied docs changes

c546304

michaelsproul reviewed Sep 26, 2024

View reviewed changes

hopinheimer added 3 commits September 26, 2024 09:45

reverted changes and script amended

d4e3e60

fix

1b6717f

reverting unwanted changes

e50ae0b

michaelsproul approved these changes Sep 27, 2024

View reviewed changes

michaelsproul reviewed Sep 27, 2024

View reviewed changes

michaelsproul requested changes Sep 27, 2024

View reviewed changes

chong-he reviewed Sep 27, 2024

View reviewed changes

hopinheimer added 2 commits September 26, 2024 23:15

making linter happy

57214cb

requested changes

b653499

dapplion requested a review from michaelsproul October 2, 2024 01:53

jimmygchen added the ready-for-review The code is ready for review label Oct 3, 2024

hopinheimer mentioned this pull request Oct 8, 2024

IDONTWANT message optimisation to cutoff for smaller messages #6456

Merged

Merge branch 'unstable' into cli-fix

3882ffb

jxs approved these changes Oct 9, 2024

View reviewed changes

AgeManning approved these changes Oct 9, 2024

View reviewed changes

michaelsproul approved these changes Oct 10, 2024

View reviewed changes

Merge branch 'unstable' into cli-fix

adf3f9d

mergify bot merged commit da290e8 into sigp:unstable Oct 10, 2024
30 checks passed

chong-he mentioned this pull request Oct 11, 2024

--disable-deposits flag of validator manager create command requires BLS withdrawal credentials with unclear failure message #6391

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added required `--force-bls-withdrawal-credentials` description to `--disable-deposits` usage #6436

Added required `--force-bls-withdrawal-credentials` description to `--disable-deposits` usage #6436

hopinheimer commented Sep 25, 2024

CLAassistant commented Sep 25, 2024 •

edited

Loading

michaelsproul left a comment

michaelsproul Sep 26, 2024

michaelsproul Sep 26, 2024

hopinheimer Sep 26, 2024 •

edited

Loading

hopinheimer Sep 26, 2024

hopinheimer Sep 26, 2024 •

edited

Loading

michaelsproul Sep 26, 2024

hopinheimer Sep 26, 2024

michaelsproul Sep 27, 2024

michaelsproul Sep 27, 2024

michaelsproul Sep 27, 2024

michaelsproul Sep 27, 2024

michaelsproul left a comment

chong-he Sep 27, 2024 •

edited

Loading

hopinheimer Sep 27, 2024

chong-he commented Oct 3, 2024

hopinheimer commented Oct 7, 2024

jxs left a comment

jxs commented Oct 9, 2024

mergify bot commented Oct 9, 2024 •

edited

Loading

AgeManning commented Oct 9, 2024

mergify bot commented Oct 9, 2024

AgeManning commented Oct 9, 2024

jxs commented Oct 10, 2024

mergify bot commented Oct 10, 2024 •

edited

Loading

	printf '%s\n\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file"
	printf '%s\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file"

	printf '%s\n\n' '' '<style> .content main {max-width:88%;} </style>' >> "$file"
	printf "\n\n%s\n" "<style> .content main {max-width:88%;} </style>" >> "$file"

Added required --force-bls-withdrawal-credentials description to --disable-deposits usage #6436

Added required --force-bls-withdrawal-credentials description to --disable-deposits usage #6436

Conversation

hopinheimer commented Sep 25, 2024

CLAassistant commented Sep 25, 2024 • edited Loading

michaelsproul left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hopinheimer Sep 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hopinheimer Sep 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

michaelsproul left a comment

Choose a reason for hiding this comment

chong-he Sep 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chong-he commented Oct 3, 2024

hopinheimer commented Oct 7, 2024

jxs left a comment

Choose a reason for hiding this comment

jxs commented Oct 9, 2024

mergify bot commented Oct 9, 2024 • edited Loading

🛑 Branch protection settings are not validated anymore

AgeManning commented Oct 9, 2024

mergify bot commented Oct 9, 2024

🛑 The pull request has been removed from the queue default

AgeManning commented Oct 9, 2024

jxs commented Oct 10, 2024

mergify bot commented Oct 10, 2024 • edited Loading

✅ The pull request has been merged automatically

Added required `--force-bls-withdrawal-credentials` description to `--disable-deposits` usage #6436

Added required `--force-bls-withdrawal-credentials` description to `--disable-deposits` usage #6436

CLAassistant commented Sep 25, 2024 •

edited

Loading

hopinheimer Sep 26, 2024 •

edited

Loading

hopinheimer Sep 26, 2024 •

edited

Loading

chong-he Sep 27, 2024 •

edited

Loading

mergify bot commented Oct 9, 2024 •

edited

Loading

🛑 The pull request has been removed from the queue `default`

mergify bot commented Oct 10, 2024 •

edited

Loading