Dynamic configuration, context and rollback improvements, bugfixes (#49)

Author: droserasprout

docker-compose.yml

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

poetry.lock

@@ -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"

pyproject.toml

@@ -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_cancel_swap.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_collect.py

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

src/demo_hic_et_nunc/handlers/on_configure.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_mint.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_rollback.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/handlers/on_swap.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