Fix empty contract balance in the amount field (#533)

Author: droserasprout

.github/workflows/test.yml

@@ -37,7 +37,7 @@ jobs:
           cache: 'poetry'
 
       - name: Set up cache (replays)
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         id: cache-replays
         with:
           path: ~/.cache/dipdup/replays

CHANGELOG.md

@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 - http: Adjusted per-datasource default config values.
 - project: Fixed outdated options in DipDup version question.
 - tzkt: Fixed deserializing `EventData` model.
+- tzkt: Fixed empty contract balance in the `amount` field.
 
 ## [6.2.0] - 2022-10-12
 

src/dipdup/datasources/tzkt/datasource.py

@@ -877,6 +877,9 @@ def convert_operation(
         parameter_json = operation_json.get('parameter') or {}
         originated_contract_json = operation_json.get('originatedContract') or {}
 
+        if (amount := operation_json.get('contractBalance')) is None:
+            amount = operation_json.get('amount')
+
         entrypoint, parameter = parameter_json.get('entrypoint'), parameter_json.get('value')
         if target_json.get('address', '').startswith('KT1'):
             # NOTE: TzKT returns None for `default` entrypoint
@@ -898,7 +901,7 @@ def convert_operation(
             sender_address=sender_json.get('address'),
             target_address=target_json.get('address'),
             initiator_address=initiator_json.get('address'),
-            amount=operation_json.get('amount', operation_json.get('contractBalance')),
+            amount=amount,
             status=operation_json['status'],
             has_internals=operation_json.get('hasInternals'),
             sender_alias=operation_json['sender'].get('alias'),

tests/test_dipdup/responses/origination_amount.json

@@ -0,0 +1,56 @@
+[
+    {
+        "type": "origination",
+        "id": 71515915681792,
+        "level": 1414413,
+        "timestamp": "2022-10-29T13:31:45Z",
+        "block": "BLtUaExwJnDyVJMAjseVhimNsQ5QCzr3ABDcCC5x9Hi4QyKtaA6",
+        "hash": "ooFPKF1FGeMBHyP8YDtrhTsWX6dodMYRpBiNSCE5Qgj4JZofJA2",
+        "counter": 397773,
+        "sender": {
+            "address": "tz1bgvq6y5RdjAUzBNNovqoAgBXv77dbkdhT"
+        },
+        "gasLimit": 12351,
+        "gasUsed": 12251,
+        "storageLimit": 17119,
+        "storageUsed": 16762,
+        "bakerFee": 17969,
+        "storageFee": 4190500,
+        "allocationFee": 64250,
+        "contractBalance": 31000000,
+        "code": [],
+        "storage": {
+            "lines": 194290,
+            "claims": 194287,
+            "events": 194289,
+            "entries": 194288,
+            "manager": "tz1bgvq6y5RdjAUzBNNovqoAgBXv77dbkdhT",
+            "metadata": 194291,
+            "maxEvents": "0",
+            "positions": 194292,
+            "precision": "1000000",
+            "nextLineId": "0",
+            "nextEntryId": "0",
+            "totalShares": "0",
+            "withdrawals": 194293,
+            "activeEvents": {},
+            "liquidityUnits": "0",
+            "nextPositionId": "0",
+            "entryLiquidityF": "0",
+            "entryLockPeriod": "0",
+            "isDepositPaused": false,
+            "proposedManager": "tz1bgvq6y5RdjAUzBNNovqoAgBXv77dbkdhT",
+            "activeLiquidityF": "0",
+            "nextWithdrawalId": "0",
+            "withdrawableLiquidityF": "0"
+        },
+        "diffs": [],
+        "status": "applied",
+        "originatedContract": {
+            "kind": "smart_contract",
+            "address": "KT18yRWV3SxjQXTHAmYMrsVCxapDjAyRc6NX",
+            "typeHash": 1717450189,
+            "codeHash": -1823060929
+        }
+    }
+]

tests/test_dipdup/test_models.py

@@ -375,3 +375,15 @@ def test_yupana(self) -> None:
         self.assertIsInstance(storage_obj, YupanaStorage)
         self.assertIsInstance(storage_obj.storage.markets, dict)
         self.assertEqual(storage_obj.storage.markets['tz1MDhGTfMQjtMYFXeasKzRWzkQKPtXEkSEw'], ['0'])
+
+
+def _load_response(name: str) -> Any:
+    path = Path(__file__).parent / 'responses' / name
+    return json.loads(path.read_bytes())
+
+
+def test_origination_amount() -> None:
+    operations_json = _load_response('origination_amount.json')
+    operation = TzktDatasource.convert_operation(operations_json[0])
+
+    assert operation.amount == 31000000