Merge branch 'main' into deploy-key

package.json

@@ -25,61 +25,62 @@
     "@commitlint/cli": "19.5.0",
     "@commitlint/config-conventional": "19.5.0",
     "@eslint/js": "9.11.1",
-    "@simplewebauthn/browser": "^10.0.0",
-    "@simplewebauthn/server": "^10.0.1",
-    "@simplewebauthn/types": "^10.0.0",
-    "@stylistic/eslint-plugin": "2.8.0",
-    "@swc-node/register": "1.10.9",
-    "@swc/core": "1.7.26",
-    "cspell": "8.14.4",
-    "eslint": "9.11.1",
-    "eslint-plugin-simple-import-sort": "12.1.1",
-    "globals": "15.9.0",
-    "husky": "9.1.6",
-    "lint-staged": "15.2.10",
-    "markdownlint-cli2": "0.14.0",
-    "nuxt": "3.13.2",
-    "nx": "19.8.6",
-    "prettier": "3.3.3",
-    "typescript": "5.6.2",
-    "typescript-eslint": "8.7.0",
-    "viem": "^2.21.14",
     "@ethersproject/contracts": "5.7.0",
     "@ethersproject/providers": "5.7.2",
     "@hexagon/base64": "1.1.28",
     "@levischuck/tiny-cbor": "0.2.2",
     "@matterlabs/hardhat-zksync": "1.2.0",
     "@matterlabs/hardhat-zksync-deploy": "1.5.0",
+    "@matterlabs/zksync-contracts": "^0.6.1",
+    "@nomad-xyz/excessively-safe-call": "^0.0.1-rc.1",
     "@nomicfoundation/hardhat-chai-matchers": "2.0.8",
     "@nomicfoundation/hardhat-ethers": "3.0.8",
+    "@nomicfoundation/hardhat-toolbox": "^5.0.0",
     "@nomicfoundation/hardhat-verify": "2.0.11",
+    "@openzeppelin/contracts": "4.9.6",
+    "@openzeppelin/contracts-upgradeable": "4.9",
     "@peculiar/asn1-ecc": "2.3.14",
     "@peculiar/asn1-schema": "2.3.13",
+    "@simplewebauthn/browser": "^10.0.0",
+    "@simplewebauthn/server": "^10.0.1",
+    "@simplewebauthn/types": "^10.0.0",
+    "@stylistic/eslint-plugin": "2.8.0",
+    "@swc-node/register": "1.10.9",
+    "@swc/core": "1.7.26",
     "@typechain/ethers-v6": "0.5.1",
     "@typechain/hardhat": "9.1.0",
     "@types/chai": "4.3.20",
     "@types/elliptic": "6.4.18",
     "@types/ini": "4.1.1",
     "@types/mocha": "10.0.8",
     "@types/node": "20.16.10",
+    "bigint-conversion": "^2.4.3",
     "chai": "4.5.0",
+    "cspell": "8.14.4",
     "dotenv": "16.4.5",
     "elliptic": "6.5.7",
+    "eslint": "9.11.1",
+    "eslint-plugin-simple-import-sort": "12.1.1",
     "ethers": "6.13.2",
+    "globals": "15.9.0",
+    "hardhat": "^2.22.12",
+    "husky": "9.1.6",
     "ini": "5.0.0",
+    "lint-staged": "15.2.10",
+    "markdownlint-cli2": "0.14.0",
     "mocha": "10.7.3",
+    "nuxt": "3.13.2",
+    "nx": "19.8.6",
+    "prettier": "3.3.3",
+    "prettier-plugin-solidity": "^1.4.1",
     "ts-node": "10.9.2",
     "typechain": "8.3.2",
+    "typescript": "5.6.2",
+    "typescript-eslint": "8.7.0",
+    "viem": "^2.21.14",
     "zksync-ethers": "6.15.0",
-    "@matterlabs/zksync-contracts": "^0.6.1",
-    "@nomad-xyz/excessively-safe-call": "^0.0.1-rc.1",
-    "@nomicfoundation/hardhat-toolbox": "^5.0.0",
-    "@openzeppelin/contracts": "4.9.6",
-    "@openzeppelin/contracts-upgradeable": "4.9",
-    "bigint-conversion": "^2.4.3",
-    "hardhat": "^2.22.12",
     "zksync-sso": "0.0.0-beta.2",
-    "prettier-plugin-solidity": "^1.4.1"
+    "solady": "^0.0.273"
   },
   "packageManager": "[email protected]"
 }

src/handlers/ERC1271Handler.sol

@@ -5,7 +5,7 @@ import { IERC1271Upgradeable } from "@openzeppelin/contracts-upgradeable/interfa
 
 import { SignatureDecoder } from "../libraries/SignatureDecoder.sol";
 import { ValidationHandler } from "./ValidationHandler.sol";
-import { EIP712 } from "../helpers/EIP712.sol";
+import { EIP712 } from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
 
 /// @title ERC1271Handler
 /// @author Matter Labs