[CVAT] Move escrow validation to before handling (#2814)

* Remove extra webhook validation in endpoint

* Do webhook validation before handling

* Allow any escrow state for ExchangeOracleEventTypes.escrow_cleaned handling

* Update test

Author: zhiltsov-max

packages/examples/cvat/recording-oracle/src/crons/process_exchange_oracle_webhooks.py

@@ -1,8 +1,10 @@
 import logging
 
+from human_protocol_sdk.constants import Status as EscrowStatus
 from sqlalchemy.orm import Session
 
 import src.services.webhook as oracle_db_service
+from src.chain.escrow import validate_escrow
 from src.chain.kvstore import get_exchange_oracle_url
 from src.core.config import Config
 from src.core.types import ExchangeOracleEventTypes, OracleWebhookTypes
@@ -35,12 +37,20 @@ def handle_exchange_oracle_event(webhook: Webhook, *, db_session: Session):
 
     match webhook.event_type:
         case ExchangeOracleEventTypes.job_finished:
+            validate_escrow(webhook.chain_id, webhook.escrow_address)
+
             validate_results(
                 escrow_address=webhook.escrow_address,
                 chain_id=webhook.chain_id,
                 db_session=db_session,
             )
         case ExchangeOracleEventTypes.escrow_cleaned:
+            validate_escrow(
+                webhook.chain_id,
+                webhook.escrow_address,
+                accepted_states=list(EscrowStatus.__members__.values()),
+            )
+
             clean_escrow(
                 db_session, escrow_address=webhook.escrow_address, chain_id=webhook.chain_id
             )

packages/examples/cvat/recording-oracle/src/endpoints/webhook.py

@@ -1,7 +1,6 @@
 from fastapi import APIRouter, Header, HTTPException, Request
 
 import src.services.webhook as oracle_db_service
-from src.chain.escrow import validate_escrow
 from src.db import SessionLocal
 from src.schemas.webhook import OracleWebhook, OracleWebhookResponse
 from src.validators.signature import validate_oracle_webhook_signature
@@ -17,7 +16,6 @@ async def receive_oracle_webhook(
 ) -> OracleWebhookResponse:
     try:
         sender = await validate_oracle_webhook_signature(request, human_signature, webhook)
-        validate_escrow(webhook.chain_id, webhook.escrow_address)
 
         with SessionLocal.begin() as session:
             webhook_id = oracle_db_service.inbox.create_webhook(

packages/examples/cvat/recording-oracle/src/handlers/validation.py

@@ -214,8 +214,6 @@ def validate_results(
 ):
     logger = get_function_logger(module_logger_name)
 
-    escrow.validate_escrow(chain_id=chain_id, escrow_address=escrow_address)
-
     manifest = parse_manifest(escrow.get_escrow_manifest(chain_id, escrow_address))
 
     validator = _TaskValidator(

packages/examples/cvat/recording-oracle/tests/integration/cron/test_process_exchange_oracle_webhooks.py

@@ -82,7 +82,7 @@ def test_process_exchange_oracle_webhook_escrow_cleaned(self):
 
         mock_storage_client = MagicMock(spec=StorageClient)
         with (
-            patch("src.chain.escrow.get_escrow"),
+            patch("src.crons.process_exchange_oracle_webhooks.validate_escrow"),
             patch("src.services.cloud.make_client", return_value=mock_storage_client),
         ):
             process_incoming_exchange_oracle_webhooks()