Make Accounts initializable

contracts/account/draft-AccountECDSA.sol

@@ -11,20 +11,27 @@ import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol";
 import {AccountBase} from "./draft-AccountBase.sol";
-import {ERC7739Signer} from "../utils/cryptography/draft-ERC7739Signer.sol";
+import {ERC7739Signer, EIP712} from "../utils/cryptography/draft-ERC7739Signer.sol";
+import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
 /**
  * @dev Account implementation using {ECDSA} signatures and {ERC7739Signer} for replay protection.
  */
 abstract contract AccountECDSA is ERC165, ERC7739Signer, ERC721Holder, ERC1155HolderLean, AccountBase {
     using MessageHashUtils for bytes32;
 
-    address private immutable _signer;
+    /**
+     * @dev The {signer} is already initialized.
+     */
+    error AccountECDSAUninitializedSigner(address signer);
+
+    address private _signer;
 
     /**
      * @dev Initializes the account with the address of the native signer.
      */
-    constructor(address signerAddr) {
+    function _initializeSigner(address signerAddr) internal {
+        if (_signer != address(0)) revert AccountECDSAUninitializedSigner(signerAddr);
         _signer = signerAddr;
     }
 

contracts/account/draft-AccountP256.sol

@@ -19,13 +19,19 @@ import {ERC7739Signer} from "../utils/cryptography/draft-ERC7739Signer.sol";
 abstract contract AccountP256 is ERC165, ERC7739Signer, ERC721Holder, ERC1155HolderLean, AccountBase {
     using MessageHashUtils for bytes32;
 
-    bytes32 private immutable _qx;
-    bytes32 private immutable _qy;
+    /**
+     * @dev The {signer} is already initialized.
+     */
+    error AccountP256UninitializedSigner(bytes32 qx, bytes32 qy);
+
+    bytes32 private _qx;
+    bytes32 private _qy;
 
     /**
      * @dev Initializes the account with the P256 public key.
      */
-    constructor(bytes32 qx, bytes32 qy) {
+    function _initializeSigner(bytes32 qx, bytes32 qy) internal {
+        if (_qx != 0 || _qy != 0) revert AccountP256UninitializedSigner(qx, qy);
         _qx = qx;
         _qy = qy;
     }

contracts/account/draft-AccountRSA.sol

@@ -24,13 +24,19 @@ import {ERC7739Signer} from "../utils/cryptography/draft-ERC7739Signer.sol";
 abstract contract AccountRSA is ERC165, ERC7739Signer, ERC721Holder, ERC1155HolderLean, AccountBase {
     using MessageHashUtils for bytes32;
 
+    /**
+     * @dev The {signer} is already initialized.
+     */
+    error AccountP256UninitializedSigner(bytes e, bytes n);
+
     bytes private _e;
     bytes private _n;
 
     /**
      * @dev Initializes the account with the RSA public key.
      */
-    constructor(bytes memory e, bytes memory n) {
+    function _initializeSigner(bytes memory e, bytes memory n) internal {
+        if (_e.length != 0 || _n.length != 0) revert AccountP256UninitializedSigner(e, n);
         _e = e;
         _n = n;
     }

contracts/mocks/account/AccountECDSAMock.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.20;
+
+import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";
+import {ERC4337Utils} from "@openzeppelin/contracts/account/utils/draft-ERC4337Utils.sol";
+import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
+import {AccountECDSA} from "../../account/draft-AccountECDSA.sol";
+
+contract AccountECDSAMock is AccountECDSA {
+    constructor(string memory name, string memory version, address signerAddr) EIP712(name, version) {
+        _initializeSigner(signerAddr);
+    }
+}

contracts/mocks/account/AccountP256Mock.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.20;
+
+import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";
+import {ERC4337Utils} from "@openzeppelin/contracts/account/utils/draft-ERC4337Utils.sol";
+import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
+import {AccountP256} from "../../account/draft-AccountP256.sol";
+
+contract AccountP256Mock is AccountP256 {
+    constructor(string memory name, string memory version, bytes32 qx, bytes32 qy) EIP712(name, version) {
+        _initializeSigner(qx, qy);
+    }
+}

contracts/mocks/account/AccountRSAMock.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.20;
+
+import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";
+import {ERC4337Utils} from "@openzeppelin/contracts/account/utils/draft-ERC4337Utils.sol";
+import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";
+import {AccountRSA} from "../../account/draft-AccountRSA.sol";
+
+contract AccountRSAMock is AccountRSA {
+    constructor(string memory name, string memory version, bytes memory e, bytes memory n) EIP712(name, version) {
+        _initializeSigner(e, n);
+    }
+}

test/account/draft-AccountECDSA.test.js

@@ -13,7 +13,7 @@ async function fixture() {
   const [beneficiary, other] = await ethers.getSigners();
   const target = await ethers.deployContract('CallReceiverMockExtended');
   const signer = new ECDSASigner();
-  const helper = new ERC4337Helper('$AccountECDSA');
+  const helper = new ERC4337Helper('$AccountECDSAMock');
   const smartAccount = await helper.newAccount(['AccountECDSA', '1', signer.EOA.address]);
   const domain = {
     name: 'AccountECDSA',

test/account/draft-AccountP256.test.js

@@ -13,7 +13,7 @@ async function fixture() {
   const [beneficiary, other] = await ethers.getSigners();
   const target = await ethers.deployContract('CallReceiverMockExtended');
   const signer = new P256Signer();
-  const helper = new ERC4337Helper('$AccountP256');
+  const helper = new ERC4337Helper('$AccountP256Mock');
   const smartAccount = await helper.newAccount(['AccountP256', '1', signer.publicKey.qx, signer.publicKey.qy]);
   const domain = {
     name: 'AccountP256',

test/account/draft-AccountRSA.test.js

@@ -13,7 +13,7 @@ async function fixture() {
   const [beneficiary, other] = await ethers.getSigners();
   const target = await ethers.deployContract('CallReceiverMockExtended');
   const signer = new RSASignerSHA256();
-  const helper = new ERC4337Helper('$AccountRSA');
+  const helper = new ERC4337Helper('$AccountRSAMock');
   const smartAccount = await helper.newAccount(['AccountRSA', '1', signer.publicKey.e, signer.publicKey.n]);
   const domain = {
     name: 'AccountRSA',