Multiple contracts in operation index, big_map index (#38)

README.md

@@ -55,7 +55,8 @@ indexes:
   hen_mainnet:
     kind: operation
     datasource: tzkt_mainnet
-    contract: HEN_minter
+    contracts:
+      - HEN_minter
     handlers:
       - callback: on_mint
         pattern:
@@ -125,19 +126,21 @@ class Token(Model):
 Now take a look at `handlers` module generated by `init` command. When operation group matching `pattern` block of corresponding handler at config will arrive callback will be fired. This example will simply save minted Hic Et Nunc tokens and their owners to the database:
 
 ```python
-from demo_hic_et_nunc.models import Holder, Token
-from demo_hic_et_nunc.types.hen_minter.parameter.mint_objkt import MintOBJKT
-from demo_hic_et_nunc.types.hen_objkts.parameter.mint import Mint
-from dipdup.models import HandlerContext, OperationContext
+import demo_hic_et_nunc.models as models
+from demo_hic_et_nunc.types.hen_minter.parameter.mint_objkt import MintOBJKTParameter
+from demo_hic_et_nunc.types.hen_minter.storage import HenMinterStorage
+from demo_hic_et_nunc.types.hen_objkts.parameter.mint import MintParameter
+from demo_hic_et_nunc.types.hen_objkts.storage import HenObjktsStorage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_mint(
-    ctx: HandlerContext,
-    mint_objkt: OperationContext[MintOBJKT],
-    mint: OperationContext[Mint],
+    ctx: OperationHandlerContext,
+    mint_objkt: OperationContext[MintOBJKTParameter, HenMinterStorage],
+    mint: OperationContext[MintParameter, HenObjktsStorage],
 ) -> None:
-    holder, _ = await Holder.get_or_create(address=mint.parameter.address)
-    token = Token(
+    holder, _ = await models.Holder.get_or_create(address=mint.parameter.address)
+    token = models.Token(
         id=mint.parameter.token_id,
         creator=holder,
         supply=mint.parameter.amount,
@@ -193,19 +196,20 @@ templates:
   trades:
     kind: operation
     datasource: tzkt_staging
-    contract: < dex >
+    contracts:
+      - <dex>
     handlers:
       - callback: on_fa12_token_to_tez
         pattern:
-          - destination: < dex >
+          - destination: <dex>
             entrypoint: tokenToTezPayment
-          - destination: < token >
+          - destination: <token>
             entrypoint: transfer
       - callback: on_fa20_tez_to_token
         pattern:
-          - destination: < dex >
+          - destination: <dex>
             entrypoint: tezToTokenPayment
-          - destination: < token >
+          - destination: <token>
             entrypoint: transfer
 
 indexes:

src/demo_hic_et_nunc/dipdup.yml

@@ -22,7 +22,8 @@ indexes:
   hen_mainnet:
     kind: operation
     datasource: tzkt_mainnet
-    contract: HEN_minter
+    contracts:
+      - HEN_minter
     handlers:
       - callback: on_mint
         pattern:

src/demo_hic_et_nunc/handlers/on_cancel_swap.py

@@ -1,11 +1,11 @@
 import demo_hic_et_nunc.models as models
-from demo_hic_et_nunc.types.hen_minter.parameter.cancel_swap import CancelSwap as CancelSwapParameter
-from demo_hic_et_nunc.types.hen_minter.storage import Storage as HenMinterStorage
-from dipdup.models import HandlerContext, OperationContext
+from demo_hic_et_nunc.types.hen_minter.parameter.cancel_swap import CancelSwapParameter
+from demo_hic_et_nunc.types.hen_minter.storage import HenMinterStorage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_cancel_swap(
-    ctx: HandlerContext,
+    ctx: OperationHandlerContext,
     cancel_swap: OperationContext[CancelSwapParameter, HenMinterStorage],
 ) -> None:
     swap = await models.Swap.filter(id=int(cancel_swap.parameter.__root__)).get()

src/demo_hic_et_nunc/handlers/on_collect.py

@@ -1,11 +1,11 @@
 import demo_hic_et_nunc.models as models
-from demo_hic_et_nunc.types.hen_minter.parameter.collect import Collect as CollectParameter
-from demo_hic_et_nunc.types.hen_minter.storage import Storage as HenMinterStorage
-from dipdup.models import HandlerContext, OperationContext
+from demo_hic_et_nunc.types.hen_minter.parameter.collect import CollectParameter
+from demo_hic_et_nunc.types.hen_minter.storage import HenMinterStorage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_collect(
-    ctx: HandlerContext,
+    ctx: OperationHandlerContext,
     collect: OperationContext[CollectParameter, HenMinterStorage],
 ) -> None:
     swap = await models.Swap.filter(id=collect.parameter.swap_id).get()

src/demo_hic_et_nunc/handlers/on_mint.py

@@ -1,13 +1,13 @@
 import demo_hic_et_nunc.models as models
-from demo_hic_et_nunc.types.hen_minter.parameter.mint_objkt import MintOBJKT as MintOBJKTParameter
-from demo_hic_et_nunc.types.hen_minter.storage import Storage as HenMinterStorage
-from demo_hic_et_nunc.types.hen_objkts.parameter.mint import Mint as MintParameter
-from demo_hic_et_nunc.types.hen_objkts.storage import Storage as HenObjktsStorage
-from dipdup.models import HandlerContext, OperationContext
+from demo_hic_et_nunc.types.hen_minter.parameter.mint_objkt import MintOBJKTParameter
+from demo_hic_et_nunc.types.hen_minter.storage import HenMinterStorage
+from demo_hic_et_nunc.types.hen_objkts.parameter.mint import MintParameter
+from demo_hic_et_nunc.types.hen_objkts.storage import HenObjktsStorage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_mint(
-    ctx: HandlerContext,
+    ctx: OperationHandlerContext,
     mint_objkt: OperationContext[MintOBJKTParameter, HenMinterStorage],
     mint: OperationContext[MintParameter, HenObjktsStorage],
 ) -> None:

src/demo_hic_et_nunc/handlers/on_swap.py

@@ -1,11 +1,11 @@
 import demo_hic_et_nunc.models as models
-from demo_hic_et_nunc.types.hen_minter.parameter.swap import Swap as SwapParameter
-from demo_hic_et_nunc.types.hen_minter.storage import Storage as HenMinterStorage
-from dipdup.models import HandlerContext, OperationContext
+from demo_hic_et_nunc.types.hen_minter.parameter.swap import SwapParameter
+from demo_hic_et_nunc.types.hen_minter.storage import HenMinterStorage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_swap(
-    ctx: HandlerContext,
+    ctx: OperationHandlerContext,
     swap: OperationContext[SwapParameter, HenMinterStorage],
 ) -> None:
     holder, _ = await models.Holder.get_or_create(address=swap.data.sender_address)

src/demo_hic_et_nunc/types/hen_minter/parameter/cancel_swap.py

@@ -6,5 +6,5 @@
 from pydantic import BaseModel
 
 
-class CancelSwap(BaseModel):
+class CancelSwapParameter(BaseModel):
     __root__: str

src/demo_hic_et_nunc/types/hen_minter/parameter/collect.py

@@ -6,6 +6,6 @@
 from pydantic import BaseModel
 
 
-class Collect(BaseModel):
+class CollectParameter(BaseModel):
     objkt_amount: str
     swap_id: str

src/demo_hic_et_nunc/types/hen_minter/parameter/mint_objkt.py

@@ -6,7 +6,7 @@
 from pydantic import BaseModel
 
 
-class MintOBJKT(BaseModel):
+class MintOBJKTParameter(BaseModel):
     address: str
     amount: str
     metadata: str

src/demo_hic_et_nunc/types/hen_minter/parameter/swap.py

@@ -6,7 +6,7 @@
 from pydantic import BaseModel
 
 
-class Swap(BaseModel):
+class SwapParameter(BaseModel):
     objkt_amount: str
     objkt_id: str
     xtz_per_objkt: str

src/demo_hic_et_nunc/types/hen_minter/storage.py

@@ -20,7 +20,7 @@ class Swaps(BaseModel):
     xtz_per_objkt: str
 
 
-class Storage(BaseModel):
+class HenMinterStorage(BaseModel):
     curate: str
     genesis: str
     hdao: str

src/demo_hic_et_nunc/types/hen_objkts/parameter/mint.py

@@ -8,7 +8,7 @@
 from pydantic import BaseModel
 
 
-class Mint(BaseModel):
+class MintParameter(BaseModel):
     address: str
     amount: str
     token_id: str

src/demo_hic_et_nunc/types/hen_objkts/storage.py

@@ -19,8 +19,8 @@ class LedgerItem(BaseModel):
 
 
 class Key1(BaseModel):
-    owner: str
     operator: str
+    owner: str
     token_id: str
 
 
@@ -34,7 +34,7 @@ class TokenMetadata(BaseModel):
     token_info: Dict[str, str]
 
 
-class Storage(BaseModel):
+class HenObjktsStorage(BaseModel):
     administrator: str
     all_tokens: str
     ledger: List[LedgerItem]

src/demo_quipuswap/dipdup.yml

@@ -34,7 +34,8 @@ templates:
   quipuswap_fa12:
     kind: operation
     datasource: tzkt_staging_mainnet
-    contract: <dex_contract>
+    contracts:
+      - <dex_contract>
     handlers:
       - callback: on_fa12_token_to_tez
         pattern:
@@ -68,7 +69,8 @@ templates:
   quipuswap_fa2:
     kind: operation
     datasource: tzkt_staging_mainnet
-    contract: <dex_contract>
+    contracts:
+      - <dex_contract>
     handlers:
       - callback: on_fa2_token_to_tez
         pattern:

src/demo_quipuswap/handlers/on_fa12_divest_liquidity.py

@@ -1,15 +1,15 @@
 from decimal import Decimal
 
 import demo_quipuswap.models as models
-from demo_quipuswap.types.fa12_token.parameter.transfer import Transfer as TransferParameter
-from demo_quipuswap.types.fa12_token.storage import Storage as Fa12TokenStorage
-from demo_quipuswap.types.quipu_fa12.parameter.divest_liquidity import DivestLiquidity as DivestLiquidityParameter
-from demo_quipuswap.types.quipu_fa12.storage import Storage as QuipuFa12Storage
-from dipdup.models import HandlerContext, OperationContext
+from demo_quipuswap.types.fa12_token.parameter.transfer import TransferParameter
+from demo_quipuswap.types.fa12_token.storage import Fa12TokenStorage
+from demo_quipuswap.types.quipu_fa12.parameter.divest_liquidity import DivestLiquidityParameter
+from demo_quipuswap.types.quipu_fa12.storage import QuipuFa12Storage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_fa12_divest_liquidity(
-    ctx: HandlerContext,
+    ctx: OperationHandlerContext,
     divest_liquidity: OperationContext[DivestLiquidityParameter, QuipuFa12Storage],
     transfer: OperationContext[TransferParameter, Fa12TokenStorage],
 ) -> None:

src/demo_quipuswap/handlers/on_fa12_invest_liquidity.py

@@ -1,15 +1,15 @@
 from decimal import Decimal
 
 import demo_quipuswap.models as models
-from demo_quipuswap.types.fa12_token.parameter.transfer import Transfer as TransferParameter
-from demo_quipuswap.types.fa12_token.storage import Storage as Fa12TokenStorage
-from demo_quipuswap.types.quipu_fa12.parameter.invest_liquidity import InvestLiquidity as InvestLiquidityParameter
-from demo_quipuswap.types.quipu_fa12.storage import Storage as QuipuFa12Storage
-from dipdup.models import HandlerContext, OperationContext
+from demo_quipuswap.types.fa12_token.parameter.transfer import TransferParameter
+from demo_quipuswap.types.fa12_token.storage import Fa12TokenStorage
+from demo_quipuswap.types.quipu_fa12.parameter.invest_liquidity import InvestLiquidityParameter
+from demo_quipuswap.types.quipu_fa12.storage import QuipuFa12Storage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_fa12_invest_liquidity(
-    ctx: HandlerContext,
+    ctx: OperationHandlerContext,
     invest_liquidity: OperationContext[InvestLiquidityParameter, QuipuFa12Storage],
     transfer: OperationContext[TransferParameter, Fa12TokenStorage],
 ) -> None:
@@ -26,7 +26,7 @@ async def on_fa12_invest_liquidity(
 
     tez_qty = Decimal(invest_liquidity.data.amount) / (10 ** 6)
     token_qty = Decimal(transfer.parameter.value) / (10 ** decimals)
-    new_shares_qty = int(storage.storage.ledger[trader].balance) + int(storage.storage.ledger[trader].frozen_balance)
+    new_shares_qty = int(storage.storage.ledger[trader].balance) + int(storage.storage.ledger[trader].frozen_balance)  # type: ignore
 
     price = (Decimal(storage.storage.tez_pool) / (10 ** 6)) / (Decimal(storage.storage.token_pool) / (10 ** decimals))
     value = tez_qty + price * token_qty

src/demo_quipuswap/handlers/on_fa12_tez_to_token.py

@@ -1,15 +1,15 @@
 from decimal import Decimal
 
 import demo_quipuswap.models as models
-from demo_quipuswap.types.fa12_token.parameter.transfer import Transfer as TransferParameter
-from demo_quipuswap.types.fa12_token.storage import Storage as Fa12TokenStorage
-from demo_quipuswap.types.quipu_fa12.parameter.tez_to_token_payment import TezToTokenPayment as TezToTokenPaymentParameter
-from demo_quipuswap.types.quipu_fa12.storage import Storage as QuipuFa12Storage
-from dipdup.models import HandlerContext, OperationContext
+from demo_quipuswap.types.fa12_token.parameter.transfer import TransferParameter
+from demo_quipuswap.types.fa12_token.storage import Fa12TokenStorage
+from demo_quipuswap.types.quipu_fa12.parameter.tez_to_token_payment import TezToTokenPaymentParameter
+from demo_quipuswap.types.quipu_fa12.storage import QuipuFa12Storage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_fa12_tez_to_token(
-    ctx: HandlerContext,
+    ctx: OperationHandlerContext,
     tez_to_token_payment: OperationContext[TezToTokenPaymentParameter, QuipuFa12Storage],
     transfer: OperationContext[TransferParameter, Fa12TokenStorage],
 ) -> None:

src/demo_quipuswap/handlers/on_fa12_token_to_tez.py

@@ -1,15 +1,15 @@
 from decimal import Decimal
 
 import demo_quipuswap.models as models
-from demo_quipuswap.types.fa12_token.parameter.transfer import Transfer as TransferParameter
-from demo_quipuswap.types.fa12_token.storage import Storage as Fa12TokenStorage
-from demo_quipuswap.types.quipu_fa12.parameter.token_to_tez_payment import TokenToTezPayment as TokenToTezPaymentParameter
-from demo_quipuswap.types.quipu_fa12.storage import Storage as QuipuFa12Storage
-from dipdup.models import HandlerContext, OperationContext
+from demo_quipuswap.types.fa12_token.parameter.transfer import TransferParameter
+from demo_quipuswap.types.fa12_token.storage import Fa12TokenStorage
+from demo_quipuswap.types.quipu_fa12.parameter.token_to_tez_payment import TokenToTezPaymentParameter
+from demo_quipuswap.types.quipu_fa12.storage import QuipuFa12Storage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_fa12_token_to_tez(
-    ctx: HandlerContext,
+    ctx: OperationHandlerContext,
     token_to_tez_payment: OperationContext[TokenToTezPaymentParameter, QuipuFa12Storage],
     transfer: OperationContext[TransferParameter, Fa12TokenStorage],
 ) -> None:

src/demo_quipuswap/handlers/on_fa12_withdraw_profit.py

@@ -1,13 +1,13 @@
 from decimal import Decimal
 
 import demo_quipuswap.models as models
-from demo_quipuswap.types.quipu_fa12.parameter.withdraw_profit import WithdrawProfit as WithdrawProfitParameter
-from demo_quipuswap.types.quipu_fa12.storage import Storage as QuipuFa12Storage
-from dipdup.models import HandlerContext, OperationContext
+from demo_quipuswap.types.quipu_fa12.parameter.withdraw_profit import WithdrawProfitParameter
+from demo_quipuswap.types.quipu_fa12.storage import QuipuFa12Storage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_fa12_withdraw_profit(
-    ctx: HandlerContext,
+    ctx: OperationHandlerContext,
     withdraw_profit: OperationContext[WithdrawProfitParameter, QuipuFa12Storage],
 ) -> None:
 

src/demo_quipuswap/handlers/on_fa20_divest_liquidity.py

@@ -1,15 +1,15 @@
 from decimal import Decimal
 
 import demo_quipuswap.models as models
-from demo_quipuswap.types.fa2_token.parameter.transfer import Transfer as TransferParameter
-from demo_quipuswap.types.fa2_token.storage import Storage as Fa2TokenStorage
-from demo_quipuswap.types.quipu_fa2.parameter.divest_liquidity import DivestLiquidity as DivestLiquidityParameter
-from demo_quipuswap.types.quipu_fa2.storage import Storage as QuipuFa2Storage
-from dipdup.models import HandlerContext, OperationContext
+from demo_quipuswap.types.fa2_token.parameter.transfer import TransferParameter
+from demo_quipuswap.types.fa2_token.storage import Fa2TokenStorage
+from demo_quipuswap.types.quipu_fa2.parameter.divest_liquidity import DivestLiquidityParameter
+from demo_quipuswap.types.quipu_fa2.storage import QuipuFa2Storage
+from dipdup.models import OperationContext, OperationHandlerContext
 
 
 async def on_fa20_divest_liquidity(
-    ctx: HandlerContext,
+    ctx: OperationHandlerContext,
     divest_liquidity: OperationContext[DivestLiquidityParameter, QuipuFa2Storage],
     transfer: OperationContext[TransferParameter, Fa2TokenStorage],
 ) -> None: