Fix deposit data check

src/commands/start_api.py

@@ -175,7 +175,6 @@
     ),
     default=RelayerTypes.DEFAULT,
     help='Relayer type.',
-    prompt='Enter the relayer type',
     envvar='RELAYER_TYPE',
 )
 @click.option(

src/common/startup_check.py

@@ -234,14 +234,17 @@ async def startup_checks() -> None:
         logger.info('Checking metrics server...')
         check_metrics_port()
 
-    if settings.validators_registration_mode == ValidatorsRegistrationMode.AUTO:
+    if settings.need_deposit_data_file:
         logger.info('Checking deposit data file...')
         await wait_for_deposit_data_file()
 
-        if settings.keystore_cls_str == LocalKeystore.__name__:
-            logger.info('Checking keystores dir...')
-            wait_for_keystores_dir()
-            logger.info('Found keystores dir')
+    if (
+        settings.validators_registration_mode == ValidatorsRegistrationMode.AUTO
+        and settings.keystore_cls_str == LocalKeystore.__name__
+    ):
+        logger.info('Checking keystores dir...')
+        wait_for_keystores_dir()
+        logger.info('Found keystores dir')
 
     await _check_validators_manager()
 

src/config/settings.py

@@ -267,6 +267,21 @@ def network_config(self) -> NetworkConfig:
     def is_genesis_vault(self) -> bool:
         return self.vault == settings.network_config.GENESIS_VAULT_CONTRACT_ADDRESS
 
+    @property
+    def need_deposit_data_file(self) -> bool:
+        if self.validators_registration_mode == ValidatorsRegistrationMode.AUTO:
+            return True
+
+        # At this point validators_registration_mode is API
+        if self.relayer_type == RelayerTypes.DVT:
+            # Validator registration data is taken from deposit data file.
+            # DVT Relayer provides exit signature.
+            return True
+
+        # Validator registration data is provided by Relayer.
+        # Validators manager signature is used instead of Merkle proof.
+        return False
+
 
 settings = Settings()