diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java index 7e2df08f36a..6149f01c64c 100644 --- a/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java +++ b/teku/src/main/java/tech/pegasys/teku/cli/options/ExecutionEngineOptions.java @@ -29,8 +29,7 @@ public class ExecutionEngineOptions { names = {"--ee-endpoint"}, paramLabel = "", description = "URL for Execution Engine node.", - arity = "1", - hidden = true) + arity = "1") private String executionEngineEndpoint = null; @Option( @@ -51,7 +50,6 @@ public class ExecutionEngineOptions { private List mevUrls = new ArrayList<>(); @Option( - hidden = true, names = {"--ee-jwt-secret-file"}, paramLabel = "", description = diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorProposerOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorProposerOptions.java index 9b7983f2026..d29e19689ab 100644 --- a/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorProposerOptions.java +++ b/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorProposerOptions.java @@ -13,36 +13,35 @@ package tech.pegasys.teku.cli.options; +import picocli.CommandLine.Help.Visibility; import picocli.CommandLine.Option; import tech.pegasys.teku.config.TekuConfiguration; import tech.pegasys.teku.validator.api.ValidatorConfig; public class ValidatorProposerOptions { @Option( - names = {"--Xvalidators-proposer-default-fee-recipient"}, + names = {"--validators-proposer-default-fee-recipient"}, paramLabel = "
", description = "Default fee recipient sent to the execution engine, which could use it as fee recipient when producing a new execution block.", - arity = "0..1", - hidden = true) + arity = "0..1") private String proposerDefaultFeeRecipient = null; @Option( - names = {"--Xvalidators-proposer-config"}, + names = {"--validators-proposer-config"}, paramLabel = "", description = "remote URL or local file path to load proposer configuration from", - arity = "0..1", - hidden = true) + arity = "0..1") private String proposerConfig = null; @Option( - names = {"--Xvalidators-proposer-config-refresh-enabled"}, + names = {"--validators-proposer-config-refresh-enabled"}, paramLabel = "", + showDefaultValue = Visibility.ALWAYS, description = "Enable the proposer configuration reload on every proposer preparation (once per epoch)", arity = "0..1", - fallbackValue = "true", - hidden = true) + fallbackValue = "true") private boolean proposerConfigRefreshEnabled = ValidatorConfig.DEFAULT_VALIDATOR_PROPOSER_CONFIG_REFRESH_ENABLED; diff --git a/teku/src/test/java/tech/pegasys/teku/cli/options/ValidatorOptionsTest.java b/teku/src/test/java/tech/pegasys/teku/cli/options/ValidatorOptionsTest.java index 67dbaf1e1ae..50fe3a88839 100644 --- a/teku/src/test/java/tech/pegasys/teku/cli/options/ValidatorOptionsTest.java +++ b/teku/src/test/java/tech/pegasys/teku/cli/options/ValidatorOptionsTest.java @@ -109,7 +109,7 @@ public void shouldReportEmptyIfFeeRecipientNotSpecified() { @Test public void shouldReportAddressIfFeeRecipientSpecified() { final String[] args = { - "--Xvalidators-proposer-default-fee-recipient", "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" + "--validators-proposer-default-fee-recipient", "0xfe3b557e8fb62b89f4916b721be55ceb828dbd73" }; final TekuConfiguration config = getTekuConfigurationFromArguments(args); assertThat(config.validatorClient().getValidatorConfig().getProposerDefaultFeeRecipient()) diff --git a/validator/api/src/main/java/tech/pegasys/teku/validator/api/ValidatorConfig.java b/validator/api/src/main/java/tech/pegasys/teku/validator/api/ValidatorConfig.java index 80ed0a237f3..160b2192ca2 100644 --- a/validator/api/src/main/java/tech/pegasys/teku/validator/api/ValidatorConfig.java +++ b/validator/api/src/main/java/tech/pegasys/teku/validator/api/ValidatorConfig.java @@ -185,7 +185,7 @@ private void validateProposerDefaultFeeRecipientOrProposerConfigSource() { && proposerConfigSource.isEmpty() && !(validatorKeys.isEmpty() && validatorExternalSignerPublicKeySources.isEmpty())) { throw new InvalidConfigurationException( - "Invalid configuration. --Xvalidators-proposer-default-fee-recipient or --Xvalidators-proposer-config must be specified when Bellatrix milestone is active"); + "Invalid configuration. --validators-proposer-default-fee-recipient or --validators-proposer-config must be specified when Bellatrix milestone is active"); } } diff --git a/validator/api/src/test/java/tech/pegasys/teku/validator/api/ValidatorConfigTest.java b/validator/api/src/test/java/tech/pegasys/teku/validator/api/ValidatorConfigTest.java index b7b6f3c9df1..e03bbbad590 100644 --- a/validator/api/src/test/java/tech/pegasys/teku/validator/api/ValidatorConfigTest.java +++ b/validator/api/src/test/java/tech/pegasys/teku/validator/api/ValidatorConfigTest.java @@ -179,6 +179,6 @@ void verifyProposerConfigOrProposerDefaultFeeRecipientThrow(final Runnable task) Assertions.assertThatExceptionOfType(InvalidConfigurationException.class) .isThrownBy(task::run) .withMessageContaining( - "Invalid configuration. --Xvalidators-proposer-default-fee-recipient or --Xvalidators-proposer-config must be specified when Bellatrix milestone is active"); + "Invalid configuration. --validators-proposer-default-fee-recipient or --validators-proposer-config must be specified when Bellatrix milestone is active"); } } diff --git a/validator/client/src/main/java/tech/pegasys/teku/validator/client/BeaconProposerPreparer.java b/validator/client/src/main/java/tech/pegasys/teku/validator/client/BeaconProposerPreparer.java index 180749e1e83..a25c8037557 100644 --- a/validator/client/src/main/java/tech/pegasys/teku/validator/client/BeaconProposerPreparer.java +++ b/validator/client/src/main/java/tech/pegasys/teku/validator/client/BeaconProposerPreparer.java @@ -117,7 +117,7 @@ private Bytes20 getDefaultFeeRecipient(Optional maybeProposerCon .orElseThrow( () -> new InvalidConfigurationException( - "Invalid configuration. --Xvalidators-proposer-default-fee-recipient must be specified when Bellatrix milestone is active")); + "Invalid configuration. --validators-proposer-default-fee-recipient must be specified when Bellatrix milestone is active")); } @Override