Backport: Fix operation matching when contract code hash specified as a string (#833)

Author: droserasprout

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 ### Fixed
 
 - tzkt: Fixed issue with processing rollbacks while sync is in progress.
+- tzkt: Fixed operation matching when contract code hash specified as a string.
 
 ## [6.5.11] - 2023-09-02
 

demos/demo-factories/dipdup.yml

@@ -1,48 +1,52 @@
 spec_version: 1.2
 package: demo_factories
 
-database:
-  kind: sqlite
-  path: demo-factories.sqlite3
-
 contracts:
-  registry:
-    address: KT19CF3KKrvdW77ttFomCuin2k4uAVkryYqh
-    typename: registry
+  factory:
+    address: KT1PvEyN1xCFCgorN92QCfYjw3axS6jawCiJ
+    typename: factory
+  token:
+    address: KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY
+    typename: token
 
 datasources:
   tzkt:
     kind: tzkt
     url: ${TZKT_URL:-https://api.tzkt.io}
 
 templates:
-  registry_dao:
+  dex:
     kind: operation
     datasource: tzkt
     types:
       - transaction
-      - origination
     contracts:
-      - <contract>
+      - <dex>
+      - <token>
     handlers:
-      - callback: on_origination
-        pattern:
-          - type: origination
-            originated_contract: <contract>
-      - callback: on_propose
+      - callback: on_transfer
         pattern:
           - type: transaction
-            destination: <contract>
-            entrypoint: propose
+            destination: <token>
+            entrypoint: transfer
+    first_level: 2393103
+    last_level: 2393103
 
 indexes:
   factory:
     kind: operation
     datasource: tzkt
+    contracts:
+      - factory
     types:
       - origination
+      - transaction
     handlers:
-        - callback: on_factory_origination
-          pattern:
-            - type: origination
-              similar_to: registry
+      - callback: on_factory_origination
+        pattern:
+          - type: transaction
+            entrypoint: launchExchange
+          - type: origination
+            source: factory
+    first_level: 2428590
+    last_level: 2428590

demos/demo-factories/src/demo_factories/handlers/on_factory_origination.py

@@ -1,23 +1,36 @@
+from contextlib import suppress
 from typing import cast
 
-from demo_factories.types.registry.storage import RegistryStorage
 from dipdup.context import HandlerContext
-from dipdup.models import Origination
+from dipdup.exceptions import ContractAlreadyExistsError
+from dipdup.models import OperationData
 
 
 async def on_factory_origination(
     ctx: HandlerContext,
-    registry_origination: Origination[RegistryStorage],
+    transaction_0: OperationData,
+    origination_1: OperationData,
 ) -> None:
-    originated_contract = cast(str, registry_origination.data.originated_contract_address)
-    name = f'registry_dao_{originated_contract}'
+    assert transaction_0.parameter_json
+    dex_contract = cast(str, origination_1.originated_contract_address)
+    token_contract = cast(str, transaction_0.parameter_json['token']['address'])
+
     await ctx.add_contract(
-        name=originated_contract,
-        address=originated_contract,
-        typename='registry',
+        name=dex_contract,
+        address=dex_contract,
+        typename='dex',
     )
+    with suppress(ContractAlreadyExistsError):
+        await ctx.add_contract(
+            name=token_contract,
+            address=token_contract,
+            typename='token',
+        )
     await ctx.add_index(
-        name=name,
-        template='registry_dao',
-        values={'contract': originated_contract},
+        name=dex_contract,
+        template='dex',
+        values={
+            'dex': dex_contract,
+            'token': token_contract,
+        },
     )

demos/demo-factories/src/demo_factories/handlers/on_origination.py

@@ -0,0 +1,18 @@
+import demo_factories.models as models
+from demo_factories.types.token.parameter.transfer import TransferParameter
+from demo_factories.types.token.storage import TokenStorage
+from dipdup.context import HandlerContext
+from dipdup.models import Transaction
+
+
+async def on_transfer(
+    ctx: HandlerContext,
+    transfer: Transaction[TransferParameter, TokenStorage],
+) -> None:
+    for transfer_item in transfer.parameter.__root__:
+        for tx in transfer_item.txs:
+            await models.Transfer.create(
+                from_=transfer_item.from_,
+                to=tx.to_,
+                amount=tx.amount,
+            )

demos/demo-factories/src/demo_factories/handlers/on_propose.py

@@ -1,29 +1,10 @@
 from tortoise import fields
-from tortoise.fields.relational import ForeignKeyFieldInstance
 
 from dipdup.models import Model
 
 
-class DAO(Model):
-    address = fields.CharField(36, pk=True)
-
-
-class User(Model):
-    address = fields.CharField(36, pk=True)
-    balance = fields.IntField()
-
-
-class Proposal(Model):
-    id = fields.IntField(pk=True)
-    dao: ForeignKeyFieldInstance[DAO] = fields.ForeignKeyField('models.DAO', 'proposals')
-    # upvotes = fields.IntField(default=0)
-    # downvotes = fields.IntField(default=0)
-    # start_date = fields.DatetimeField()
-    # metadata = fields.JSONField()
-    # proposer = fields.ForeignKeyField('models.Address', 'proposals')
-
-
-class Vote(Model):
+class Transfer(Model):
     id = fields.IntField(pk=True)
-    proposal: ForeignKeyFieldInstance[Proposal] = fields.ForeignKeyField('models.Proposal', 'votes')
-    amount = fields.IntField()
+    from_ = fields.TextField()
+    to = fields.TextField()
+    amount = fields.TextField()

demos/demo-factories/src/demo_factories/handlers/on_transfer.py

@@ -0,0 +1,80 @@
+# generated by datamodel-codegen:
+#   filename:  storage.json
+
+from __future__ import annotations
+
+from typing import Dict
+from typing import List
+from typing import Optional
+
+from pydantic import BaseModel
+from pydantic import Extra
+
+
+class Ledger(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    allowances: List[str]
+    balance: str
+    frozen_balance: str
+
+
+class TokenList(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    address: str
+    nat: str
+
+
+class Key(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    address: str
+    nat: str
+
+
+class TokenToExchangeItem(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    key: Key
+    value: str
+
+
+class UserRewards(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    reward: str
+    reward_paid: str
+
+
+class Voters(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    candidate: Optional[str]
+    last_veto: str
+    veto: str
+    vote: str
+
+
+class FactoryStorage(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    baker_validator: str
+    counter: str
+    dex_lambdas: Dict[str, str]
+    ledger: Dict[str, Ledger]
+    metadata: Dict[str, str]
+    token_lambdas: Dict[str, str]
+    token_list: Dict[str, TokenList]
+    token_to_exchange: List[TokenToExchangeItem]
+    user_rewards: Dict[str, UserRewards]
+    vetos: Dict[str, str]
+    voters: Dict[str, Voters]
+    votes: Dict[str, str]