Revert escrow changes

Author: zhiltsov-max

packages/examples/cvat/exchange-oracle/src/.env.template

@@ -106,7 +106,6 @@ REQUEST_LOGGING_ENABLED=
 PROFILING_ENABLED=
 MANIFEST_CACHE_TTL=
 TOKEN_SYMBOL_CACHE_TTL=
-ESCROW_CACHE_TTL=
 MAX_DATA_STORAGE_CONNECTIONS=
 
 # Core

packages/examples/cvat/exchange-oracle/src/chain/escrow.py

@@ -3,61 +3,35 @@
 
 from human_protocol_sdk.constants import ChainId, Status
 from human_protocol_sdk.encryption import Encryption, EncryptionUtils
-from human_protocol_sdk.escrow import EscrowClient, EscrowData, EscrowUtils
+from human_protocol_sdk.escrow import EscrowData, EscrowUtils
 from human_protocol_sdk.storage import StorageUtils
 
-from src.chain.web3 import get_token_symbol, get_web3
+from src.chain.web3 import get_token_symbol
 from src.core.config import Config
 from src.core.types import OracleWebhookTypes
 from src.services.cache import Cache
 
 
-def download_escrow(chain_id: int, escrow_address: str) -> EscrowData:
+def get_escrow(chain_id: int, escrow_address: str) -> EscrowData:
     escrow = EscrowUtils.get_escrow(ChainId(chain_id), escrow_address)
     if not escrow:
         raise Exception(f"Can't find escrow {escrow_address}")
 
-    # The returned value can contain invalid oracle addresses, replace them with correct ones
-    w3 = get_web3(chain_id)
-    escrow_client = EscrowClient(w3)
-    escrow.launcher = escrow_client.get_job_launcher_address()
-    escrow.exchange_oracle = escrow_client.get_exchange_oracle_address()
-    escrow.recording_oracle = escrow_client.get_recording_oracle_address()
-    escrow.reputation_oracle = escrow_client.get_reputation_oracle_address()
-
     return escrow
 
 
-def get_escrow(chain_id: int, escrow_address: str, *, force_refresh: bool = False) -> EscrowData:
-    def _serialize(escrow: EscrowData) -> dict:
-        return escrow.__dict__
-
-    def _deserialize(escrow_data: dict) -> EscrowData:
-        return EscrowData(**escrow_data)
-
-    cache = Cache()
-    value = cache.get_or_set_escrow(
-        chain_id=chain_id,
-        escrow_address=escrow_address,
-        set_callback=lambda: _serialize(download_escrow(chain_id, escrow_address)),
-        force_refresh=force_refresh,
-    )
-    return _deserialize(value)
-
-
 def validate_escrow(
     chain_id: int,
     escrow_address: str,
     *,
     accepted_states: list[Status] | None = None,
     allow_no_funds: bool = False,
-    force_refresh: bool = False,
 ) -> None:
     if accepted_states is None:
         accepted_states = [Status.Pending]
     assert accepted_states
 
-    escrow = get_escrow(chain_id, escrow_address, force_refresh=force_refresh)
+    escrow = get_escrow(chain_id, escrow_address)
 
     status = Status[escrow.status]
     if status not in accepted_states:

packages/examples/cvat/exchange-oracle/src/core/config.py

@@ -260,9 +260,6 @@ class FeaturesConfig:
     token_symbol_ttl = int(getenv("TOKEN_SYMBOL_CACHE_TTL", str(2 * 24 * 60 * 60)))
     "TTL for cached token symbols, in seconds"
 
-    escrow_cache_ttl = int(getenv("ESCROW_CACHE_TTL", str(5 * 60)))
-    "TTL for cached escrow data, in seconds"
-
     max_data_storage_connections = int(getenv("MAX_DATA_STORAGE_CONNECTIONS", 5))
     "Max parallel data storage connections in 1 client (job creation, ...)"
 

packages/examples/cvat/exchange-oracle/src/crons/webhooks/job_launcher.py

@@ -69,7 +69,6 @@ def handle_job_launcher_event(webhook: Webhook, *, db_session: Session, logger:
                     webhook.chain_id,
                     webhook.escrow_address,
                     allow_no_funds=True,
-                    force_refresh=True,
                 )
 
                 if cvat_db_service.get_project_by_escrow_address(
@@ -109,7 +108,6 @@ def handle_job_launcher_event(webhook: Webhook, *, db_session: Session, logger:
                 webhook.chain_id,
                 webhook.escrow_address,
                 accepted_states=[EscrowStatus.Pending, EscrowStatus.Cancelled],
-                force_refresh=True,
             )
 
             projects = cvat_db_service.get_projects_by_escrow_address(

packages/examples/cvat/exchange-oracle/src/services/cache.py

@@ -87,16 +87,11 @@ def _get_cache(self) -> BaseCache:
     def _make_key(address: str, chain_id: int) -> str:
         return f"{address}@{chain_id}"
 
-    def _get_or_set(
-        self, key: str, set_callback, *, ttl: int | None = None, force_refresh: bool = False
-    ):
+    def _get_or_set(self, key: str, set_callback, *, ttl: int | None = None):
         cache = self._get_cache()
+        item = cache.get(key)
 
-        item = None
-        if not force_refresh:
-            item = cache.get(key)
-
-        if not item or force_refresh:
+        if not item:
             item = set_callback()
             success = cache.set(key, item, timeout=ttl)
             if not success:
@@ -117,10 +112,3 @@ def get_or_set_token_symbol(
         kwargs.setdefault("ttl", Config.features.token_symbol_ttl)
         key = self._make_key(token_address, chain_id)
         return self._get_or_set(key, set_callback=set_callback, **kwargs)
-
-    def get_or_set_escrow(
-        self, chain_id: int, escrow_address: str, *, set_callback: Callable[[], str], **kwargs
-    ) -> str:
-        kwargs.setdefault("ttl", Config.features.escrow_cache_ttl)
-        key = self._make_key(escrow_address, chain_id)
-        return self._get_or_set(key, set_callback=set_callback, **kwargs)