Clean code

Author: Uxio0

config/settings/base.py

@@ -614,8 +614,6 @@
     for address in env.list("ETH_EVENTS_IGNORED_INITIATORS", default=[])
 }  # Initiator addresses whose created Safes should be ignored during L2 indexing
 
-# Auto-enabled when any conditional indexing selector is configured (e.g., ETH_EVENTS_IGNORED_INITIATORS)
-ETH_EVENTS_CONDITIONAL_INDEXING: bool = bool(ETH_EVENTS_IGNORED_INITIATORS)
 
 # ENABLE/DISABLE COLLECTIBLES DOWNLOAD METADATA, enable=True, disabled by default
 COLLECTIBLES_ENABLE_DOWNLOAD_METADATA = env.bool(

safe_transaction_service/history/indexers/safe_events_indexer.py

@@ -641,9 +641,6 @@ def _process_safe_creation_events(
         - SafeSetup
         - ProxyCreation
 
-        Note: When conditional indexing is enabled, events are filtered by tx._from
-        in process_elements() before this method is called.
-
         :param safe_addresses_with_creation_events:
         :return: Generated InternalTxs for safe creation
         """
@@ -747,10 +744,9 @@ def _process_safe_creation_events(
 
         logger.debug("InternalTx and InternalTxDecoded objects for creation were built")
 
-        stored_internal_txs = InternalTx.objects.store_internal_txs_and_decoded_in_db(
+        return InternalTx.objects.store_internal_txs_and_decoded_in_db(
             internal_txs, internal_txs_decoded
         )
-        return stored_internal_txs
 
     def _prefetch_timestamp_for_blocks(
         self, decoded_elements: list[EventData]
@@ -880,20 +876,23 @@ def _process_decoded_elements(
             )
             processed_elements.extend(creation_events_processed)
 
-        # When conditional indexing is enabled, filter non-creation events
-        # to only process events for Safes that exist in SafeContract table
-        elements_to_process = decoded_elements
+        elements_to_process = [
+            element
+            for element in decoded_elements
+            if element["event"] not in ("SafeSetup", "ProxyCreation")
+        ]
+
+        # When conditional indexing is enabled, only process events for Safes
+        # that exist in SafeContract table
         if self.conditional_indexing_enabled:
             # Get all unique Safe addresses from non-creation events
             non_creation_addresses = {
-                element["address"]
-                for element in decoded_elements
-                if element["event"] not in ("SafeSetup", "ProxyCreation")
+                element["address"] for element in decoded_elements
             }
             if non_creation_addresses:
                 # Check which addresses exist in SafeContract
                 existing_addresses = SafeContract.objects.get_existing_addresses(
-                    list(non_creation_addresses)
+                    non_creation_addresses
                 )
                 skipped_count = len(non_creation_addresses) - len(existing_addresses)
                 if skipped_count:
@@ -907,8 +906,7 @@ def _process_decoded_elements(
                 elements_to_process = [
                     element
                     for element in decoded_elements
-                    if element["event"] in ("SafeSetup", "ProxyCreation")
-                    or element["address"] in existing_addresses
+                    if element["address"] in existing_addresses
                 ]
 
         # Store everything together in the database if possible