Rename trusted_for_delegate

Author: moisses89

app/config.py

@@ -43,7 +43,7 @@ class Settings(BaseSettings):
     CONTRACT_MAX_DOWNLOAD_RETRIES: int = (
         90  # Task running once per day, means 3 months trying.
     )
-    CONTRACTS_LOGO_BASE_URL: str = (
+    CONTRACT_LOGO_BASE_URL: str = (
         "https://safe-transaction-assets.safe.global/contracts/logos"
     )
     CONTRACTS_TRUSTED_FOR_DELEGATE_CALL: list[str] = [

app/datasources/db/models.py

@@ -217,7 +217,7 @@ class Contract(SqlQueryBase, TimeStampedSQLModel, table=True):
     name: str | None = None
     display_name: str | None = None
     description: str | None = None
-    trusted_for_delegate: bool = Field(nullable=False, default=False)
+    trusted_for_delegate_call: bool = Field(nullable=False, default=False)
     implementation: bytes | None = None
     fetch_retries: int = Field(nullable=False, default=0)
     abi_id: int | None = Field(nullable=True, default=None, foreign_key="abi.id")
@@ -352,15 +352,15 @@ async def update_contract_info(
         address: bytes,
         name: str,
         display_name: str,
-        trusted_for_delegate: bool | None = False,
+        trusted_for_delegate_call: bool | None = False,
     ) -> int:
         """
         Update the contract metadata for all the chains
 
         :param address:
         :param name:
         :param display_name:
-        :param trusted_for_delegate:
+        :param trusted_for_delegate_call:
         :return: number of affected rows
         """
         query = (
@@ -369,7 +369,7 @@ async def update_contract_info(
             .values(
                 name=name,
                 display_name=display_name,
-                trusted_for_delegate=trusted_for_delegate,
+                trusted_for_delegate_call=trusted_for_delegate_call,
             )
         )
         result = await db_session.execute(query)

app/routers/models.py

@@ -1,5 +1,5 @@
 from datetime import datetime
-from typing import Any, Union, cast
+from typing import Any, Union
 
 from pydantic import Field, computed_field, field_validator, model_validator
 
@@ -51,19 +51,19 @@ def convert_bytes_to_hex(cls, abi_hash: bytes):
 
 
 class ContractsPublic(CamelModel):
-    address: bytes | ChecksumAddress
+    address: ChecksumAddress
     name: str
     display_name: str | None
     chain_id: int
     project: ProjectPublic | None
     abi: AbiPublic
     modified: datetime
-    trusted_for_delegate: bool
+    trusted_for_delegate_call: bool
 
     class Config:
         from_attributes = True
 
-    @field_validator("address")
+    @field_validator("address", mode="before")
     @classmethod
     def convert_to_checksum_address(cls, address: bytes):
         """
@@ -78,12 +78,7 @@ def convert_to_checksum_address(cls, address: bytes):
 
     @computed_field(return_type=str | None)
     def logo_url(self) -> str | None:
-        if isinstance(self.address, bytes):
-            addr_str = cast(str, to_0x_hex_str(self.address))
-        else:
-            addr_str = str(self.address)
-
-        return f"{settings.CONTRACTS_LOGO_BASE_URL}/{addr_str}.png"
+        return f"{settings.CONTRACT_LOGO_BASE_URL}/{self.address}.png"
 
 
 class DataDecoderInput(CamelModel):

app/tests/datasources/db/test_model.py

@@ -314,7 +314,7 @@ async def test_update_contract_info(self):
         for contract in contracts_to_be_updated:
             self.assertIsNone(contract.name)
             self.assertIsNone(contract.display_name)
-            self.assertFalse(contract.trusted_for_delegate)
+            self.assertFalse(contract.trusted_for_delegate_call)
 
         self.assertIsNone(other_contract.name)
         self.assertIsNone(other_contract.display_name)
@@ -323,7 +323,7 @@ async def test_update_contract_info(self):
             address=address_to_be_updated,
             name=contract_name,
             display_name=contract_display_name,
-            trusted_for_delegate=True,
+            trusted_for_delegate_call=True,
         )
         self.assertEqual(rows_affected, 5)
         # Other contract remains not updated
@@ -339,4 +339,4 @@ async def test_update_contract_info(self):
             )
             self.assertEqual(updated_contract.name, contract_name)
             self.assertEqual(updated_contract.display_name, contract_display_name)
-            self.assertTrue(updated_contract.trusted_for_delegate)
+            self.assertTrue(updated_contract.trusted_for_delegate_call)

app/tests/routers/test_contracts.py

@@ -54,10 +54,10 @@ async def test_view_contracts(self):
         self.assertEqual(results[0]["chainId"], 1)
         self.assertEqual(results[0]["project"], None)
         self.assertEqual(results[0]["modified"], datetime_to_str(contract.modified))
-        self.assertFalse(results[0]["trustedForDelegate"])
+        self.assertFalse(results[0]["trustedForDelegateCall"])
         self.assertEqual(
             results[0]["logoUrl"],
-            f"{settings.CONTRACTS_LOGO_BASE_URL}/{address_expected}.png",
+            f"{settings.CONTRACT_LOGO_BASE_URL}/{address_expected}.png",
         )
         # Test filter by chain_id
         contract = Contract(