diff --git a/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorClientOptions.java b/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorClientOptions.java index ee7e40ff302..67ef75abbc3 100644 --- a/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorClientOptions.java +++ b/teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorClientOptions.java @@ -75,7 +75,7 @@ public class ValidatorClientOptions { ValidatorConfig.DEFAULT_VALIDATOR_CLIENT_USE_POST_VALIDATORS_ENDPOINT_ENABLED; @Option( - names = {"--Xdvt-integration-enabled"}, + names = {"--Xobol-dvt-integration-enabled"}, paramLabel = "", description = "Use DVT endpoints to determine if a distributed validator has aggregation duties.", @@ -83,8 +83,8 @@ public class ValidatorClientOptions { showDefaultValue = CommandLine.Help.Visibility.ALWAYS, hidden = true, fallbackValue = "true") - private boolean dvtSelectionsEndpointEnabled = - ValidatorConfig.DEFAULT_DVT_SELECTIONS_ENDPOINT_ENABLED; + private boolean obolDvtSelectionsEndpointEnabled = + ValidatorConfig.DEFAULT_OBOL_DVT_SELECTIONS_ENDPOINT_ENABLED; public void configure(TekuConfiguration.Builder builder) { configureBeaconNodeApiEndpoints(); @@ -99,7 +99,7 @@ public void configure(TekuConfiguration.Builder builder) { .failoversSendSubnetSubscriptionsEnabled(failoversSendSubnetSubscriptionsEnabled) .failoversPublishSignedDutiesEnabled(failoversPublishSignedDutiesEnabled) .sentryNodeConfigurationFile(exclusiveParams.sentryConfigFile) - .dvtSelectionsEndpointEnabled(dvtSelectionsEndpointEnabled)); + .obolDvtSelectionsEndpointEnabled(obolDvtSelectionsEndpointEnabled)); } private void configureBeaconNodeApiEndpoints() { diff --git a/teku/src/test/java/tech/pegasys/teku/cli/subcommand/ValidatorClientCommandTest.java b/teku/src/test/java/tech/pegasys/teku/cli/subcommand/ValidatorClientCommandTest.java index 37662df0c7f..25997c0737a 100644 --- a/teku/src/test/java/tech/pegasys/teku/cli/subcommand/ValidatorClientCommandTest.java +++ b/teku/src/test/java/tech/pegasys/teku/cli/subcommand/ValidatorClientCommandTest.java @@ -211,8 +211,8 @@ public void clientExecutorThreadsShouldThrowOverLimit() { } @Test - public void shouldSetUseDvtSelectionsEndpoint() { - final String[] args = {"vc", "--network", "minimal", "--Xdvt-integration-enabled"}; + public void shouldSetUseObolDvtSelectionsEndpoint() { + final String[] args = {"vc", "--network", "minimal", "--Xobol-dvt-integration-enabled"}; final TekuConfiguration config = getTekuConfigurationFromArguments(args); assertThat(config.validatorClient().getValidatorConfig().isDvtSelectionsEndpointEnabled()) @@ -220,7 +220,7 @@ public void shouldSetUseDvtSelectionsEndpoint() { } @Test - public void shouldNotUseDvtSelectionsEndpointByDefault() { + public void shouldNotUseObolDvtSelectionsEndpointByDefault() { final String[] args = {"vc", "--network", "minimal"}; final TekuConfiguration config = getTekuConfigurationFromArguments(args); assertThat(config.validatorClient().getValidatorConfig().isDvtSelectionsEndpointEnabled()) 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 de0cef86078..eb8cb7727f0 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 @@ -65,7 +65,7 @@ public class ValidatorConfig { public static final boolean DEFAULT_VALIDATOR_BLINDED_BLOCKS_ENABLED = false; public static final int DEFAULT_VALIDATOR_REGISTRATION_SENDING_BATCH_SIZE = 100; public static final UInt64 DEFAULT_BUILDER_REGISTRATION_GAS_LIMIT = UInt64.valueOf(30_000_000); - public static final boolean DEFAULT_DVT_SELECTIONS_ENDPOINT_ENABLED = false; + public static final boolean DEFAULT_OBOL_DVT_SELECTIONS_ENDPOINT_ENABLED = false; private final List validatorKeys; private final List validatorExternalSignerPublicKeySources; @@ -406,7 +406,7 @@ public static final class Builder { private int executorThreads = DEFAULT_VALIDATOR_EXECUTOR_THREADS; private boolean isLocalSlashingProtectionSynchronizedModeEnabled = DEFAULT_VALIDATOR_IS_LOCAL_SLASHING_PROTECTION_SYNCHRONIZED_ENABLED; - private boolean dvtSelectionsEndpointEnabled = DEFAULT_DVT_SELECTIONS_ENDPOINT_ENABLED; + private boolean dvtSelectionsEndpointEnabled = DEFAULT_OBOL_DVT_SELECTIONS_ENDPOINT_ENABLED; private Builder() {} @@ -647,7 +647,7 @@ public Builder isLocalSlashingProtectionSynchronizedModeEnabled( return this; } - public Builder dvtSelectionsEndpointEnabled(final boolean dvtSelectionsEndpointEnabled) { + public Builder obolDvtSelectionsEndpointEnabled(final boolean dvtSelectionsEndpointEnabled) { this.dvtSelectionsEndpointEnabled = dvtSelectionsEndpointEnabled; return this; }