Hooks, typed callbacks, more builtin tables, no more tempstates

pyproject.toml

@@ -47,12 +47,14 @@ black = "^20.8b1"
 bump2version = "^1.0.1"
 diff-cover = "^5.0.1"
 isort = "^5.7.0"
-mypy = "^0.812"
+mypy = "^0.900"
 pytest = "^3.0"
 pytest-cov = "^2.4"
 flake8 = "3.9.0"
 flakehell = "^0.9.0"
 testcontainers = "^3.4.1"
+types-tabulate = "^0.8.2"
+types-pytz = "^2021.1.2"
 
 [tool.poetry.extras]
 pytezos = ["pytezos"]

src/demo_hic_et_nunc/dipdup-docker.yml

@@ -5,7 +5,6 @@ database:
   user: ${POSTGRES_USER:-dipdup}
   password: ${POSTGRES_PASSWORD:-changeme}
   database: ${POSTGRES_DB:-dipdup}
-  schema_name: hic_et_nunc
 
 hasura:
   url: http://hasura:8080

src/demo_hic_et_nunc/dipdup-local.yml

@@ -5,7 +5,6 @@ database:
   user: ${POSTGRES_USER:-dipdup}
   password: ${POSTGRES_PASSWORD:-changeme}
   database: ${POSTGRES_DB:-dipdup}
-  schema_name: hic_et_nunc
 
 hasura:
   url: http://127.0.0.1:8080

src/demo_hic_et_nunc/dipdup.yml

@@ -1,4 +1,4 @@
-spec_version: 1.1
+spec_version: 1.2
 package: demo_hic_et_nunc
 
 database:

src/demo_hic_et_nunc/docker/docker-compose.yml

@@ -30,7 +30,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.0.4
+    image: hasura/graphql-engine:v2.0.8
     ports:
       - 127.0.0.1:8080:8080
     depends_on:

src/demo_hic_et_nunc/hooks/on_reindex.py

@@ -0,0 +1,7 @@
+from dipdup.context import HookContext
+
+
+async def on_reindex(
+    ctx: HookContext,
+) -> None:
+    await ctx.execute_sql('on_reindex')

src/demo_hic_et_nunc/hooks/on_restart.py

@@ -0,0 +1,7 @@
+from dipdup.context import HookContext
+
+
+async def on_restart(
+    ctx: HookContext,
+) -> None:
+    await ctx.execute_sql('on_restart')

src/demo_hic_et_nunc/hooks/on_rollback.py

@@ -0,0 +1,12 @@
+from dipdup.context import HookContext
+from dipdup.datasources.datasource import Datasource
+
+
+async def on_rollback(
+    ctx: HookContext,
+    datasource: Datasource,
+    from_level: int,
+    to_level: int,
+) -> None:
+    await ctx.execute_sql('on_rollback')
+    await ctx.reindex(reason='reorg message received')

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

@@ -3,9 +3,12 @@
 
 from __future__ import annotations
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 
 class CollectParameter(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     objkt_amount: str
     swap_id: str

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

@@ -3,10 +3,13 @@
 
 from __future__ import annotations
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 
 class MintOBJKTParameter(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     address: str
     amount: str
     metadata: str

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

@@ -3,10 +3,13 @@
 
 from __future__ import annotations
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 
 class SwapParameter(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     objkt_amount: str
     objkt_id: str
     xtz_per_objkt: str

src/demo_hic_et_nunc/types/hen_minter/storage.py

@@ -5,22 +5,31 @@
 
 from typing import Dict
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 
 class Royalties(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     issuer: str
     royalties: str
 
 
 class Swaps(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     issuer: str
     objkt_amount: str
     objkt_id: str
     xtz_per_objkt: str
 
 
 class HenMinterStorage(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     curate: str
     genesis: str
     hdao: str

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

@@ -5,10 +5,13 @@
 
 from typing import Dict
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 
 class MintParameter(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     address: str
     amount: str
     token_id: str

src/demo_hic_et_nunc/types/hen_objkts/storage.py

@@ -5,36 +5,54 @@
 
 from typing import Any, Dict, List
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 
 class Key(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     address: str
     nat: str
 
 
 class LedgerItem(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     key: Key
     value: str
 
 
 class Key1(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     operator: str
     owner: str
     token_id: str
 
 
 class Operator(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     key: Key1
     value: Dict[str, Any]
 
 
 class TokenMetadata(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     token_id: str
     token_info: Dict[str, str]
 
 
 class HenObjktsStorage(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     administrator: str
     all_tokens: str
     ledger: List[LedgerItem]

src/demo_quipuswap/dipdup-docker.yml

@@ -5,7 +5,6 @@ database:
   user: ${POSTGRES_USER:-dipdup}
   password: ${POSTGRES_PASSWORD:-changeme}
   database: ${POSTGRES_DB:-dipdup}
-  schema_name: quipuswap
 
 hasura:
   url: http://hasura:8080

src/demo_quipuswap/dipdup.yml

@@ -1,4 +1,4 @@
-spec_version: 1.1
+spec_version: 1.2
 package: demo_quipuswap
 
 database:

src/demo_quipuswap/docker/docker-compose.yml

@@ -30,7 +30,7 @@ services:
       retries: 5
 
   hasura:
-    image: hasura/graphql-engine:v2.0.4
+    image: hasura/graphql-engine:v2.0.8
     ports:
       - 127.0.0.1:8080:8080
     depends_on:

src/demo_quipuswap/hooks/on_reindex.py

@@ -0,0 +1,7 @@
+from dipdup.context import HookContext
+
+
+async def on_reindex(
+    ctx: HookContext,
+) -> None:
+    await ctx.execute_sql('on_reindex')

src/demo_quipuswap/hooks/on_restart.py

@@ -0,0 +1,7 @@
+from dipdup.context import HookContext
+
+
+async def on_restart(
+    ctx: HookContext,
+) -> None:
+    await ctx.execute_sql('on_restart')

src/demo_quipuswap/hooks/on_rollback.py

@@ -0,0 +1,12 @@
+from dipdup.context import HookContext
+from dipdup.datasources.datasource import Datasource
+
+
+async def on_rollback(
+    ctx: HookContext,
+    datasource: Datasource,
+    from_level: int,
+    to_level: int,
+) -> None:
+    await ctx.execute_sql('on_rollback')
+    await ctx.reindex(reason='reorg message received')

src/demo_quipuswap/types/fa12_token/parameter/transfer.py

@@ -3,10 +3,13 @@
 
 from __future__ import annotations
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Extra, Field
 
 
 class TransferParameter(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     from_: str = Field(..., alias='from')
     to: str
     value: str

src/demo_quipuswap/types/fa12_token/storage.py

@@ -5,20 +5,29 @@
 
 from typing import Dict
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 
 class Balances(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     approvals: Dict[str, str]
     balance: str
 
 
 class TokenMetadata(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     map: Dict[str, str]
     nat: str
 
 
 class Fa12TokenStorage(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     administrator: str
     balances: Dict[str, Balances]
     debtCeiling: str

src/demo_quipuswap/types/fa2_token/parameter/transfer.py

@@ -5,16 +5,22 @@
 
 from typing import List
 
-from pydantic import BaseModel
+from pydantic import BaseModel, Extra
 
 
 class Tx(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     to_: str
     token_id: str
     amount: str
 
 
 class TransferParameterItem(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
     from_: str
     txs: List[Tx]