Backport: Fixed parsing TzKT contract event data (#835)

Co-authored-by: Wizard1209 <[email protected]>

Author: Wizard1209

demos/demo-events/dipdup.yml

@@ -12,7 +12,7 @@ datasources:
 
 contracts:
   events_contract:
-    code_hash: KT1Up6AMehze2VTdt3w85xaZPtrEWn1AeyR3
+    address: KT1Up6AMehze2VTdt3w85xaZPtrEWn1AeyR3
 
 indexes:
   events:

src/dipdup/datasources/tzkt/datasource.py

@@ -5,7 +5,6 @@
 from asyncio import Event
 from collections import defaultdict
 from collections import deque
-from dataclasses import fields
 from datetime import datetime
 from datetime import timezone
 from decimal import Decimal
@@ -112,6 +111,16 @@
     'originationId',
     'migrationId',
 )
+EVENT_FIELDS = (
+    'id',
+    'level',
+    'timestamp',
+    'tag',
+    'payload',
+    'contract',
+    'codeHash',
+    'transactionId',
+)
 
 
 class TzktMessageType(Enum):
@@ -809,21 +818,26 @@ async def get_events(
         offset: int | None = None,
         limit: int | None = None,
     ) -> tuple[EventData, ...]:
+        params = self._get_request_params(
+            first_level,
+            last_level,
+            offset=offset or 0,
+            limit=limit,
+            select=EVENT_FIELDS,
+            values=True,
+            cursor=True,
+            **{
+                'contract.in': ','.join(addresses),
+                'tag.in': ','.join(tags),
+            },
+        )
         offset, limit = offset or 0, limit or self.request_limit
         raw_events = await self._request_values_dict(
             'get',
             url='v1/contracts/events',
-            params={
-                'contract.in': ','.join(addresses),
-                'tag.in': ','.join(tags),
-                'level.ge': first_level,
-                'level.le': last_level,
-                'select.values': ','.join(f.name for f in fields(EventData)),
-                'offset.cr': offset,
-                'limit': limit,
-            },
+            params=params,
         )
-        return tuple(self.convert_event(e) for e in raw_events)
+        return tuple(EventData.from_json(e) for e in raw_events)
 
     async def iter_events(
         self,

src/dipdup/models.py

@@ -6,6 +6,7 @@
 from datetime import date
 from datetime import datetime
 from datetime import time
+from datetime import timezone
 from decimal import Decimal
 from enum import Enum
 from functools import cache
@@ -54,6 +55,10 @@
 # ===> Dataclasses
 
 
+def _parse_timestamp(timestamp: str) -> datetime:
+    return datetime.fromisoformat(timestamp[:-1]).replace(tzinfo=timezone.utc)
+
+
 @dataclass
 class OperationData:
     """Basic structure for operations from TzKT response"""
@@ -251,6 +256,21 @@ class EventData:
     contract_code_hash: Optional[int] = None
     transaction_id: Optional[int] = None
 
+    @classmethod
+    def from_json(cls, event_json: dict[str, Any]) -> 'EventData':
+        """Convert raw event message from WS/REST into dataclass"""
+        return EventData(
+            id=event_json['id'],
+            level=event_json['level'],
+            timestamp=_parse_timestamp(event_json['timestamp']),
+            tag=event_json['tag'],
+            payload=event_json.get('payload'),
+            contract_address=event_json['contract']['address'],
+            contract_alias=event_json['contract'].get('alias'),
+            contract_code_hash=event_json['codeHash'],
+            transaction_id=event_json.get('transactionId'),
+        )
+
 
 @dataclass
 class Event(Generic[EventType]):

src/dipdup/projects/demo_events/dipdup.yml.j2

@@ -12,7 +12,7 @@ datasources:
 
 contracts:
   events_contract:
-    code_hash: KT1Up6AMehze2VTdt3w85xaZPtrEWn1AeyR3
+    address: KT1Up6AMehze2VTdt3w85xaZPtrEWn1AeyR3
 
 indexes:
   events: