Fix typing warnings

- Use builtin types instead of importing from `typing`
- Not all the types were updated

Author: Uxio0

safe_transaction_service/account_abstraction/helpers.py

@@ -1,5 +1,4 @@
 import dataclasses
-from typing import List
 
 from eth_typing import ChecksumAddress
 from safe_eth.eth import EthereumClient
@@ -19,7 +18,7 @@ class DecodedInitCode:
     salt_nonce: int
     expected_address: ChecksumAddress  # Expected Safe deployment address
     # Safe creation data
-    owners: List[ChecksumAddress]
+    owners: list[ChecksumAddress]
     threshold: int
     to: ChecksumAddress
     data: bytes

safe_transaction_service/account_abstraction/serializers.py

@@ -1,5 +1,5 @@
 import datetime
-from typing import Any, Dict, List, Optional
+from typing import Any, Optional
 
 from django.conf import settings
 from django.db import transaction
@@ -39,9 +39,9 @@ class SafeOperationSignatureValidatorMixin:
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.ethereum_client = get_auto_ethereum_client()
-        self._deployment_owners: List[ChecksumAddress] = []
+        self._deployment_owners: list[ChecksumAddress] = []
 
-    def _get_owners(self, safe_address: ChecksumAddress) -> List[ChecksumAddress]:
+    def _get_owners(self, safe_address: ChecksumAddress) -> list[ChecksumAddress]:
         """
         :param safe_address:
         :return:  `init_code` decoded owners if Safe is not deployed or current blockchain owners if Safe is deployed
@@ -59,7 +59,7 @@ def _validate_signature(
         safe_operation_hash: bytes,
         safe_operation_hash_preimage: bytes,
         signature: bytes,
-    ) -> List[SafeSignature]:
+    ) -> list[SafeSignature]:
         safe_owners = self._get_owners(safe_address)
         parsed_signatures = SafeSignature.parse_signature(
             signature,
@@ -375,7 +375,7 @@ def validate(self, attrs):
     @transaction.atomic
     def save(self, **kwargs):
         safe_signatures = self.validated_data["safe_signatures"]
-        safe_operation_confirmations: List[SafeOperationConfirmation] = []
+        safe_operation_confirmations: list[SafeOperationConfirmation] = []
         for safe_signature in safe_signatures:
             safe_operation_confirmation, created = (
                 SafeOperationConfirmation.objects.get_or_create(
@@ -438,7 +438,7 @@ class SafeOperationResponseSerializer(serializers.Serializer):
     confirmations = serializers.SerializerMethodField()
     prepared_signature = serializers.SerializerMethodField()
 
-    def get_confirmations(self, obj: SafeOperationModel) -> Dict[str, Any]:
+    def get_confirmations(self, obj: SafeOperationModel) -> dict[str, Any]:
         """
         Filters confirmations queryset
 

safe_transaction_service/account_abstraction/services/aa_processor_service.py

@@ -1,6 +1,6 @@
 import logging
 from functools import cache
-from typing import List, Optional, Sequence, Tuple
+from typing import Optional, Sequence
 
 from django.conf import settings
 from django.db import transaction
@@ -73,8 +73,8 @@ def __init__(
         self.supported_entry_points = supported_entry_points
 
     def get_user_operation_hashes_from_logs(
-        self, safe_address: ChecksumAddress, logs: [Sequence[LogReceipt]]
-    ) -> List[HexBytes]:
+        self, safe_address: ChecksumAddress, logs: Sequence[LogReceipt]
+    ) -> list[HexBytes]:
         """
         :param safe_address:
         :param logs:
@@ -109,7 +109,7 @@ def index_safe_operation_confirmations(
         signature: bytes,
         safe_operation_model: SafeOperationModel,
         safe_operation: SafeOperation,
-    ) -> List[SafeOperationConfirmationModel]:
+    ) -> list[SafeOperationConfirmationModel]:
         """
         Creates missing ``SafeOperationConfirmations``
 
@@ -144,7 +144,7 @@ def index_safe_operation(
         user_operation_model: UserOperationModel,
         user_operation: UserOperation,
         user_operation_receipt: UserOperationReceipt,
-    ) -> Optional[Tuple[SafeOperationModel, SafeOperation]]:
+    ) -> Optional[tuple[SafeOperationModel, SafeOperation]]:
         """
         Creates or updates a Safe Operation
 
@@ -206,7 +206,7 @@ def index_safe_operation(
 
     def index_user_operation_receipt(
         self, user_operation_model: UserOperationModel
-    ) -> Tuple[UserOperationReceiptModel, UserOperationReceipt]:
+    ) -> tuple[UserOperationReceiptModel, UserOperationReceipt]:
         """
         Stores UserOperationReceipt. Can never be updated as if ``UserOperationReceipt`` is on database indexing
         ``UserOperation`` is not required
