Merge branch 'master' into feature/erc-7943

Author: ernestognw

CHANGELOG.md

@@ -1,3 +1,34 @@
+## 14-08-2025
+
+- `ZKEmailUtils`: Add `tryDecodeEmailProof` function for safe calldata decoding with comprehensive bounds checking and validation for `EmailProof` struct.
+- `ZKEmailUtils`: Update `isValidZKEmail` to receive `EmailProof` struct directly instead of `EmailAuthMsg` struct.
+- `SignerZKEmail`: Remove `templateId` functionality and switch from `EmailAuthMsg` to direct `EmailProof` validation for streamlined signature verification.
+- `ERC7913ZKEmailVerifier`: Remove `templateId` from signature validation logic and update `_decodeKey` function to directly decode `EmailProof` struct.
+
+## 09-08-2025
+
+- `ZKEmailUtils`: Simplify library implementation and remove `Verifier.sol` indirection for cleaner integration with a Groth16Verifier.
+
+## 24-07-2025
+
+- `ERC7786Receiver`: Rename `executeMessage` to `receiveMessage` to align with ERC-7786 specification, remove `attributes` parameter for simplified message handling.
+
+## 22-07-2025
+
+- `WebAuthn`: Replace `verifyMinimal` with `verify` as the standard method, add `verify(challenge, auth, qx, qy, requireUV)` variant for UV flag control, improve backup eligibility/state validation, and make authenticator data flags constants internal for better accessibility.
+
+## 21-07-2025
+
+- Remove `ERC20Bridgeable`. Migrated to `@openzeppelin/contracts>=5.4.0`.
+
+## 19-07-2025
+
+- Remove `Account`, `AccountERC7579`, `AccountERC7579Hooked`, `ERC7812`, `ERC7739Utils`, `ERC7913Utils`, `AbstractSigner`, `SignerECDSA`, `SignerP256`, `SignerRSA`, `SignerERC7702`, `SignerERC7913`, `MultiSignerERC7913`, `MultiSignerERC7913Weighted`, `ERC7913P256Verifier`, `ERC7913PRSAVerifier`. These contracts were migrated to `@openzeppelin/contracts>=5.4.0`.
+
+## 11-07-2025
+
+- `IERC7943`: Add interface for uRWAs (ERC-7943) supporting frozen tokens, forced transfers, and compliance features.
+
 ## 16-07-2025
 
 - `ERC7913WebAuthnVerifier`: Add an ERC-7913 signature verifier that supports WebAuthn authentication assertions using P256 keys.

contracts/mocks/account/AccountZKEmailMock.sol

@@ -9,19 +9,17 @@ import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Hol
 import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";
 import {SignerZKEmail} from "../../utils/cryptography/signers/SignerZKEmail.sol";
 import {IDKIMRegistry} from "@zk-email/contracts/DKIMRegistry.sol";
-import {IVerifier} from "@zk-email/email-tx-builder/src/interfaces/IVerifier.sol";
+import {IGroth16Verifier} from "@zk-email/email-tx-builder/src/interfaces/IGroth16Verifier.sol";
 
 contract AccountZKEmailMock is Account, SignerZKEmail, ERC7739, ERC7821, ERC721Holder, ERC1155Holder {
     constructor(
         bytes32 accountSalt_,
         IDKIMRegistry registry_,
-        IVerifier verifier_,
-        uint256 templateId_
+        IGroth16Verifier groth16Verifier_
     ) EIP712("AccountZKEmailMock", "1") {
         _setAccountSalt(accountSalt_);
         _setDKIMRegistry(registry_);
-        _setVerifier(verifier_);
-        _setTemplateId(templateId_);
+        _setVerifier(groth16Verifier_);
     }
 
     /// @inheritdoc ERC7821

contracts/mocks/import.sol

@@ -7,7 +7,11 @@ import {UpgradeableBeacon} from "@openzeppelin/contracts/proxy/beacon/Upgradeabl
 import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol";
 import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";
-import {AccountECDSAMock, AccountERC7579Mock} from "@openzeppelin/contracts/mocks/account/AccountMock.sol";
+import {
+    AccountECDSAMock,
+    AccountERC7579Mock,
+    AccountERC7913Mock
+} from "@openzeppelin/contracts/mocks/account/AccountMock.sol";
 import {ERC1271WalletMock} from "@openzeppelin/contracts/mocks/ERC1271WalletMock.sol";
 import {CallReceiverMock} from "@openzeppelin/contracts/mocks/CallReceiverMock.sol";
 import {ERC7913P256Verifier} from "@openzeppelin/contracts/utils/cryptography/verifiers/ERC7913P256Verifier.sol";

contracts/mocks/utils/cryptography/ZKEmailGroth16VerifierMock.sol

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.20;
+
+import {IGroth16Verifier} from "@zk-email/email-tx-builder/src/interfaces/IGroth16Verifier.sol";
+
+contract ZKEmailGroth16VerifierMock is IGroth16Verifier {
+    function verifyProof(
+        uint[2] calldata _pA,
+        uint[2][2] calldata _pB,
+        uint[2] calldata _pC,
+        uint[34] calldata /* _pubSignals */
+    ) public pure returns (bool) {
+        return
+            _pA[0] == 1 &&
+            _pA[1] == 2 &&
+            _pB[0][0] == 3 &&
+            _pB[0][1] == 4 &&
+            _pB[1][0] == 5 &&
+            _pB[1][1] == 6 &&
+            _pC[0] == 7 &&
+            _pC[1] == 8;
+    }
+}