V1.5.0 support #2714

akshay-ap · 2025-11-24T16:07:49Z

Safe v1.5.0 Support

This PR implements support for Safe Smart Account v1.5.0 while maintaining backward compatibility with v1.4.1. The transaction service now supports both versions simultaneously.

Changes

Database Schema

Renamed guard field to transaction_guard in SafeStatus and SafeLastStatus models
Added module_guard field to SafeStatus and SafeLastStatus models
Migration: 0096_guard_changes_v150.py

Event Indexing

Added support for ChangedModuleGuard event in Safe v1.5.0
Added setModuleGuard function handler in transaction processor
Updated event indexer tests to support v1.5.0 contract behavior

Account Abstraction

Updated decode_init_code helper to support both v1.4.1 and v1.5.0 proxy factories
Added get_contract_instances function that dynamically selects appropriate factory and contract versions based on factory address
Updated tests to deploy both v1.4.1 and v1.5.0 proxy factory contracts

API Changes

Updated SafeInfoResponseSerializer to include:
- transaction_guard (renamed from guard)
- module_guard (new field)
Updated SafeInfo.get_safe_info() to correctly map fields to SafeInfo constructor parameters

Test Updates

Refactored event indexer tests to handle v1.5.0 contracts
Updated test expectations for dual proxy factory deployment (v1.4.1 and v1.5.0)
Fixed SafeInfo parameter ordering bug that caused incorrect version values

Testing Gaps

Account abstraction decode_init_code test for v1.5.0 is currently not implemented because safe-eth-py lacks mock UserOperation data with initCode with v1.5.0 proxy factory
Manual testing not done yet

TODO

This PR depends on unreleased changes in safe-eth-py. The PR cannot be merged/reviewed until a new safe-eth-py version is published with v1.5.0 support.
Add ExtensibleFallabackHandler events to indexing. Should we even do it?
Answer: As discussed with team, we are not adding it now.
Additional test where both v1.4.1 and v1.5.0 must be supported simultaneously
- Added in test_views.py and test_views_v2.py
Manual testing
Replace safe-eth-py version with appropriate release version in requirements.txt

Note

Introduces full Safe v1.5.0 compatibility while preserving support for prior versions.

Models/API/Admin: Add module_guard to SafeStatus/SafeLastStatus (migration 0100_*), expose in SafeInfoResponseSerializer/SafeLastStatusSerializer, show/filter in admin.
Event indexing/processing: Track v1.5.0 ChangedModuleGuard; map to setModuleGuard; include v1.5.0 failure/module-failure events; refine creation flow (ProxyCreationL2 note).
Decoding: Include v1.5.0 Safe ABI in TxDecoder/SafeTxDecoder.
AA helpers: Decode initCode using ProxyFactory.from_address with version detection and get_safe_contract_by_version; clearer error on unknown factory.
Views/Tests: Add v1.5.0 deployments/mocks and split tests by Safe version; update 1271 signature path based on version; adjust expectations for dual proxy factories/master copies; add module guard assertions.
Deps: Bump safe-eth-py to 7.17.1.

^{Written by Cursor Bugbot for commit b6d1083. This will update automatically on new commits. Configure here.}

safe_transaction_service/history/indexers/safe_events_indexer.py

cursor

This PR is being reviewed by Cursor Bugbot

Details

Your team is on the Bugbot Free tier. On this plan, Bugbot will review limited PRs each billing cycle for each member of your team.

To receive Bugbot reviews on all of your PRs, visit the Cursor dashboard to activate Pro and start your 14-day free trial.

safe_transaction_service/history/serializers.py

safe_transaction_service/account_abstraction/helpers.py

safe_transaction_service/account_abstraction/tests/test_helpers.py

safe_transaction_service/history/indexers/proxy_factory_indexer.py

safe_transaction_service/history/indexers/safe_events_indexer.py

safe_transaction_service/history/serializers.py

safe_transaction_service/history/tests/test_safe_events_indexer.py

safe_transaction_service/safe_messages/utils.py

safe_transaction_service/safe_messages/serializers.py

safe_transaction_service/history/serializers.py

safe_transaction_service/utils/serializers.py

safe_transaction_service/history/serializers.py

safe_transaction_service/safe_messages/utils.py

safe_transaction_service/history/tests/test_safe_events_indexer.py

safe_transaction_service/history/tests/test_views_v2.py

safe_transaction_service/safe_messages/utils.py

cursor · 2025-12-22T11:39:22Z

safe_transaction_service/history/serializers.py

+        )
        parsed_signatures = SafeSignature.parse_signature(
-            signature, safe_tx_hash, safe_hash_preimage=safe_tx.safe_tx_hash_preimage
+            signature, safe_tx_hash, safe_hash_preimage=safe_signature_hash


Delegate signature validation missing v1.5.0 preimage handling

The validate_delegator_signature method unconditionally passes preimage as safe_hash_preimage when parsing signatures, but doesn't apply the v1.5.0 version-specific handling that was added elsewhere in this PR. For v1.5.0+ Safes using EIP-1271 signatures, the isValidSignature function expects the original message_hash rather than the Safe-encoded preimage. The transaction and message signature flows were updated to use select_safe_encoded_message_hash_by_safe_version, but the delegate signature flow was not. This causes delegate signatures from v1.5.0 Safe signers using EIP-1271 to fail validation.

cursor · 2025-12-22T15:56:37Z

safe_transaction_service/safe_messages/utils.py

+    """
+    if Version(safe_version) >= Version("1.5.0"):
+        return safe_message_hash
+    return safe_message_preimage


Missing null check for safe version in version comparison

The select_safe_encoded_message_hash_by_safe_version function passes safe_version directly to Version() without null checking. Safe.get_version() can return None for very old Safe contracts or non-standard implementations. When None is passed to Version(), it raises a TypeError, causing API requests to fail with a 500 error. The function assumes safe_version is always a valid string but callers pass safe.get_version() which may be None.

Additional Locations (2)

safe_transaction_service/history/serializers.py#L124-L127

safe_transaction_service/safe_messages/serializers.py#L139-L142

moisses89 · 2025-12-23T11:10:34Z

Because we are creating one internal tx by each new ProxyCreation event, the SafeServiceProvider().get_safe_creation_info(address) will break because it was expecting just one result. safe_transaction_service.history.models.InternalTx.MultipleObjectsReturned: get() returned more than one InternalTx -- it returned 2!

Done here fadb2da

safe_transaction_service/history/services/safe_service.py

safe_transaction_service/history/indexers/proxy_factory_indexer.py

safe_transaction_service/history/indexers/safe_events_indexer.py

falvaradorodriguez · 2025-12-23T15:58:16Z

safe_transaction_service/history/tests/test_views_v2.py

        self.assertEqual(safe_contract_delegate.delegator, safe_owner.address)
        self.assertEqual(safe_contract_delegate.safe_contract_id, nested_safe.address)

+    # TODO: Now that we have TestViewsV2V141 and TestViewsV2V150, should be create TestViewsV2V130?


I think it would work very similarly to 141, so I wouldn't add it at first. The TODO can be removed

This reverts commit fadb2da.

cursor · 2025-12-24T09:02:23Z

safe_transaction_service/history/serializers.py

+        )
        parsed_signatures = SafeSignature.parse_signature(
-            signature, safe_tx_hash, safe_hash_preimage=safe_tx.safe_tx_hash_preimage
+            signature, safe_tx_hash, safe_hash_preimage=safe_signature_hash


Delegate EIP-1271 signatures lack v1.5.0 version-specific hash handling

The delegate signature validation in _validate_delegate_v2_signature always passes preimage as safe_hash_preimage to SafeSignature.parse_signature, without applying version-specific handling. For v1.5.0+ Safes, isValidSignature expects the original message hash instead of the Safe-encoded preimage. Transaction signatures and safe message signatures were updated to use select_safe_encoded_message_hash_by_safe_version, but delegate signatures were not. EIP-1271 delegate signatures from v1.5.0+ Safe owners will fail validation because the wrong hash format is passed to isValidSignature.

moisses89 · 2025-12-29T10:40:00Z

safe_transaction_service/safe_messages/serializers.py

+            safe.get_version(), safe_message_hash, safe_message_preimage
+        )
        safe_signatures = SafeSignature.parse_signature(
            signature, safe_message_hash, safe_hash_preimage=safe_message_preimage


After reviewing the changes more carefully, I realized they are incorrect and introduce an unnecessary RPC call to fetch the Safe version.
parse_signature does not validate signatures; it only parses them and returns Signature objects (in this case, ContractSignature). Overwriting safe_message_preimage with safe_message_hash therefore just duplicates the field and adds no validation.
Signature validation actually happens in get_valid_owner_from_signatures, specifically on safe_signature of safe-eth-py here:
https://github.com/safe-global/safe-eth-py/blob/647ad2e79f347ae72693d34ac274e9047e99c3e9/safe_eth/safe/safe_signature.py#L450

moisses89 · 2025-12-29T10:45:37Z

safe_transaction_service/history/serializers.py

        )

        safe_owners = get_safe_owners(safe_address)
+        safe_hash_preimage = select_safe_encoded_message_hash_by_safe_version(


I think that we don'r need this function select_safe_encoded_message_hash_by_safe_version

moisses89 · 2025-12-29T10:47:04Z

safe_transaction_service/history/serializers.py

+        )
        parsed_signatures = SafeSignature.parse_signature(
-            signature, safe_tx_hash, safe_hash_preimage=safe_tx.safe_tx_hash_preimage
+            signature, safe_tx_hash, safe_hash_preimage=safe_hash_preimage


parse_signature does not validate signatures; it only parses them and returns Signature objects (in this case, ContractSignature). Overwriting safe_message_preimage with safe_message_hash therefore just duplicates the field and adds no validation.
Signature validation actually happens in get_valid_owner_from_signatures, specifically on safe_signature of safe-eth-py here:
https://github.com/safe-global/safe-eth-py/blob/647ad2e79f347ae72693d34ac274e9047e99c3e9/safe_eth/safe/safe_signature.py#L450

moisses89 · 2025-12-30T09:21:33Z

safe_transaction_service/account_abstraction/tests/test_helpers.py


 class TestAccountAbstractionHelpers(SafeTestCaseMixin, TestCase):
-    def test_decode_init_code(self):
+    def test_decode_init_code_v141(self):


This changes looks unnecessary.

- Ensure that 1271 works from 1_1_1.

cursor

This PR is being reviewed by Cursor Bugbot

Details

Your team is on the Bugbot Free tier. On this plan, Bugbot will review limited PRs each billing cycle for each member of your team.

To receive Bugbot reviews on all of your PRs, visit the Cursor dashboard to activate Pro and start your 14-day free trial.

safe_transaction_service/history/serializers.py

cursor · 2025-12-30T12:11:04Z

safe_transaction_service/history/serializers.py

    master_copy = EthereumAddressField()
    fallback_handler = EthereumAddressField()
    guard = EthereumAddressField(allow_null=True)
+    module_guard = EthereumAddressField()


Missing allow_null=True for module_guard serializer field

The module_guard field in SafeLastStatusSerializer is defined as EthereumAddressField() without allow_null=True, but the database column (added in migration 0100) has null=True and default=None. After migration, existing SafeLastStatus records will have module_guard=None. When OwnersViewV2 or ModulesViewV2 endpoints try to serialize these records, the serializer will fail because it doesn't accept null values. Compare with the guard field on line 927 which correctly has allow_null=True.

I synced with Uxio previously to his holidays.

akshay-ap self-assigned this Nov 24, 2025

akshay-ap marked this pull request as draft November 24, 2025 16:07

akshay-ap changed the title ~~WIP: V1.5.0 support~~ V1.5.0 support Nov 28, 2025

akshay-ap force-pushed the feature/v1.5.0 branch from 2af08a2 to 1513b63 Compare November 28, 2025 13:52

akshay-ap marked this pull request as ready for review November 28, 2025 14:03

akshay-ap commented Nov 28, 2025

View reviewed changes

safe_transaction_service/history/indexers/safe_events_indexer.py Outdated Show resolved Hide resolved

cursor bot reviewed Dec 1, 2025

View reviewed changes

safe_transaction_service/history/serializers.py Outdated Show resolved Hide resolved

Uxio0 previously requested changes Dec 3, 2025

View reviewed changes

cursor bot reviewed Dec 4, 2025

View reviewed changes

safe_transaction_service/history/serializers.py Outdated Show resolved Hide resolved

safe_transaction_service/utils/serializers.py Outdated Show resolved Hide resolved

cursor bot reviewed Dec 4, 2025

View reviewed changes

safe_transaction_service/history/serializers.py Outdated Show resolved Hide resolved

cursor bot reviewed Dec 4, 2025

View reviewed changes

safe_transaction_service/safe_messages/utils.py Outdated Show resolved Hide resolved

akshay-ap force-pushed the feature/v1.5.0 branch from 96ec7d6 to 9d43ef5 Compare December 8, 2025 11:01

cursor bot reviewed Dec 8, 2025

View reviewed changes

safe_transaction_service/history/tests/test_safe_events_indexer.py Show resolved Hide resolved

cursor bot reviewed Dec 8, 2025

View reviewed changes

safe_transaction_service/history/tests/test_views_v2.py Outdated Show resolved Hide resolved

safe_transaction_service/safe_messages/utils.py Outdated Show resolved Hide resolved

cursor bot reviewed Dec 8, 2025

View reviewed changes

safe_transaction_service/safe_messages/utils.py Outdated Show resolved Hide resolved

cursor bot reviewed Dec 8, 2025

View reviewed changes

safe_transaction_service/safe_messages/utils.py Outdated Show resolved Hide resolved

akshay-ap requested a review from Uxio0 December 8, 2025 15:31

akshay-ap force-pushed the feature/v1.5.0 branch from 58d920c to 044a986 Compare December 9, 2025 13:30

cursor bot reviewed Dec 9, 2025

View reviewed changes

safe_transaction_service/safe_messages/utils.py Outdated Show resolved Hide resolved

cursor bot reviewed Dec 9, 2025

View reviewed changes

safe_transaction_service/safe_messages/utils.py Outdated Show resolved Hide resolved

akshay-ap added 10 commits December 12, 2025 12:45

WIP: V1.5.0 support

fe633c6

WIP: v1.5.0 fix tests

f920476

WIP: Fix tests

ccdd2fc

WIP: v1.5.0 Fix tests

9df2967

Feat: v1.5.0 event indexer test

6326394

Index event ChangedModuleGuard and add test

1441925

v1.5.0: Update property name

61b568b

v1.5.0: Update migration scripts

e606def

v1.5.0: Fix test

51b85f0

v1.5.0: Fix serializer

e50d9f8

Refactor repeated code

1a1054b

cursor bot reviewed Dec 22, 2025

View reviewed changes

Fix get creation info

fadb2da

cursor bot reviewed Dec 22, 2025

View reviewed changes

moisses89 added 2 commits December 23, 2025 12:06

Merge branch 'main' into feature/v1.5.0

a7b2a25

Fix migration conflict

ec802c5

cursor bot reviewed Dec 23, 2025

View reviewed changes

safe_transaction_service/history/services/safe_service.py Outdated Show resolved Hide resolved

moisses89 self-requested a review December 23, 2025 12:06

moisses89 approved these changes Dec 23, 2025

View reviewed changes

falvaradorodriguez reviewed Dec 23, 2025

View reviewed changes

moisses89 added 3 commits December 24, 2025 09:22

Revert "Fix get creation info"

41d6c1b

This reverts commit fadb2da.

Disable indexing for ProxyCreationL2 and ChainSpecificProxyCreationL2

14aeb17

Fix comments

f84fde4

cursor bot reviewed Dec 24, 2025

View reviewed changes

moisses89 requested changes Dec 29, 2025

View reviewed changes

moisses89 reviewed Dec 30, 2025

View reviewed changes

Remove unnecessary Safe call on serializer

9ef70a4

- Ensure that 1271 works from 1_1_1.

moisses89 self-requested a review December 30, 2025 11:21

cursor bot reviewed Dec 30, 2025

View reviewed changes

safe_transaction_service/history/serializers.py Show resolved Hide resolved

Fix missing module_guard on safe last status

41f3d62

cursor bot reviewed Dec 30, 2025

View reviewed changes

moisses89 added 3 commits December 30, 2025 13:12

Add missing comment

7671150

Add missing allow_null true when is from database

5c62d9f

Merge branch 'main' into feature/v1.5.0

b6d1083

moisses89 approved these changes Jan 5, 2026

View reviewed changes

moisses89 merged commit 7e4af79 into main Jan 5, 2026
9 checks passed

moisses89 deleted the feature/v1.5.0 branch January 5, 2026 09:34

github-actions bot locked and limited conversation to collaborators Jan 5, 2026

V1.5.0 support #2714

V1.5.0 support #2714

Uh oh!

Conversation

akshay-ap commented Nov 24, 2025 • edited by cursor bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Safe v1.5.0 Support

Changes

TODO

Uh oh!

Uh oh!

cursor bot left a comment

Choose a reason for hiding this comment

This PR is being reviewed by Cursor Bugbot

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor bot Dec 22, 2025

Choose a reason for hiding this comment

Delegate signature validation missing v1.5.0 preimage handling

Uh oh!

cursor bot Dec 22, 2025

Choose a reason for hiding this comment

Missing null check for safe version in version comparison

Uh oh!

moisses89 commented Dec 23, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

falvaradorodriguez Dec 23, 2025

Choose a reason for hiding this comment

Uh oh!

cursor bot Dec 24, 2025

Choose a reason for hiding this comment

Delegate EIP-1271 signatures lack v1.5.0 version-specific hash handling

Uh oh!

moisses89 Dec 29, 2025

Choose a reason for hiding this comment

Uh oh!

moisses89 Dec 29, 2025

Choose a reason for hiding this comment

Uh oh!

moisses89 Dec 29, 2025

Choose a reason for hiding this comment

Uh oh!

moisses89 Dec 30, 2025

Choose a reason for hiding this comment

Uh oh!

cursor bot left a comment

Choose a reason for hiding this comment

This PR is being reviewed by Cursor Bugbot

Uh oh!

Uh oh!

cursor bot Dec 30, 2025

Choose a reason for hiding this comment

Missing allow_null=True for module_guard serializer field

Uh oh!

Uh oh!

Reviewers

akshay-ap commented Nov 24, 2025 •

edited by cursor bot

Loading

Missing `allow_null=True` for `module_guard` serializer field