@@ -277,7 +277,7 @@ def index_user_operation(
         safe_address: ChecksumAddress,
         user_operation_hash: HexBytes,
         ethereum_tx: history_models.EthereumTx,
-    ) -> Tuple[UserOperationModel, UserOperation]:
+    ) -> tuple[UserOperationModel, UserOperation] | None:
         """
         Index ``UserOperation``, ``SafeOperation`` and ``UserOperationReceipt`` for the given ``UserOperation`` log
 
@@ -294,72 +294,73 @@ def index_user_operation(
                 safe_address,
                 user_operation_hash_hex,
             )
-        else:
+            return None
+
+        logger.debug(
+            "[%s] Retrieving UserOperation from Bundler with user-operation-hash=%s on tx-hash=%s",
+            safe_address,
+            user_operation_hash_hex,
+            ethereum_tx.tx_hash,
+        )
+        user_operation = self.bundler_client.get_user_operation_by_hash(
+            user_operation_hash_hex
+        )
+        if not user_operation:
+            self.bundler_client.get_user_operation_by_hash.cache_clear()
+            raise BundlerClientException(
+                f"user-operation={user_operation_hash_hex} returned `null`"
+            )
+        if isinstance(user_operation, UserOperationV07):
+            raise UserOperationNotSupportedException(
+                f"user-operation={user_operation_hash_hex} for EntryPoint v0.7.0 is not supported"
+            )
+
+        try:
+            user_operation_model = UserOperationModel.objects.get(
+                hash=user_operation_hash_hex
+            )
             logger.debug(
-                "[%s] Retrieving UserOperation from Bundler with user-operation-hash=%s on tx-hash=%s",
+                "[%s] Updating UserOperation with user-operation=%s on tx-hash=%s",
                 safe_address,
                 user_operation_hash_hex,
                 ethereum_tx.tx_hash,
             )
-            user_operation = self.bundler_client.get_user_operation_by_hash(
-                user_operation_hash_hex
-            )
-            if not user_operation:
-                self.bundler_client.get_user_operation_by_hash.cache_clear()
-                raise BundlerClientException(
-                    f"user-operation={user_operation_hash_hex} returned `null`"
-                )
-            if isinstance(user_operation, UserOperationV07):
-                raise UserOperationNotSupportedException(
-                    f"user-operation={user_operation_hash_hex} for EntryPoint v0.7.0 is not supported"
-                )
-
-            try:
-                user_operation_model = UserOperationModel.objects.get(
-                    hash=user_operation_hash_hex
-                )
-                logger.debug(
-                    "[%s] Updating UserOperation with user-operation=%s on tx-hash=%s",
-                    safe_address,
-                    user_operation_hash_hex,
-                    ethereum_tx.tx_hash,
-                )
-                user_operation_model.signature = user_operation.signature
-                user_operation_model.ethereum_tx = ethereum_tx
-                user_operation_model.save(update_fields=["signature", "ethereum_tx"])
-            except UserOperationModel.DoesNotExist:
-                logger.debug(
-                    "[%s] Storing UserOperation with user-operation=%s on tx-hash=%s",
-                    safe_address,
-                    user_operation_hash_hex,
-                    ethereum_tx.tx_hash,
-                )
-                user_operation_model = UserOperationModel.objects.create(
-                    ethereum_tx=ethereum_tx,
-                    hash=user_operation_hash_hex,
-                    sender=user_operation.sender,
-                    nonce=user_operation.nonce,
-                    init_code=user_operation.init_code,
-                    call_data=user_operation.call_data,
-                    call_gas_limit=user_operation.call_gas_limit,
-                    verification_gas_limit=user_operation.verification_gas_limit,
-                    pre_verification_gas=user_operation.pre_verification_gas,
-                    max_fee_per_gas=user_operation.max_fee_per_gas,
-                    max_priority_fee_per_gas=user_operation.max_priority_fee_per_gas,
-                    paymaster=user_operation.paymaster,
-                    paymaster_data=user_operation.paymaster_data,
-                    signature=user_operation.signature,
-                    entry_point=user_operation.entry_point,
-                )
-
-            _, user_operation_receipt = self.index_user_operation_receipt(
-                user_operation_model
+            user_operation_model.signature = user_operation.signature
+            user_operation_model.ethereum_tx = ethereum_tx
+            user_operation_model.save(update_fields=["signature", "ethereum_tx"])
+        except UserOperationModel.DoesNotExist:
+            logger.debug(
+                "[%s] Storing UserOperation with user-operation=%s on tx-hash=%s",
+                safe_address,
+                user_operation_hash_hex,
+                ethereum_tx.tx_hash,
             )
-            self.index_safe_operation(
-                user_operation_model, user_operation, user_operation_receipt
+            user_operation_model = UserOperationModel.objects.create(
+                ethereum_tx=ethereum_tx,
+                hash=user_operation_hash_hex,
+                sender=user_operation.sender,
+                nonce=user_operation.nonce,
+                init_code=user_operation.init_code,
+                call_data=user_operation.call_data,
+                call_gas_limit=user_operation.call_gas_limit,
+                verification_gas_limit=user_operation.verification_gas_limit,
+                pre_verification_gas=user_operation.pre_verification_gas,
+                max_fee_per_gas=user_operation.max_fee_per_gas,
+                max_priority_fee_per_gas=user_operation.max_priority_fee_per_gas,
+                paymaster=user_operation.paymaster,
+                paymaster_data=user_operation.paymaster_data,
+                signature=user_operation.signature,
+                entry_point=user_operation.entry_point,
             )
 
-            return user_operation_model, user_operation
+        _, user_operation_receipt = self.index_user_operation_receipt(
+            user_operation_model
+        )
+        self.index_safe_operation(
+            user_operation_model, user_operation, user_operation_receipt
+        )
+
+        return user_operation_model, user_operation
 
     def process_aa_transaction(
         self, safe_address: ChecksumAddress, ethereum_tx: history_models.EthereumTx

safe_transaction_service/analytics/services/analytics_service.py

@@ -1,6 +1,5 @@
 import json
 from functools import cache
-from typing import List
 
 from safe_transaction_service.utils.redis import get_redis
 
@@ -13,7 +12,7 @@ def get_analytics_service() -> "AnalyticsService":
 class AnalyticsService:
     REDIS_TRANSACTIONS_PER_SAFE_APP = "analytics_transactions_per_safe_app"
 
-    def get_safe_transactions_per_safe_app(self) -> List:
+    def get_safe_transactions_per_safe_app(self) -> list[dict]:
         redis = get_redis()
         analytic_result = redis.get(self.REDIS_TRANSACTIONS_PER_SAFE_APP)
         if analytic_result:

safe_transaction_service/contracts/management/commands/setup_safe_contracts.py

@@ -1,5 +1,4 @@
 import logging
-from typing import List, Tuple
 
 from django.core.files import File
 from django.core.management import BaseCommand, CommandError
@@ -108,16 +107,16 @@ def handle(self, *args, **options):
 
     @staticmethod
     def _get_deployments_by_chain_and_version(
-        versions: List[str], chain_id: str
-    ) -> List[Tuple[str, str, str]]:
+        versions: list[str], chain_id: str
+    ) -> list[tuple[str, str, str]]:
         """
         Get the list of contracts for the given versions and chain.
 
         :param versions: list of versions
         :param chain_id: chain id
         :return: list of (version, contract_name, contract_address)
         """
-        chain_deployments: List[Tuple[str, str, str]] = []
+        chain_deployments: list[tuple[str, str, str]] = []
         for version in versions:
             for contract_name, addresses in safe_deployments[version].items():
                 for contract_address in addresses.get(chain_id, []):
@@ -127,16 +126,16 @@ def _get_deployments_by_chain_and_version(
 
     @staticmethod
     def _get_default_deployments_by_version_on_chain(
-        versions: List[str], ethereum_client: EthereumClient
-    ) -> List[Tuple[str, str, str]]:
+        versions: list[str], ethereum_client: EthereumClient
+    ) -> list[tuple[str, str, str]]:
         """
         Get the default deployments by version actually deployed on chain.
 
         :param versions: list of versions
         :param ethereum_client: Ethereum client
         :return: list of (version, contract_name, contract_address)
         """
-        chain_deployments: List[Tuple[str, str, str]] = []
+        chain_deployments: list[tuple[str, str, str]] = []
         for version in versions:
             for contract_name, addresses in default_safe_deployments[version].items():
                 for contract_address in addresses:
@@ -149,7 +148,7 @@ def _get_default_deployments_by_version_on_chain(
 
     @staticmethod
     def _create_or_update_contracts_from_deployments(
-        deployments: List[Tuple[str, str, str]],
+        deployments: list[tuple[str, str, str]],
         queryset,
         force_update_contracts: bool,
         logo_file: File,

safe_transaction_service/contracts/models.py

@@ -2,7 +2,7 @@
 import operator
 import os
 from logging import getLogger
-from typing import Any, Dict, List, Optional
+from typing import Any, Optional
 
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -38,7 +38,7 @@ def get_file_storage():
         return default_storage
 
 
-def validate_abi(value: Dict[str, Any]):
+def validate_abi(value: dict[str, Any]):
     try:
         if not value:
             raise ValueError("Empty ABI not allowed")
@@ -66,7 +66,7 @@ class ContractAbi(models.Model):
     def __str__(self):
         return f"ContractABI {self.relevance} - {self.description}"
 
-    def abi_functions(self) -> List[str]:
+    def abi_functions(self) -> list[str]:
         return [x["name"] for x in self.abi if x["type"] == "function"]
 
     def save(self, *args, **kwargs) -> None: