Fixed parsing storage with top-level boolean fields (#199)

* Fix booleans in storage

* Fix parsing storage with top-level boolean fields

Author: droserasprout

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 Please use [this](https://docs.gitlab.com/ee/development/changelog.html) document as guidelines to keep a changelog.
 
-## [unreleased]
+## 4.0.2 - 2022-01-06
 
 ### Added
 
@@ -12,6 +12,7 @@ Please use [this](https://docs.gitlab.com/ee/development/changelog.html) documen
 
 * tzkt: Fixed crash due to unprocessed pysignalr exception.
 * tzkt: Fixed parsing `OperationData.amount` field.
+* tzkt: Fixed parsing storage with top-level boolean fields
 
 ## 4.0.1 - 2021-12-30
 

scripts/init_tests.sh

@@ -1,8 +1,9 @@
 #$/bin/bash
 cd tests/test_dipdup
-for name in "asdf" "qwer" "hjkl" "zxcv" "rewq"
+for name in "asdf" "qwer" "hjkl" "zxcv" "rewq" "hen_subjkt"
 do
     dipdup -c $name.yml init
+    mkdir -p types/$name/
     mv $name/types/$name/storage.py types/$name/storage.py
     rm -r $name
 done

src/dipdup/datasources/tzkt/models.py

@@ -131,7 +131,7 @@ def _process_storage(
 ) -> Any:
     """Replace bigmap pointers with actual data from diffs"""
     # NOTE: Bigmap pointer, apply diffs
-    if isinstance(storage, int) and storage_type not in (int, bool):
+    if isinstance(storage, int) and type(storage) != storage_type:
         is_array = _is_array(storage_type)
         storage = _apply_bigmap_diffs(storage, bigmap_diffs, is_array)
 

tests/test_dipdup/hen_subjkt.json

@@ -0,0 +1,87 @@
+[
+    {
+        "type": "transaction",
+        "id": 51691121,
+        "level": 1486393,
+        "timestamp": "2021-05-25T05:49:38Z",
+        "block": "BL8BSn2wNkGHtrW5h91evEymnGe1f1ZLcXdcP1aoL37Pdx25VC4",
+        "hash": "ooCJ3MT8azAG6YtGc3iTTsVb13f97utnF4aGbPmeRRRDtBUBxib",
+        "counter": 11788253,
+        "sender": {
+            "address": "tz1Y1j7FK1X9Rrv2VdPz5bXoU7SszF8W1RnK"
+        },
+        "gasLimit": 12272,
+        "gasUsed": 12172,
+        "storageLimit": 340,
+        "storageUsed": 340,
+        "bakerFee": 1608,
+        "storageFee": 85000,
+        "allocationFee": 0,
+        "target": {
+            "alias": "Hic et Nunc Name Registry",
+            "address": "KT1My1wDZHDGweCrJnQJi3wcFaS67iksirvj"
+        },
+        "amount": 0,
+        "parameter": {
+            "entrypoint": "registry",
+            "value": {
+                "subjkt": "697066733a2f2f516d61785435644c41586d4e61456271334d39545971384a5070383445313136785775364b43786f5933356b5051",
+                "metadata": "63727a797061746368776f726b"
+            }
+        },
+        "storage": {
+            "entries": 3916,
+            "manager": "tz1Y1j7FK1X9Rrv2VdPz5bXoU7SszF8W1RnK",
+            "subjkts": 3920,
+            "invoices": 3917,
+            "metadata": 3918,
+            "registries": 3919,
+            "subjkts_metadata": 3921
+        },
+        "diffs": [
+            {
+                "bigmap": 3921,
+                "path": "subjkts_metadata",
+                "action": "add_key",
+                "content": {
+                    "hash": "exprvG7n7nqTvEWSAqYs7xtDA1sspVwkNXNckjycav3iCqEGK3551Y",
+                    "key": "697066733a2f2f516d61785435644c41586d4e61456271334d39545971384a5070383445313136785775364b43786f5933356b5051",
+                    "value": "63727a797061746368776f726b"
+                }
+            },
+            {
+                "bigmap": 3920,
+                "path": "subjkts",
+                "action": "add_key",
+                "content": {
+                    "hash": "exprvG7n7nqTvEWSAqYs7xtDA1sspVwkNXNckjycav3iCqEGK3551Y",
+                    "key": "697066733a2f2f516d61785435644c41586d4e61456271334d39545971384a5070383445313136785775364b43786f5933356b5051",
+                    "value": true
+                }
+            },
+            {
+                "bigmap": 3919,
+                "path": "registries",
+                "action": "add_key",
+                "content": {
+                    "hash": "exprtjfsLWoz5kkutCAtoRAHr4L9pD41UCmrdi77Lh6h3Msg55Ueuj",
+                    "key": "tz1Y1j7FK1X9Rrv2VdPz5bXoU7SszF8W1RnK",
+                    "value": "697066733a2f2f516d61785435644c41586d4e61456271334d39545971384a5070383445313136785775364b43786f5933356b5051"
+                }
+            },
+            {
+                "bigmap": 3916,
+                "path": "entries",
+                "action": "add_key",
+                "content": {
+                    "hash": "exprtjfsLWoz5kkutCAtoRAHr4L9pD41UCmrdi77Lh6h3Msg55Ueuj",
+                    "key": "tz1Y1j7FK1X9Rrv2VdPz5bXoU7SszF8W1RnK",
+                    "value": true
+                }
+            }
+        ],
+        "status": "applied",
+        "hasInternals": false,
+        "parameters": "{\"entrypoint\":\"registry\",\"value\":{\"prim\":\"Pair\",\"args\":[{\"bytes\":\"63727a797061746368776f726b\"},{\"bytes\":\"697066733a2f2f516d61785435644c41586d4e61456271334d39545971384a5070383445313136785775364b43786f5933356b5051\"}]}}"
+    }
+]

tests/test_dipdup/hen_subjkt.yml

@@ -0,0 +1,24 @@
+spec_version: 1.2
+package: hen_subjkt
+
+contracts:
+  hen_subjkt:
+    address: KT1My1wDZHDGweCrJnQJi3wcFaS67iksirvj
+    typename: hen_subjkt
+
+datasources:
+  tzkt:
+    kind: tzkt
+    url: https://api.tzkt.io
+
+indexes:
+  hen_subjkt:
+    kind: operation
+    datasource: tzkt
+    contracts:
+      - hen_subjkt
+    handlers:
+      - callback: on_registry
+        pattern:
+          - destination: hen_subjkt
+            entrypoint: registry

tests/test_dipdup/test_models.py

@@ -16,6 +16,7 @@
 from tests.test_dipdup.types.asdf.storage import AsdfStorage
 from tests.test_dipdup.types.bazaar.storage import BazaarMarketPlaceStorage
 from tests.test_dipdup.types.ftzfun.storage import FtzFunStorage
+from tests.test_dipdup.types.hen_subjkt.storage import HenSubjktStorage
 from tests.test_dipdup.types.hjkl.storage import HjklStorage
 from tests.test_dipdup.types.listofmaps.storage import ListOfMapsStorage
 from tests.test_dipdup.types.qwer.storage import QwerStorage
@@ -320,3 +321,16 @@ def test_rewq(self) -> None:
         self.assertEqual(storage_obj.map['try'].L['111'], '222')  # type: ignore
         self.assertIsInstance(storage_obj.or_.L, dict)  # type: ignore
         self.assertEqual(storage_obj.or_.L['333'], '444')  # type: ignore
+
+    def test_hen_subjkt(self) -> None:
+        with open(join(dirname(__file__), 'hen_subjkt.json')) as f:
+            operations_json = json.load(f)
+
+        # Act
+        operations = [TzktDatasource.convert_operation(op) for op in operations_json]
+        storage_obj = deserialize_storage(operations[0], HenSubjktStorage)
+
+        # Assert
+        self.assertIsInstance(storage_obj, HenSubjktStorage)
+        self.assertIsInstance(storage_obj.entries, dict)
+        self.assertEqual(storage_obj.entries['tz1Y1j7FK1X9Rrv2VdPz5bXoU7SszF8W1RnK'], True)  # type: ignore

tests/test_dipdup/types/hen_subjkt/__init__.py

@@ -0,0 +1,30 @@
+# generated by datamodel-codegen:
+#   filename:  storage.json
+
+from __future__ import annotations
+
+from typing import Dict
+
+from pydantic import BaseModel
+from pydantic import Extra
+
+
+class Invoices(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    invoice: str
+    subjkt: str
+
+
+class HenSubjktStorage(BaseModel):
+    class Config:
+        extra = Extra.forbid
+
+    entries: Dict[str, bool]
+    invoices: Dict[str, Invoices]
+    manager: str
+    metadata: Dict[str, str]
+    registries: Dict[str, str]
+    subjkts: Dict[str, bool]
+    subjkts_metadata: Dict[str, str]