Skip to content

Fix/contract message signatures #2526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nlordell wants to merge 2 commits into from
Closed

Fix/contract message signatures #2526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dac3eb5
Add message and hash preimage utility
nlordell May 21, 2025
ff86ae1
Use the computed safe message preimage for siganture validation
nlordell May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions safe_transaction_service/safe_messages/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from safe_transaction_service.utils.serializers import get_safe_owners

from .models import SIGNATURE_LENGTH, SafeMessage, SafeMessageConfirmation
from .utils import get_hash_for_message, get_safe_message_hash_for_message
from .utils import get_hash_for_message, get_safe_message_hash_and_preimage_for_message


# Request serializers
Expand Down Expand Up @@ -109,7 +109,7 @@ def validate(self, attrs):
signature = attrs["signature"]
attrs["safe"] = safe_address
message_hash = get_hash_for_message(message)
safe_message_hash = get_safe_message_hash_for_message(
safe_message_hash, safe_message_preimage = get_safe_message_hash_and_preimage_for_message(
safe_address, message_hash
)
attrs["message_hash"] = safe_message_hash
Expand All @@ -120,7 +120,7 @@ def validate(self, attrs):
)

safe_signatures = SafeSignature.parse_signature(
signature, safe_message_hash, safe_hash_preimage=message_hash
signature, safe_message_hash, safe_hash_preimage=safe_message_preimage
)
owner, signature_type = self.get_valid_owner_from_signatures(
safe_signatures, safe_address, None
Expand Down
8 changes: 4 additions & 4 deletions safe_transaction_service/safe_messages/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from typing import Any, Dict

from eth_account.messages import defunct_hash_message
from eth_typing import ChecksumAddress, Hash32
from eth_typing import ChecksumAddress, Hash32, HexStr
from safe_eth.eth import get_auto_ethereum_client
from safe_eth.eth.eip712 import eip712_encode_hash
from safe_eth.safe import Safe
Expand All @@ -15,8 +15,8 @@ def get_hash_for_message(message: str | Dict[str, Any]) -> Hash32:
)


def get_safe_message_hash_for_message(
def get_safe_message_hash_and_preimage_for_message(
safe_address: ChecksumAddress, message_hash: Hash32
) -> Hash32:
) -> Tuple[Hash32, HexStr]:
safe = Safe(safe_address, get_auto_ethereum_client())
return safe.get_message_hash(message_hash)
return safe.get_message_hash_and_preimage(message_hash)
Loading