Fix signing of typed data for v1 too

Author: schoibs-virtuals

virtuals_acp/contract_clients/contract_client.py

@@ -7,11 +7,13 @@
 
 from eth_account import Account
 from eth_account.messages import encode_typed_data
+from eth_utils.crypto import keccak
 from web3 import Web3
 
 from virtuals_acp.alchemy import AlchemyAccountKit
 from virtuals_acp.configs.configs import ACPContractConfig, BASE_MAINNET_CONFIG
 from virtuals_acp.contract_clients.base_contract_client import BaseAcpContractClient
+from virtuals_acp.constants import SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS
 from virtuals_acp.exceptions import ACPError
 from virtuals_acp.models import (
     ACPJobPhase,
@@ -241,10 +243,24 @@ def get_asset_manager_address(self) -> str:
         raise ACPError("Not Supported")
 
     def sign_typed_data(self, typed_data: dict[str, Any]) -> str:
-        signable = encode_typed_data(full_message=typed_data)
+        encoded = encode_typed_data(full_message=typed_data)
+        typed_data_hash = keccak(b"\x19\x01" + encoded.header + encoded.body)
+
+        replay_safe_typed_data = {
+            "domain": {
+                "chainId": self.config.chain_id,
+                "verifyingContract": SINGLE_SIGNER_VALIDATION_MODULE_ADDRESS,
+                "salt": "0x" + "00" * 12 + self.agent_wallet_address[2:],
+            },
+            "types": {"ReplaySafeHash": [{"name": "hash", "type": "bytes32"}]},
+            "message": {"hash": "0x" + typed_data_hash.hex()},
+            "primaryType": "ReplaySafeHash",
+        }
+
+        signable = encode_typed_data(full_message=replay_safe_typed_data)
         signed = self.account.sign_message(signable)
         raw_signature = signed.signature.hex()
-        return f"0x{self._pack_1271_eoa_signature(raw_signature)}"
+        return self._pack_1271_eoa_signature(raw_signature)
 
     def _pack_1271_eoa_signature(self, validation_signature: str) -> str:
         if validation_signature.startswith("0x"):