Dynamic configuration, context and rollback improvements, bugfixes

docker-compose.yml

@@ -1,6 +1,7 @@
 version: "3.8"
 
 services:
+
   hic_et_nunc:
     build: .
     depends_on:

pyproject.toml

@@ -24,14 +24,15 @@ packages = [
 python = "^3.8"
 aiohttp = "^3.7.4"
 aiomysql = "^0.0.21"
-asyncpg = "^0.22.0"
+asyncpg = "0.23.0"
 datamodel-code-generator = "^0.11.1"
 "ruamel.yaml" = "^0.17.2"
-tortoise-orm = "^0.17.1"
+tortoise-orm = "0.17.4"
 pydantic = "^1.8.1"
 aiosignalrcore = "^0.9.2"
 fcache = "^0.4.7"
 click = "^8.0.1"
+pyee = "^8.1.0"
 
 [tool.poetry.dev-dependencies]
 black = "^20.8b1"

src/demo_hic_et_nunc/handlers/on_cancel_swap.py

@@ -1,12 +1,13 @@
 import demo_hic_et_nunc.models as models
 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 OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_cancel_swap(
     ctx: OperationHandlerContext,
-    cancel_swap: TransactionContext[CancelSwapParameter, HenMinterStorage],
+    cancel_swap: Transaction[CancelSwapParameter, HenMinterStorage],
 ) -> None:
     swap = await models.Swap.filter(id=int(cancel_swap.parameter.__root__)).get()
     swap.status = models.SwapStatus.CANCELED

src/demo_hic_et_nunc/handlers/on_collect.py

@@ -1,12 +1,13 @@
 import demo_hic_et_nunc.models as models
 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 OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_collect(
     ctx: OperationHandlerContext,
-    collect: TransactionContext[CollectParameter, HenMinterStorage],
+    collect: Transaction[CollectParameter, HenMinterStorage],
 ) -> None:
     swap = await models.Swap.filter(id=collect.parameter.swap_id).get()
     seller = await swap.creator

src/demo_hic_et_nunc/handlers/on_configure.py

@@ -0,0 +1,5 @@
+from dipdup.context import HandlerContext
+
+
+async def on_configure(ctx: HandlerContext) -> None:
+    ...

src/demo_hic_et_nunc/handlers/on_mint.py

@@ -3,13 +3,14 @@
 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 OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_mint(
     ctx: OperationHandlerContext,
-    mint_objkt: TransactionContext[MintOBJKTParameter, HenMinterStorage],
-    mint: TransactionContext[MintParameter, HenObjktsStorage],
+    mint_objkt: Transaction[MintOBJKTParameter, HenMinterStorage],
+    mint: Transaction[MintParameter, HenObjktsStorage],
 ) -> None:
     holder, _ = await models.Holder.get_or_create(address=mint.parameter.address)
     token = models.Token(

src/demo_hic_et_nunc/handlers/on_rollback.py

@@ -1,13 +1,10 @@
 import logging
 
-from dipdup.utils import reindex
+from dipdup.context import RollbackHandlerContext
 
 _logger = logging.getLogger(__name__)
 
 
-async def on_rollback(
-    from_level: int,
-    to_level: int,
-) -> None:
-    _logger.warning('Rollback event received, reindexing')
-    await reindex()
+async def on_rollback(ctx: RollbackHandlerContext) -> None:
+    _logger.warning('Datasource `%s` rolled back from level %s to level %s, reindexing', ctx.datasource, ctx.from_level, ctx.to_level)
+    await ctx.reindex()

src/demo_hic_et_nunc/handlers/on_swap.py

@@ -1,12 +1,13 @@
 import demo_hic_et_nunc.models as models
 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 OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_swap(
     ctx: OperationHandlerContext,
-    swap: TransactionContext[SwapParameter, HenMinterStorage],
+    swap: Transaction[SwapParameter, HenMinterStorage],
 ) -> None:
     holder, _ = await models.Holder.get_or_create(address=swap.data.sender_address)
     swap_model = models.Swap(

src/demo_hic_et_nunc/models.py

@@ -1,10 +1,7 @@
-from enum import Enum, IntEnum
+from enum import IntEnum
 
 from tortoise import Model, fields
 
-# on mint token, holder
-# on_swap new, cancel_swap, collect
-
 
 class SwapStatus(IntEnum):
     ACTIVE = 0

src/demo_quipuswap/handlers/on_configure.py

@@ -0,0 +1,5 @@
+from dipdup.context import HandlerContext
+
+
+async def on_configure(ctx: HandlerContext) -> None:
+    ...

src/demo_quipuswap/handlers/on_fa12_divest_liquidity.py

@@ -5,13 +5,14 @@
 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 OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_fa12_divest_liquidity(
     ctx: OperationHandlerContext,
-    divest_liquidity: TransactionContext[DivestLiquidityParameter, QuipuFa12Storage],
-    transfer: TransactionContext[TransferParameter, Fa12TokenStorage],
+    divest_liquidity: Transaction[DivestLiquidityParameter, QuipuFa12Storage],
+    transfer: Transaction[TransferParameter, Fa12TokenStorage],
 ) -> None:
     if ctx.template_values is None:
         raise Exception('This index must be templated')
@@ -32,12 +33,12 @@ async def on_fa12_divest_liquidity(
 
     tez_pool = Decimal(storage.storage.tez_pool) / (10 ** 6)
     token_pool = Decimal(storage.storage.token_pool) / (10 ** decimals)
-    if tez_pool and token_pool:
-        price = tez_pool / token_pool
-    else:
-        last_trade = await models.Trade.filter(symbol=symbol).order_by('-id').first()
-        assert last_trade
-        price = last_trade.price
+
+    # NOTE: Empty pools mean exchange is not initialized yet
+    if not tez_pool and not token_pool:
+        return
+
+    price = tez_pool / token_pool
     share_px = (tez_qty + price * token_qty) / shares_qty
 
     position.realized_pl += shares_qty * (share_px - position.avg_share_px)

src/demo_quipuswap/handlers/on_fa12_invest_liquidity.py

@@ -5,13 +5,14 @@
 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 OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_fa12_invest_liquidity(
     ctx: OperationHandlerContext,
-    invest_liquidity: TransactionContext[InvestLiquidityParameter, QuipuFa12Storage],
-    transfer: TransactionContext[TransferParameter, Fa12TokenStorage],
+    invest_liquidity: Transaction[InvestLiquidityParameter, QuipuFa12Storage],
+    transfer: Transaction[TransferParameter, Fa12TokenStorage],
 ) -> None:
     if ctx.template_values is None:
         raise Exception('This index must be templated')

src/demo_quipuswap/handlers/on_fa12_origination.py

@@ -1,13 +1,12 @@
-from typing import Optional
-
 import demo_quipuswap.models as models
 from demo_quipuswap.types.quipu_fa12.storage import QuipuFa12Storage
-from dipdup.models import OperationData, OperationHandlerContext, OriginationContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Origination
 
 
 async def on_fa12_origination(
     ctx: OperationHandlerContext,
-    quipu_fa12_origination: OriginationContext[QuipuFa12Storage],
+    quipu_fa12_origination: Origination[QuipuFa12Storage],
 ) -> None:
     if ctx.template_values is None:
         raise Exception('This index must be templated')

src/demo_quipuswap/handlers/on_fa12_tez_to_token.py

@@ -5,13 +5,14 @@
 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 OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_fa12_tez_to_token(
     ctx: OperationHandlerContext,
-    tez_to_token_payment: TransactionContext[TezToTokenPaymentParameter, QuipuFa12Storage],
-    transfer: TransactionContext[TransferParameter, Fa12TokenStorage],
+    tez_to_token_payment: Transaction[TezToTokenPaymentParameter, QuipuFa12Storage],
+    transfer: Transaction[TransferParameter, Fa12TokenStorage],
 ) -> None:
     if ctx.template_values is None:
         raise Exception('This index must be templated')

src/demo_quipuswap/handlers/on_fa12_token_to_tez.py

@@ -5,13 +5,14 @@
 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 OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_fa12_token_to_tez(
     ctx: OperationHandlerContext,
-    token_to_tez_payment: TransactionContext[TokenToTezPaymentParameter, QuipuFa12Storage],
-    transfer: TransactionContext[TransferParameter, Fa12TokenStorage],
+    token_to_tez_payment: Transaction[TokenToTezPaymentParameter, QuipuFa12Storage],
+    transfer: Transaction[TransferParameter, Fa12TokenStorage],
 ) -> None:
     if ctx.template_values is None:
         raise Exception('This index must be templated')

src/demo_quipuswap/handlers/on_fa12_transfer.py

@@ -1,14 +1,13 @@
-from typing import Optional
-
 import demo_quipuswap.models as models
 from demo_quipuswap.types.quipu_fa12.parameter.transfer import TransferParameter
 from demo_quipuswap.types.quipu_fa12.storage import QuipuFa12Storage
-from dipdup.models import OperationData, OperationHandlerContext, OriginationContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_fa12_transfer(
     ctx: OperationHandlerContext,
-    transfer: TransactionContext[TransferParameter, QuipuFa12Storage],
+    transfer: Transaction[TransferParameter, QuipuFa12Storage],
 ) -> None:
     if ctx.template_values is None:
         raise Exception('This index must be templated')

src/demo_quipuswap/handlers/on_fa12_withdraw_profit.py

@@ -4,12 +4,13 @@
 import demo_quipuswap.models as models
 from demo_quipuswap.types.quipu_fa12.parameter.withdraw_profit import WithdrawProfitParameter
 from demo_quipuswap.types.quipu_fa12.storage import QuipuFa12Storage
-from dipdup.models import OperationData, OperationHandlerContext, OriginationContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import OperationData, Transaction
 
 
 async def on_fa12_withdraw_profit(
     ctx: OperationHandlerContext,
-    withdraw_profit: TransactionContext[WithdrawProfitParameter, QuipuFa12Storage],
+    withdraw_profit: Transaction[WithdrawProfitParameter, QuipuFa12Storage],
     transaction_0: Optional[OperationData] = None,
 ) -> None:
     if ctx.template_values is None:

src/demo_quipuswap/handlers/on_fa2_divest_liquidity.py

@@ -5,13 +5,14 @@
 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 OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_fa2_divest_liquidity(
     ctx: OperationHandlerContext,
-    divest_liquidity: TransactionContext[DivestLiquidityParameter, QuipuFa2Storage],
-    transfer: TransactionContext[TransferParameter, Fa2TokenStorage],
+    divest_liquidity: Transaction[DivestLiquidityParameter, QuipuFa2Storage],
+    transfer: Transaction[TransferParameter, Fa2TokenStorage],
 ) -> None:
 
     if ctx.template_values is None:
@@ -33,15 +34,13 @@ async def on_fa2_divest_liquidity(
 
     tez_pool = Decimal(storage.storage.tez_pool) / (10 ** 6)
     token_pool = Decimal(storage.storage.token_pool) / (10 ** decimals)
-    if tez_pool and token_pool:
-        price = tez_pool / token_pool
-        share_px = (tez_qty + price * token_qty) / shares_qty
-    else:
-        last_trade = await models.Trade.filter(symbol=symbol).order_by('-id').first()
-        assert last_trade
-        price = last_trade.price
-        shares_qty = 0
-        share_px = 0
+
+    # NOTE: Empty pools mean exchange is not initialized yet
+    if not tez_pool and not token_pool:
+        return
+
+    price = tez_pool / token_pool
+    share_px = (tez_qty + price * token_qty) / shares_qty
 
     position.realized_pl += shares_qty * (share_px - position.avg_share_px)
     position.shares_qty -= shares_qty  # type: ignore

src/demo_quipuswap/handlers/on_fa2_invest_liquidity.py

@@ -5,13 +5,14 @@
 from demo_quipuswap.types.fa2_token.storage import Fa2TokenStorage
 from demo_quipuswap.types.quipu_fa2.parameter.invest_liquidity import InvestLiquidityParameter
 from demo_quipuswap.types.quipu_fa2.storage import QuipuFa2Storage
-from dipdup.models import OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_fa2_invest_liquidity(
     ctx: OperationHandlerContext,
-    invest_liquidity: TransactionContext[InvestLiquidityParameter, QuipuFa2Storage],
-    transfer: TransactionContext[TransferParameter, Fa2TokenStorage],
+    invest_liquidity: Transaction[InvestLiquidityParameter, QuipuFa2Storage],
+    transfer: Transaction[TransferParameter, Fa2TokenStorage],
 ) -> None:
 
     if ctx.template_values is None:

src/demo_quipuswap/handlers/on_fa2_origination.py

@@ -1,13 +1,12 @@
-from typing import Optional
-
 import demo_quipuswap.models as models
 from demo_quipuswap.types.quipu_fa2.storage import QuipuFa2Storage
-from dipdup.models import OperationData, OperationHandlerContext, OriginationContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Origination
 
 
 async def on_fa2_origination(
     ctx: OperationHandlerContext,
-    quipu_fa2_origination: OriginationContext[QuipuFa2Storage],
+    quipu_fa2_origination: Origination[QuipuFa2Storage],
 ) -> None:
     if ctx.template_values is None:
         raise Exception('This index must be templated')

src/demo_quipuswap/handlers/on_fa2_tez_to_token.py

@@ -5,13 +5,14 @@
 from demo_quipuswap.types.fa2_token.storage import Fa2TokenStorage
 from demo_quipuswap.types.quipu_fa2.parameter.tez_to_token_payment import TezToTokenPaymentParameter
 from demo_quipuswap.types.quipu_fa2.storage import QuipuFa2Storage
-from dipdup.models import OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_fa2_tez_to_token(
     ctx: OperationHandlerContext,
-    tez_to_token_payment: TransactionContext[TezToTokenPaymentParameter, QuipuFa2Storage],
-    transfer: TransactionContext[TransferParameter, Fa2TokenStorage],
+    tez_to_token_payment: Transaction[TezToTokenPaymentParameter, QuipuFa2Storage],
+    transfer: Transaction[TransferParameter, Fa2TokenStorage],
 ) -> None:
     if ctx.template_values is None:
         raise Exception('This index must be templated')

src/demo_quipuswap/handlers/on_fa2_token_to_tez.py

@@ -5,13 +5,14 @@
 from demo_quipuswap.types.fa2_token.storage import Fa2TokenStorage
 from demo_quipuswap.types.quipu_fa2.parameter.token_to_tez_payment import TokenToTezPaymentParameter
 from demo_quipuswap.types.quipu_fa2.storage import QuipuFa2Storage
-from dipdup.models import OperationHandlerContext, TransactionContext
+from dipdup.context import OperationHandlerContext
+from dipdup.models import Transaction
 
 
 async def on_fa2_token_to_tez(
     ctx: OperationHandlerContext,
-    token_to_tez_payment: TransactionContext[TokenToTezPaymentParameter, QuipuFa2Storage],
-    transfer: TransactionContext[TransferParameter, Fa2TokenStorage],
+    token_to_tez_payment: Transaction[TokenToTezPaymentParameter, QuipuFa2Storage],
+    transfer: Transaction[TransferParameter, Fa2TokenStorage],
 ) -> None:
     if ctx.template_values is None:
         raise Exception('This index must be templated')