V1.5.0 support

requirements.txt

@@ -27,5 +27,5 @@ pillow==11.3.0
 psycopg[binary,pool]==3.2.13
 redis[hiredis]==7.1.0
 requests==2.32.5
-safe-eth-py[django]==7.14.0
+safe-eth-py[django]==7.17.1
 web3==7.14.0

safe_transaction_service/account_abstraction/helpers.py

@@ -2,9 +2,9 @@
 
 from eth_typing import ChecksumAddress
 from safe_eth.eth import EthereumClient
-from safe_eth.eth.contracts import get_safe_V1_4_1_contract
+from safe_eth.eth.contracts import get_safe_contract_by_version
 from safe_eth.eth.utils import fast_to_checksum_address
-from safe_eth.safe.proxy_factory import ProxyFactoryV141
+from safe_eth.safe.proxy_factory import ProxyFactory
 
 
 @dataclasses.dataclass(eq=True, frozen=True)
@@ -41,12 +41,15 @@ def decode_init_code(
         - The ``ProxyFactory`` then deploys a ``Safe Proxy`` and calls ``setup`` with all the configuration parameters.
     :param ethereum_client:
     :return: Decoded Init Code dataclass
-    :raises ValueError: Problem decoding
+    :raises ValueError: Problem decoding or unknown factory address
     """
     factory_address = fast_to_checksum_address(init_code[:20])
     factory_data = init_code[20:]
-    proxy_factory = ProxyFactoryV141(factory_address, ethereum_client)
-    safe_contract = get_safe_V1_4_1_contract(ethereum_client.w3)
+
+    proxy_factory = ProxyFactory.from_address(factory_address, ethereum_client)
+    version = ProxyFactory.detect_version_from_address(factory_address=factory_address)
+    safe_contract = get_safe_contract_by_version(version=version, w3=ethereum_client.w3)
+
     _, data = proxy_factory.contract.decode_function_input(factory_data)
     initializer = data.pop("initializer")
     _, safe_deployment_data = safe_contract.decode_function_input(initializer)

safe_transaction_service/account_abstraction/tests/services/test_aa_processor_service.py

@@ -16,8 +16,12 @@
     safe_4337_user_operation_hash_mock,
     user_operation_mock,
     user_operation_receipt_mock,
-    user_operation_v07_hash,
-    user_operation_v07_mock,
+)
+from safe_eth.eth.tests.mocks.mock_bundler import (
+    user_operation_v07_hash_1 as user_operation_v07_hash,
+)
+from safe_eth.eth.tests.mocks.mock_bundler import (
+    user_operation_v07_mock_1 as user_operation_v07_mock,
 )
 from safe_eth.util.util import to_0x_hex_str
 

safe_transaction_service/contracts/tx_decoder.py

@@ -28,6 +28,7 @@
     get_safe_V1_1_1_contract,
     get_safe_V1_3_0_contract,
     get_safe_V1_4_1_contract,
+    get_safe_V1_5_0_contract,
     get_uniswap_exchange_contract,
 )
 from safe_eth.safe.multi_send import MultiSend
@@ -339,6 +340,7 @@ def get_supported_abis(self) -> list[Sequence[ABIFunction]]:
             get_safe_V1_1_1_contract(self.dummy_w3).abi,
             get_safe_V1_3_0_contract(self.dummy_w3).abi,
             get_safe_V1_4_1_contract(self.dummy_w3).abi,
+            get_safe_V1_5_0_contract(self.dummy_w3).abi,
         ]
 
         # Order is important. If signature is the same (e.g. renaming of `baseGas`) last elements in the list

safe_transaction_service/history/admin.py

@@ -600,13 +600,15 @@ class SafeLastStatusAdmin(AdvancedAdminSearchMixin, admin.ModelAdmin):
         "master_copy",
         "fallback_handler",
         "guard",
+        "module_guard",
         "enabled_modules",
     )
     list_filter = (
         "threshold",
         "master_copy",
         "fallback_handler",
         "guard",
+        "module_guard",
         SafeStatusModulesListFilter,
     )
     list_select_related = ("internal_tx__ethereum_tx", "internal_tx__decoded_tx")

safe_transaction_service/history/indexers/safe_events_indexer.py

@@ -17,6 +17,7 @@
     get_safe_V1_1_1_contract,
     get_safe_V1_3_0_contract,
     get_safe_V1_4_1_contract,
+    get_safe_V1_5_0_contract,
 )
 from safe_eth.util.util import to_0x_hex_str
 from web3.contract.contract import ContractEvent
@@ -54,7 +55,7 @@ def del_singleton(cls):
 
 class SafeEventsIndexer(EventsIndexer):
     """
-    Indexes Gnosis Safe L2 events
+    Indexes Safe L2 events
     """
 
     IGNORE_ADDRESSES_ON_LOG_FILTER = (
@@ -220,6 +221,11 @@ def contract_events(self) -> list[ContractEvent]:
         # ProxyFactory
         event ProxyCreation(GnosisSafeProxy indexed proxy, address singleton);
 
+        Safe v1.5.0 L2 Events
+        ProxyCreationL2 or ChainSpecificProxyCreationL2 are not considered here because tracking ProxyCreation is enough.
+        ------------------
+        event ChangedModuleGuard(address indexed moduleGuard);
+
         :return: List of supported `ContractEvent`
         """
         proxy_factory_v1_4_1_contract = get_proxy_factory_V1_4_1_contract(
@@ -228,6 +234,7 @@ def contract_events(self) -> list[ContractEvent]:
         proxy_factory_v1_3_0_contract = get_proxy_factory_V1_3_0_contract(
             self.ethereum_client.w3
         )
+        safe_l2_v1_5_0_contract = get_safe_V1_5_0_contract(self.ethereum_client.w3)
         safe_l2_v1_4_1_contract = get_safe_V1_4_1_contract(self.ethereum_client.w3)
         safe_l2_v1_3_0_contract = get_safe_V1_3_0_contract(self.ethereum_client.w3)
         safe_v1_1_1_contract = get_safe_V1_1_1_contract(self.ethereum_client.w3)
@@ -269,6 +276,8 @@ def contract_events(self) -> list[ContractEvent]:
                 # Changed Guard
                 safe_l2_v1_4_1_contract.events.ChangedGuard(),
                 safe_l2_v1_3_0_contract.events.ChangedGuard(),
+                # Change Module Guard
+                safe_l2_v1_5_0_contract.events.ChangedModuleGuard(),
                 # Change Master Copy
                 safe_v1_1_1_contract.events.ChangedMasterCopy(),
                 # Proxy creation
@@ -434,6 +443,8 @@ def _process_decoded_element(
             internal_tx_decoded.function_name = "setFallbackHandler"
         elif event_name == "ChangedGuard":
             internal_tx_decoded.function_name = "setGuard"
+        elif event_name == "ChangedModuleGuard":
+            internal_tx_decoded.function_name = "setModuleGuard"
         elif (
             event_name == "SafeReceived" and not self.eth_zksync_compatible_network
         ):  # Received ether
@@ -511,7 +522,6 @@ def _process_safe_creation_events(
     ) -> list[InternalTx]:
         """
         Process creation events (ProxyCreation and SafeSetup). They must be processed together.
-
         Usual order is:
         - SafeSetup
         - ProxyCreation
@@ -573,6 +583,7 @@ def _process_safe_creation_events(
             if setup_event:
                 if not proxy_creation_event:
                     # SafeSetup without ProxyCreation means proxy was created in a previous block
+                    # ProxyCreation is also emitted when ProxyCreationL2 or ChainSpecificProxyCreationL2 are emmited on v1.5.0.
                     logger.debug(
                         "[%s] Proxy was created in previous blocks, deleting the old InternalTx",
                         safe_address,

safe_transaction_service/history/indexers/tx_processor.py

@@ -18,6 +18,7 @@
     get_safe_V1_0_0_contract,
     get_safe_V1_3_0_contract,
     get_safe_V1_4_1_contract,
+    get_safe_V1_5_0_contract,
 )
 from safe_eth.safe import SafeTx
 from safe_eth.safe.safe_signature import SafeSignature, SafeSignatureApprovedHash
@@ -137,10 +138,12 @@ def __init__(
             get_safe_V1_0_0_contract(dummy_w3).events.ExecutionFailed(),
             get_safe_V1_3_0_contract(dummy_w3).events.ExecutionFailure(),
             get_safe_V1_4_1_contract(dummy_w3).events.ExecutionFailure(),
+            get_safe_V1_5_0_contract(dummy_w3).events.ExecutionFailure(),
         ]
         self.safe_tx_module_failure_events = [
             get_safe_V1_3_0_contract(dummy_w3).events.ExecutionFromModuleFailure(),
             get_safe_V1_4_1_contract(dummy_w3).events.ExecutionFromModuleFailure(),
+            get_safe_V1_5_0_contract(dummy_w3).events.ExecutionFromModuleFailure(),
         ]
 
         self.safe_tx_failure_events_topics = {
@@ -583,10 +586,23 @@ def __process_decoded_transaction(
                     arguments["guard"] if arguments["guard"] != NULL_ADDRESS else None
                 )
                 if safe_last_status.guard:
-                    logger.debug("[%s] Setting Guard", contract_address)
+                    logger.debug("[%s] Setting TransactionGuard", contract_address)
                 else:
-                    logger.debug("[%s] Unsetting Guard", contract_address)
+                    logger.debug("[%s] Unsetting TransactionGuard", contract_address)
                 self.store_new_safe_status(safe_last_status, internal_tx, ["guard"])
+            elif function_name == "setModuleGuard":
+                safe_last_status.module_guard = (
+                    arguments["moduleGuard"]
+                    if arguments["moduleGuard"] != NULL_ADDRESS
+                    else None
+                )
+                if safe_last_status.module_guard:
+                    logger.debug("[%s] Setting ModuleGuard", contract_address)
+                else:
+                    logger.debug("[%s] Unsetting ModuleGuard", contract_address)
+                self.store_new_safe_status(
+                    safe_last_status, internal_tx, ["module_guard"]
+                )
             elif function_name == "enableModule":
                 logger.debug("[%s] Enabling Module", contract_address)
                 safe_last_status.enabled_modules.append(arguments["module"])

safe_transaction_service/history/migrations/0100_safelaststatus_module_guard_safestatus_module_guard.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.9 on 2025-12-23 11:07
+
+import safe_eth.eth.django.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('history', '0099_alter_ethereumtx__from_alter_ethereumtx_status_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='safelaststatus',
+            name='module_guard',
+            field=safe_eth.eth.django.models.EthereumAddressBinaryField(default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='safestatus',
+            name='module_guard',
+            field=safe_eth.eth.django.models.EthereumAddressBinaryField(default=None, null=True),
+        ),
+    ]

safe_transaction_service/history/models.py

@@ -2211,6 +2211,7 @@ class SafeStatusBase(models.Model):
     master_copy = EthereumAddressBinaryField()
     fallback_handler = EthereumAddressBinaryField()
     guard = EthereumAddressBinaryField(default=None, null=True)
+    module_guard = EthereumAddressBinaryField(default=None, null=True)
     enabled_modules = ArrayField(EthereumAddressBinaryField(), default=list, blank=True)
 
     class Meta:
@@ -2258,6 +2259,7 @@ def from_status_instance(
             master_copy=safe_status_base.master_copy,
             fallback_handler=safe_status_base.fallback_handler,
             guard=safe_status_base.guard,
+            module_guard=safe_status_base.module_guard,
             enabled_modules=safe_status_base.enabled_modules,
         )
 
@@ -2291,6 +2293,7 @@ def update_or_create_from_safe_status(
                 "master_copy": safe_status.master_copy,
                 "fallback_handler": safe_status.fallback_handler,
                 "guard": safe_status.guard,
+                "module_guard": safe_status.module_guard,
                 "enabled_modules": safe_status.enabled_modules,
             },
         )
@@ -2364,6 +2367,7 @@ def get_safe_info(self) -> SafeInfo:
             self.owners,
             self.threshold,
             master_copy_version,
+            self.module_guard or NULL_ADDRESS,
         )
 
 

safe_transaction_service/history/serializers.py

@@ -266,9 +266,11 @@ def validate(self, attrs):
         signature_owners = []
         # TODO Make signature mandatory
         signature = attrs.get("signature", b"")
+
         parsed_signatures = SafeSignature.parse_signature(
             signature, safe_tx_hash, safe_hash_preimage=safe_tx.safe_tx_hash_preimage
         )
+
         attrs["parsed_signatures"] = parsed_signatures
         # If there's at least one signature, transaction is trusted (until signatures are mandatory)
         attrs["trusted"] = bool(parsed_signatures)
@@ -894,6 +896,7 @@ class SafeInfoResponseSerializer(serializers.Serializer):
     modules = serializers.ListField(child=EthereumAddressField())
     fallback_handler = EthereumAddressField()
     guard = EthereumAddressField()
+    module_guard = EthereumAddressField()
     version = serializers.CharField(allow_null=True)
 
 

safe_transaction_service/history/tests/factories.py

@@ -432,6 +432,7 @@ class Meta:
     master_copy = factory.LazyFunction(lambda: Account.create().address)
     fallback_handler = NULL_ADDRESS
     guard = NULL_ADDRESS
+    module_guard = NULL_ADDRESS
     enabled_modules = []
 
 

safe_transaction_service/history/tests/mocks/deployments_mock.py

@@ -1,3 +1,66 @@
+mainnet_deployments_1_5_0_safe = {
+    "contractName": "Safe",
+    "address": "0xFf51A5898e281Db6DfC7855790607438dF2ca44b",
+}
+
+mainnet_deployments_1_5_0_multisend = {
+    "contractName": "MultiSend",
+    "address": "0x218543288004CD07832472D464648173c77D7eB7",
+}
+
+mainnet_deployments_1_5_0 = {
+    "version": "1.5.0",
+    "contracts": [
+        {
+            "contractName": "CompatibilityFallbackHandler",
+            "address": "0x3EfCBb83A4A7AfcB4F68D501E2c2203a38be77f4",
+        },
+        {
+            "contractName": "CreateCall",
+            "address": "0x2Ef5ECfbea521449E4De05EDB1ce63B75eDA90B4",
+        },
+        {
+            "contractName": "ExtensibleFallbackHandler",
+            "address": "0x85a8ca358D388530ad0fB95D0cb89Dd44Fc242c3",
+        },
+        mainnet_deployments_1_5_0_multisend,
+        {
+            "contractName": "MultiSendCallOnly",
+            "address": "0xA83c336B20401Af773B6219BA5027174338D1836",
+        },
+        mainnet_deployments_1_5_0_safe,
+        {
+            "contractName": "SafeL2",
+            "address": "0xEdd160fEBBD92E350D4D398fb636302fccd67C7e",
+        },
+        {
+            "contractName": "SafeMigration",
+            "address": "0x6439e7ABD8Bb915A5263094784C5CF561c4172AC",
+        },
+        {
+            "contractName": "SafeProxyFactory",
+            "address": "0x14F2982D601c9458F93bd70B218933A6f8165e7b",
+        },
+        {
+            "contractName": "SafeToL2Setup",
+            "address": "0x900C7589200010D6C6eCaaE5B06EBe653bc2D82a",
+        },
+        {
+            "contractName": "SignMessageLib",
+            "address": "0x4FfeF8222648872B3dE295Ba1e49110E61f5b5aa",
+        },
+        {
+            "contractName": "SimulateTxAccessor",
+            "address": "0x07EfA797c55B5DdE3698d876b277aBb6B893654C",
+        },
+        {
+            "contractName": "TokenCallbackHandler",
+            "address": "0x54e86d004d71a8D2112ec75FaCE57D730b0433F3",
+        },
+    ],
+}
+
+
 mainnet_deployments_1_4_1_multisend = {
     "contractName": "MultiSend",
     "address": "0x38869bf66a61cF6bDB996A6aE40D5853Fd43B526",
@@ -194,4 +257,5 @@
     mainnet_deployments_1_2_0,
     mainnet_deployments_1_3_0,
     mainnet_deployments_1_4_1,
+    mainnet_deployments_1_5_0,
 ]

safe_transaction_service/history/tests/test_commands.py

@@ -471,8 +471,8 @@ def test_setup_service_without_addresses(
             f"Setting up {ethereum_network.name} default safe addresses from chain with unknown init block",
             buf.getvalue(),
         )
-        self.assertEqual(SafeMasterCopy.objects.count(), 2)
-        self.assertEqual(ProxyFactory.objects.count(), 1)
+        self.assertEqual(SafeMasterCopy.objects.count(), 3)
+        self.assertEqual(ProxyFactory.objects.count(), 2)
 
     @mock.patch.object(EthereumClient, "get_network", autospec=True)
     def test_setup_service_update_singletons(
@@ -487,8 +487,11 @@ def test_setup_service_update_singletons(
         ethereum_client_get_network_mock.return_value = ethereum_network
         buf = StringIO()
         call_command(command, stdout=buf)
-        self.assertEqual(SafeMasterCopy.objects.count(), 2)
-        self.assertEqual(ProxyFactory.objects.count(), 1)
+        self.assertEqual(SafeMasterCopy.objects.count(), 3)
+        # Both v1.5.0 and v1.4.1 proxy factories exist in test environment
+        # v1.5.0: 0x14F2982D601c9458F93bd70B218933A6f8165e7b (deployed by SafeTestCaseMixin)
+        # v1.4.1: 0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67 (deployed via Singleton Factory)
+        self.assertEqual(ProxyFactory.objects.count(), 2)
         master_copy = SafeMasterCopy.objects.first()
         self.assertEqual(master_copy.initial_block_number, 0)
         mocked_addresses = {ethereum_network: [(master_copy.address, 111, "v1.1.1")]}