Add a CLI option to toggle feature

Author: courtneyeh

teku/src/main/java/tech/pegasys/teku/cli/options/ValidatorKeysOptions.java

@@ -48,6 +48,17 @@ public class ValidatorKeysOptions {
       arity = "0..*")
   private List<String> validatorExternalSignerPublicKeys = new ArrayList<>();
 
+  @CommandLine.Option(
+      hidden = true,
+      names = {"--Xvalidators-external-signer-public-keys-retry-enabled"},
+      paramLabel = "<BOOLEAN>",
+      showDefaultValue = CommandLine.Help.Visibility.ALWAYS,
+      fallbackValue = "true",
+      description = "Enable retry loading URL to load validators external signer public keys.",
+      arity = "0..1")
+  private boolean validatorExternalSignerPublicKeysRetryEnabled =
+      ValidatorConfig.DEFAULT_VALIDATOR_EXTERNAL_SIGNER_KEYS_RETRY_ENABLED;
+
   @CommandLine.Option(
       names = {"--validators-external-signer-url"},
       paramLabel = "<NETWORK>",
@@ -110,6 +121,8 @@ public void configure(final TekuConfiguration.Builder builder) {
             config
                 .validatorKeys(validatorKeys)
                 .validatorExternalSignerPublicKeySources(parseValidatorExternalKeys())
+                .validatorExternalSignerPublicKeysRetryEnabled(
+                    validatorExternalSignerPublicKeysRetryEnabled)
                 .validatorExternalSignerUrl(parseValidatorExternalSignerUrl())
                 .validatorExternalSignerConcurrentRequestLimit(
                     validatorExternalSignerConcurrentRequestLimit)

validator/api/src/main/java/tech/pegasys/teku/validator/api/ValidatorConfig.java

@@ -56,6 +56,7 @@ public class ValidatorConfig {
   public static final int DEFAULT_EXECUTOR_MAX_QUEUE_SIZE = 40_000;
   public static final Duration DEFAULT_VALIDATOR_EXTERNAL_SIGNER_TIMEOUT = Duration.ofSeconds(5);
   public static final int DEFAULT_VALIDATOR_EXTERNAL_SIGNER_CONCURRENT_REQUEST_LIMIT = 32;
+  public static final boolean DEFAULT_VALIDATOR_EXTERNAL_SIGNER_KEYS_RETRY_ENABLED = true;
   public static final boolean DEFAULT_VALIDATOR_KEYSTORE_LOCKING_ENABLED = true;
   public static final boolean DEFAULT_VALIDATOR_EXTERNAL_SIGNER_SLASHING_PROTECTION_ENABLED = true;
   public static final boolean DEFAULT_GENERATE_EARLY_ATTESTATIONS = true;
@@ -71,6 +72,7 @@ public class ValidatorConfig {
 
   private final List<String> validatorKeys;
   private final List<String> validatorExternalSignerPublicKeySources;
+  private final boolean validatorExternalSignerPublicKeysRetryEnabled;
   private final boolean validatorExternalSignerSlashingProtectionEnabled;
   private final URL validatorExternalSignerUrl;
   private final Optional<String> validatorExternalSignerUserInfo;
@@ -114,6 +116,7 @@ public class ValidatorConfig {
   private ValidatorConfig(
       final List<String> validatorKeys,
       final List<String> validatorExternalSignerPublicKeySources,
+      final boolean validatorExternalSignerPublicKeysRetryEnabled,
       final URL validatorExternalSignerUrl,
       final Optional<String> validatorExternalSignerUserInfo,
       final Duration validatorExternalSignerTimeout,
@@ -153,6 +156,8 @@ private ValidatorConfig(
       boolean dvtSelectionsEndpointEnabled) {
     this.validatorKeys = validatorKeys;
     this.validatorExternalSignerPublicKeySources = validatorExternalSignerPublicKeySources;
+    this.validatorExternalSignerPublicKeysRetryEnabled =
+        validatorExternalSignerPublicKeysRetryEnabled;
     this.validatorExternalSignerUrl = validatorExternalSignerUrl;
     this.validatorExternalSignerUserInfo = validatorExternalSignerUserInfo;
     this.validatorExternalSignerTimeout = validatorExternalSignerTimeout;
@@ -213,6 +218,10 @@ public List<String> getValidatorExternalSignerPublicKeySources() {
     return validatorExternalSignerPublicKeySources;
   }
 
+  public boolean validatorExternalSignerPublicKeysRetryEnabled() {
+    return validatorExternalSignerPublicKeysRetryEnabled;
+  }
+
   public boolean isValidatorExternalSignerSlashingProtectionEnabled() {
     return validatorExternalSignerSlashingProtectionEnabled;
   }
@@ -368,6 +377,8 @@ public boolean isDvtSelectionsEndpointEnabled() {
   public static final class Builder {
     private List<String> validatorKeys = new ArrayList<>();
     private List<String> validatorExternalSignerPublicKeySources = new ArrayList<>();
+    private boolean validatorExternalSignerPublicKeysRetryEnabled =
+        DEFAULT_VALIDATOR_EXTERNAL_SIGNER_KEYS_RETRY_ENABLED;
     private URL validatorExternalSignerUrl;
     private Optional<String> validatorExternalSignerUserInfo = Optional.empty();
     private int validatorExternalSignerConcurrentRequestLimit =
@@ -433,6 +444,11 @@ public Builder validatorExternalSignerPublicKeySources(
       return this;
     }
 
+    public Builder validatorExternalSignerPublicKeysRetryEnabled(final boolean enabled) {
+      this.validatorExternalSignerPublicKeysRetryEnabled = enabled;
+      return this;
+    }
+
     public Builder validatorExternalSignerUrl(final URL validatorExternalSignerUrl) {
       if (validatorExternalSignerUrl != null) {
         this.validatorExternalSignerUrl = UrlSanitizer.sanitizeUrl(validatorExternalSignerUrl);
@@ -678,6 +694,7 @@ public ValidatorConfig build() {
       return new ValidatorConfig(
           validatorKeys,
           validatorExternalSignerPublicKeySources,
+          validatorExternalSignerPublicKeysRetryEnabled,
           validatorExternalSignerUrl,
           validatorExternalSignerUserInfo,
           validatorExternalSignerTimeout,

validator/api/src/test/java/tech/pegasys/teku/validator/api/ValidatorConfigTest.java

@@ -38,6 +38,39 @@ public void shouldThrowIfExternalPublicKeysAreSpecifiedWithoutExternalSignerUrl(
             "Invalid configuration. '--validators-external-signer-url' and '--validators-external-signer-public-keys' must be specified together");
   }
 
+  @Test
+  public void shouldNotThrowIfExternalPublicKeysEnabledAreSpecifiedWithPublicKeys()
+      throws MalformedURLException {
+    final ValidatorConfig.Builder builder =
+        configBuilder
+            .validatorExternalSignerUrl(URI.create("http://localhost:9000").toURL())
+            .validatorExternalSignerPublicKeySources(List.of("http://localhost:9000/test"))
+            .validatorExternalSignerPublicKeysRetryEnabled(true);
+    Assertions.assertThatCode(builder::build).doesNotThrowAnyException();
+  }
+
+  @Test
+  public void shouldNotThrowIfExternalPublicKeysDisabledAreSpecifiedWithPublicKeys()
+      throws MalformedURLException {
+    final ValidatorConfig.Builder builder =
+        configBuilder
+            .validatorExternalSignerUrl(URI.create("http://localhost:9000").toURL())
+            .validatorExternalSignerPublicKeySources(List.of("http://localhost:9000/test"))
+            .validatorExternalSignerPublicKeysRetryEnabled(false);
+    Assertions.assertThatCode(builder::build).doesNotThrowAnyException();
+  }
+
+  @Test
+  public void shouldNotThrowIfExternalPublicKeysEnabledAreSpecifiedWithoutPublicKeys()
+      throws MalformedURLException {
+    final ValidatorConfig.Builder builder =
+        configBuilder
+            .validatorExternalSignerUrl(URI.create("http://localhost:9000").toURL())
+            .validatorExternalSignerPublicKeySources(List.of())
+            .validatorExternalSignerPublicKeysRetryEnabled(true);
+    Assertions.assertThatCode(builder::build).doesNotThrowAnyException();
+  }
+
   @Test
   public void shouldNotThrowIfExternalSignerUrlIsSpecifiedWithoutExternalPublicKeys()
       throws MalformedURLException {

validator/client/src/main/java/tech/pegasys/teku/validator/client/ValidatorClientService.java

@@ -410,8 +410,9 @@ private static ValidatorLoader createValidatorLoader(
       final AsyncRunner asyncRunner,
       final Function<BLSPublicKey, Optional<Bytes32>> updatableGraffitiProvider) {
     final Path slashingProtectionPath = getSlashingProtectionPath(services.getDataDirLayout());
+    final ValidatorConfig validatorConfig = config.getValidatorConfig();
     final SlashingProtector slashingProtector =
-        config.getValidatorConfig().isLocalSlashingProtectionSynchronizedModeEnabled()
+        validatorConfig.isLocalSlashingProtectionSynchronizedModeEnabled()
             ? new LocalSlashingProtector(
                 SyncDataAccessor.create(slashingProtectionPath), slashingProtectionPath)
             : new LocalSlashingProtectorConcurrentAccess(
@@ -420,18 +421,21 @@ private static ValidatorLoader createValidatorLoader(
         new SlashingProtectionLogger(
             slashingProtector, config.getSpec(), asyncRunner, ValidatorLogger.VALIDATOR_LOGGER);
     final Supplier<HttpClient> externalSignerHttpClientFactory =
-        HttpClientExternalSignerFactory.create(config.getValidatorConfig());
+        HttpClientExternalSignerFactory.create(validatorConfig);
+    final Optional<AsyncRunner> maybeAsyncRunner =
+        Optional.ofNullable(
+            validatorConfig.validatorExternalSignerPublicKeysRetryEnabled() ? asyncRunner : null);
     return ValidatorLoader.create(
         config.getSpec(),
-        config.getValidatorConfig(),
+        validatorConfig,
         config.getInteropConfig(),
         externalSignerHttpClientFactory,
         slashingProtector,
         slashingProtectionLogger,
         new PublicKeyLoader(
             externalSignerHttpClientFactory,
-            config.getValidatorConfig().getValidatorExternalSignerUrl(),
-            Optional.of(asyncRunner)),
+            validatorConfig.getValidatorExternalSignerUrl(),
+            maybeAsyncRunner),
         asyncRunner,
         services.getMetricsSystem(),
         config.getValidatorRestApiConfig().isRestApiEnabled()