Fix reporting unused_validators for DVT

src/commands/start_base.py

@@ -21,7 +21,7 @@
 from src.validators.keystores.load import load_keystore
 from src.validators.relayer import RelayerAdapter, create_relayer_adapter
 from src.validators.tasks import ValidatorsTask, load_genesis_validators
-from src.validators.typings import DepositData, ValidatorsRegistrationMode
+from src.validators.typings import DepositData, RelayerTypes, ValidatorsRegistrationMode
 from src.validators.utils import load_deposit_data
 
 logger = logging.getLogger(__name__)
@@ -49,6 +49,10 @@ async def start_base() -> None:
     deposit_data: DepositData | None = None
     relayer_adapter: RelayerAdapter | None = None
 
+    # Override dvt setting for API setups running with DVT relayer
+    if settings.relayer_type == RelayerTypes.DVT:
+        settings.runs_dvt_setup = True
+
     # load keystore and deposit data
     if settings.validators_registration_mode == ValidatorsRegistrationMode.AUTO:
         keystore = await load_keystore()

src/config/settings.py

@@ -92,6 +92,10 @@ class Settings(metaclass=Singleton):
         'DISABLE_DEPOSIT_DATA_WARNINGS', default=False, cast=bool
     )
 
+    runs_dvt_setup: bool = decouple_config(
+        'RUNS_DVT_SETUP', default=False, cast=bool,
+    )
+
     min_validators_registration: int
 
     # pylint: disable-next=too-many-arguments,too-many-locals,too-many-statements

src/validators/execution.py

@@ -187,7 +187,9 @@ async def update_unused_validator_keys_metric(
 
     validators: int = 0
     for validator in deposit_data.validators:
-        if validator.public_key not in keystore:
+        # This check is skipped for DVT, since keystore contains
+        # key shares and not original public keys
+        if validator.public_key not in keystore and not settings.runs_dvt_setup:
             continue
 
         if NetworkValidatorCrud().is_validator_registered(validator.public_key):