Get abiHash back to router DTO

Author: Uxio0

app/routers/models.py

@@ -29,9 +29,17 @@ class ProjectPublic(CamelModel):
 class AbiPublic(CamelModel):
     model_config = ConfigDict(from_attributes=True)
 
+    abi_hash: str | None = None
     abi_json: list[dict] | dict | None
     modified: datetime
 
+    @field_validator("abi_hash", mode="before")
+    @classmethod
+    def bytes_to_hex(cls, v: bytes | str | None) -> str | None:
+        if isinstance(v, bytes):
+            return "0x" + v.hex()
+        return v
+
 
 class ContractsPublic(CamelModel):
     model_config = ConfigDict(from_attributes=True)

app/tests/datasources/db/test_models.py

@@ -409,7 +409,7 @@ async def test_abi_hash_generated_column(self):
         await abi.create()
 
         self.assertIsNotNone(abi.abi_hash)
-        assert abi.abi_hash is not None  # narrow type for len()
+        assert abi.abi_hash is not None
         self.assertEqual(len(abi.abi_hash), 32)
         first_hash = abi.abi_hash
 

app/tests/routers/test_contracts.py

@@ -79,6 +79,8 @@ async def test_view_contracts(self):
         self.assertEqual(results[0]["address"], address_expected)
         self.assertEqual(results[0]["abi"]["abiJson"], mock_abi_json)
         self.assertEqual(results[0]["abi"]["modified"], datetime_to_str(abi.modified))
+        assert abi.abi_hash is not None
+        self.assertEqual(results[0]["abi"]["abiHash"], "0x" + abi.abi_hash.hex())
         self.assertEqual(results[0]["displayName"], None)
         self.assertEqual(results[0]["chainId"], 1)
         self.assertEqual(results[0]["project"], None)