diff --git a/.changeset/lazy-seals-cover.md b/.changeset/lazy-seals-cover.md
new file mode 100644
index 000000000..fe640557b
--- /dev/null
+++ b/.changeset/lazy-seals-cover.md
@@ -0,0 +1,7 @@
+---
+'@openzeppelin/wizard': patch
+'@openzeppelin/wizard-common': patch
+'@openzeppelin/contracts-mcp': patch
+---
+
+Update @openzeppelin/contracts and @openzeppelin/contracts-upgradeable dependencies to 5.5.0-rc.0
diff --git a/packages/common/src/ai/descriptions/solidity.ts b/packages/common/src/ai/descriptions/solidity.ts
index cd87ad1fd..503e2e945 100644
--- a/packages/common/src/ai/descriptions/solidity.ts
+++ b/packages/common/src/ai/descriptions/solidity.ts
@@ -66,7 +66,7 @@ export const solidityAccountDescriptions = {
     'Whether to implement the `onERC1155Received` function to allow the account to receive ERC1155 tokens.',
   signer: `Defines the signature verification algorithm used by the account to verify user operations. Options:
         - ECDSA: Standard Ethereum signature validation using secp256k1, validates signatures against a specified owner address
-        - ERC7702: Special ECDSA validation using account's own address as signer, enables EOAs to delegate execution rights
+        - EIP7702: Special ECDSA validation using account's own address as signer, enables EOAs to delegate execution rights
         - P256: NIST P-256 curve (secp256r1) validation for integration with Passkeys and HSMs
         - RSA: RSA PKCS#1 v1.5 signature validation (RFC8017) for PKI systems and HSMs
         - Multisig: ERC-7913 multisignature requiring minimum number of signatures from authorized signers
diff --git a/packages/core/solidity/package.json b/packages/core/solidity/package.json
index 32d72d4a4..34cd9d754 100644
--- a/packages/core/solidity/package.json
+++ b/packages/core/solidity/package.json
@@ -23,8 +23,8 @@
   },
   "devDependencies": {
     "@openzeppelin/community-contracts": "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#269f9b5",
-    "@openzeppelin/contracts": "^5.4.0",
-    "@openzeppelin/contracts-upgradeable": "^5.4.0",
+    "@openzeppelin/contracts": "^5.5.0-rc.0",
+    "@openzeppelin/contracts-upgradeable": "^5.5.0-rc.0",
     "@types/node": "^20.0.0",
     "@types/semver": "^7.5.7",
     "ava": "^6.0.0",
@@ -36,4 +36,4 @@
     "ts-node": "^10.4.0",
     "typescript": "^5.0.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/core/solidity/src/account.test.ts b/packages/core/solidity/src/account.test.ts
index 97611cee9..6e1d66de8 100644
--- a/packages/core/solidity/src/account.test.ts
+++ b/packages/core/solidity/src/account.test.ts
@@ -61,9 +61,9 @@ function format(upgradeable: false | 'uups' | 'transparent') {
   }
 }
 
-for (const signer of [false, 'ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const) {
+for (const signer of [false, 'ECDSA', 'EIP7702', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const) {
   for (const upgradeable of [false, 'uups', 'transparent'] as const) {
-    if (signer === 'ERC7702' && !!upgradeable) continue;
+    if (signer === 'EIP7702' && !!upgradeable) continue;
 
     let title = 'Account';
     if (signer) {
diff --git a/packages/core/solidity/src/account.test.ts.md b/packages/core/solidity/src/account.test.ts.md
index 1ea211d9d..c7c283d01 100644
--- a/packages/core/solidity/src/account.test.ts.md
+++ b/packages/core/solidity/src/account.test.ts.md
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -36,7 +36,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -69,7 +69,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -96,7 +96,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -124,7 +124,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -152,7 +152,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -181,7 +181,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -218,7 +218,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -264,7 +264,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -304,7 +304,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -350,7 +350,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -397,24 +397,20 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccount is Initializable, Account, EIP712, ERC7739, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("CustomAccount", "1") {␊
             _disableInitializers();␊
         }␊
-    ␊
-        function initialize() public initializer {␊
-            __UUPSUpgradeable_init();␊
-        }␊
     ␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
@@ -439,23 +435,19 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountERC1271 is Initializable, Account, IERC1271, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
-    ␊
-        function initialize() public initializer {␊
-            __UUPSUpgradeable_init();␊
-        }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
@@ -489,24 +481,20 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountERC7739 is Initializable, Account, EIP712, ERC7739, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("CustomAccountERC7739", "1") {␊
             _disableInitializers();␊
         }␊
-    ␊
-        function initialize() public initializer {␊
-            __UUPSUpgradeable_init();␊
-        }␊
     ␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
@@ -531,25 +519,21 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountERC721Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("CustomAccountERC721Holder", "1") {␊
             _disableInitializers();␊
         }␊
-    ␊
-        function initialize() public initializer {␊
-            __UUPSUpgradeable_init();␊
-        }␊
     ␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
@@ -574,25 +558,21 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("CustomAccountERC1155Holder", "1") {␊
             _disableInitializers();␊
         }␊
-    ␊
-        function initialize() public initializer {␊
-            __UUPSUpgradeable_init();␊
-        }␊
     ␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
@@ -617,7 +597,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -625,18 +605,14 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("CustomAccountERC721HolderERC1155Holder", "1") {␊
             _disableInitializers();␊
         }␊
-    ␊
-        function initialize() public initializer {␊
-            __UUPSUpgradeable_init();␊
-        }␊
     ␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
@@ -661,25 +637,21 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("MyAccount", "1") {␊
             _disableInitializers();␊
         }␊
-    ␊
-        function initialize() public initializer {␊
-            __UUPSUpgradeable_init();␊
-        }␊
     ␊
         function _erc7821AuthorizedExecutor(address caller, bytes32 mode, bytes calldata executionData)␊
             internal␊
@@ -713,16 +685,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -735,7 +707,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __AccountERC7579_init();␊
-            __UUPSUpgradeable_init();␊
     ␊
             require(moduleTypeId == MODULE_TYPE_VALIDATOR || moduleTypeId == MODULE_TYPE_EXECUTOR);␊
             _installModule(moduleTypeId, module, initData);␊
@@ -776,15 +747,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -797,7 +768,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __AccountERC7579_init();␊
-            __UUPSUpgradeable_init();␊
     ␊
             require(moduleTypeId == MODULE_TYPE_VALIDATOR || moduleTypeId == MODULE_TYPE_EXECUTOR);␊
             _installModule(moduleTypeId, module, initData);␊
@@ -835,16 +805,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -857,7 +827,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __AccountERC7579_init();␊
-            __UUPSUpgradeable_init();␊
     ␊
             require(moduleTypeId == MODULE_TYPE_VALIDATOR || moduleTypeId == MODULE_TYPE_EXECUTOR);␊
             _installModule(moduleTypeId, module, initData);␊
@@ -898,7 +867,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -906,9 +875,9 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -921,7 +890,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __AccountERC7579Hooked_init();␊
-            __UUPSUpgradeable_init();␊
     ␊
             require(moduleTypeId == MODULE_TYPE_VALIDATOR || moduleTypeId == MODULE_TYPE_EXECUTOR);␊
             _installModule(moduleTypeId, module, initData);␊
@@ -962,13 +930,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccount is Initializable, Account, EIP712, ERC7739 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -993,12 +961,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC1271 is Initializable, Account, IERC1271 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1032,13 +1000,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC7739 is Initializable, Account, EIP712, ERC7739 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1063,14 +1031,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC721Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1095,14 +1063,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1127,7 +1095,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -1135,7 +1103,7 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract CustomAccountERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, ERC721Holder, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1160,14 +1128,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1201,14 +1169,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable {␊
@@ -1256,13 +1224,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable {␊
@@ -1307,14 +1275,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable {␊
@@ -1362,7 +1330,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -1370,7 +1338,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable {␊
@@ -1413,37 +1381,42 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerERC7702 named non-upgradeable
+## Account with SignerECDSA named non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
     ␊
-    contract CustomAccountWithSignerERC7702 is Account, EIP712, ERC7739, SignerERC7702 {␊
-        constructor() EIP712("CustomAccount with SignerERC7702", "1") {}␊
+    contract CustomAccountWithSignerECDSA is Account, EIP712, ERC7739, SignerECDSA {␊
+        constructor(address signer)␊
+            EIP712("CustomAccount with SignerECDSA", "1")␊
+            SignerECDSA(signer)␊
+        {}␊
     }␊
     `
 
-## Account with SignerERC7702 with ERC1271 non-upgradeable
+## Account with SignerECDSA with ERC1271 non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    ␊
+    contract CustomAccountWithSignerECDSAERC1271 is Account, IERC1271, SignerECDSA {␊
+        constructor(address signer) SignerECDSA(signer) {}␊
     ␊
-    contract CustomAccountWithSignerERC7702ERC1271 is Account, IERC1271, SignerERC7702 {␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
             view␊
@@ -1455,68 +1428,77 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerERC7702 with ERC7739 non-upgradeable
+## Account with SignerECDSA with ERC7739 non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
     ␊
-    contract CustomAccountWithSignerERC7702ERC7739 is Account, EIP712, ERC7739, SignerERC7702 {␊
-        constructor() EIP712("CustomAccount with SignerERC7702ERC7739", "1") {}␊
+    contract CustomAccountWithSignerECDSAERC7739 is Account, EIP712, ERC7739, SignerECDSA {␊
+        constructor(address signer)␊
+            EIP712("CustomAccount with SignerECDSAERC7739", "1")␊
+            SignerECDSA(signer)␊
+        {}␊
     }␊
     `
 
-## Account with SignerERC7702 with ERC721Holder non-upgradeable
+## Account with SignerECDSA with ERC721Holder non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
     ␊
-    contract CustomAccountWithSignerERC7702ERC721Holder is Account, EIP712, ERC7739, SignerERC7702, ERC721Holder {␊
-        constructor() EIP712("CustomAccount with SignerERC7702ERC721Holder", "1") {}␊
+    contract CustomAccountWithSignerECDSAERC721Holder is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder {␊
+        constructor(address signer)␊
+            EIP712("CustomAccount with SignerECDSAERC721Holder", "1")␊
+            SignerECDSA(signer)␊
+        {}␊
     }␊
     `
 
-## Account with SignerERC7702 with ERC1155Holder non-upgradeable
+## Account with SignerECDSA with ERC1155Holder non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
     ␊
-    contract CustomAccountWithSignerERC7702ERC1155Holder is Account, EIP712, ERC7739, SignerERC7702, ERC1155Holder {␊
-        constructor() EIP712("CustomAccount with SignerERC7702ERC1155Holder", "1") {}␊
+    contract CustomAccountWithSignerECDSAERC1155Holder is Account, EIP712, ERC7739, SignerECDSA, ERC1155Holder {␊
+        constructor(address signer)␊
+            EIP712("CustomAccount with SignerECDSAERC1155Holder", "1")␊
+            SignerECDSA(signer)␊
+        {}␊
     }␊
     `
 
-## Account with SignerERC7702 with ERC721Holder and ERC1155Holder non-upgradeable
+## Account with SignerECDSA with ERC721Holder and ERC1155Holder non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -1524,31 +1506,32 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
     ␊
-    contract CustomAccountWithSignerERC7702ERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerERC7702, ERC721Holder, ERC1155Holder {␊
-        constructor()␊
-            EIP712("CustomAccount with SignerERC7702ERC721HolderERC1155Holder", "1")␊
+    contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder, ERC1155Holder {␊
+        constructor(address signer)␊
+            EIP712("CustomAccount with SignerECDSAERC721HolderERC1155Holder", "1")␊
+            SignerECDSA(signer)␊
         {}␊
     }␊
     `
 
-## Account with SignerERC7702 with ERC7821 Execution non-upgradeable
+## Account with SignerECDSA with ERC7821 Execution non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
     ␊
-    contract MyAccount is Account, EIP712, ERC7739, SignerERC7702, ERC7821 {␊
-        constructor() EIP712("MyAccount", "1") {}␊
+    contract MyAccount is Account, EIP712, ERC7739, SignerECDSA, ERC7821 {␊
+        constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
     ␊
         function _erc7821AuthorizedExecutor(address caller, bytes32 mode, bytes calldata executionData)␊
             internal␊
@@ -1561,12 +1544,12 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerERC7702 with ERC7579 non-upgradeable
+## Account with SignerECDSA with ERC7579 non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -1575,10 +1558,10 @@ Generated by [AVA](https://avajs.dev).
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
     ␊
-    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerERC7702 {␊
-        constructor() EIP712("MyAccount", "1") {}␊
+    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerECDSA {␊
+        constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
@@ -1602,14 +1585,14 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerERC7702 is most derived than AccountERC7579␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerERC7702)␊
+        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerERC7702, AbstractSigner, AccountERC7579)␊
+            override(SignerECDSA, AbstractSigner, AccountERC7579)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -1617,12 +1600,12 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerERC7702 with ERC7579 with ERC1271 non-upgradeable
+## Account with SignerECDSA with ERC7579 with ERC1271 non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -1630,9 +1613,11 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    ␊
+    contract MyAccount is Account, IERC1271, AccountERC7579, SignerECDSA {␊
+        constructor(address signer) SignerECDSA(signer) {}␊
     ␊
-    contract MyAccount is Account, IERC1271, AccountERC7579, SignerERC7702 {␊
         // The following functions are overrides required by Solidity.␊
     ␊
         function _validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash)␊
@@ -1652,14 +1637,14 @@ Generated by [AVA](https://avajs.dev).
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerERC7702 is most derived than AccountERC7579␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerERC7702)␊
+        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerERC7702, AbstractSigner, AccountERC7579)␊
+            override(SignerECDSA, AbstractSigner, AccountERC7579)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -1667,12 +1652,12 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerERC7702 with ERC7579 with ERC7739 non-upgradeable
+## Account with SignerECDSA with ERC7579 with ERC7739 non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -1681,10 +1666,10 @@ Generated by [AVA](https://avajs.dev).
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
     ␊
-    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerERC7702 {␊
-        constructor() EIP712("MyAccount", "1") {}␊
+    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerECDSA {␊
+        constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
@@ -1708,14 +1693,14 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerERC7702 is most derived than AccountERC7579␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerERC7702)␊
+        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerERC7702, AbstractSigner, AccountERC7579)␊
+            override(SignerECDSA, AbstractSigner, AccountERC7579)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -1723,12 +1708,12 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerERC7702 with ERC7579 hooks non-upgradeable
+## Account with SignerECDSA with ERC7579 hooks non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -1738,10 +1723,10 @@ Generated by [AVA](https://avajs.dev).
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerERC7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol";␊
+    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
     ␊
-    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerERC7702 {␊
-        constructor() EIP712("MyAccount", "1") {}␊
+    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerECDSA {␊
+        constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
@@ -1765,14 +1750,14 @@ Generated by [AVA](https://avajs.dev).
             return super._validateUserOp(userOp, userOpHash);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerERC7702 is most derived than AccountERC7579␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerERC7702)␊
+        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
         // to ensure the correct order of function resolution.␊
         // AccountERC7579 returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerERC7702, AbstractSigner, AccountERC7579)␊
+            override(SignerECDSA, AbstractSigner, AccountERC7579)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -1780,41 +1765,62 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA named non-upgradeable
+## Account with SignerECDSA named upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSA is Account, EIP712, ERC7739, SignerECDSA {␊
-        constructor(address signer)␊
-            EIP712("CustomAccount with SignerECDSA", "1")␊
-            SignerECDSA(signer)␊
+    contract CustomAccountWithSignerECDSA is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor() EIP712("CustomAccount with SignerECDSA", "1") {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __SignerECDSA_init(signer);␊
+        }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
         {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC1271 non-upgradeable
+## Account with SignerECDSA with ERC1271 upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC1271 is Account, IERC1271, SignerECDSA {␊
-        constructor(address signer) SignerECDSA(signer) {}␊
+    contract CustomAccountWithSignerECDSAERC1271 is Initializable, Account, IERC1271, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor() {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __SignerECDSA_init(signer);␊
+        }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
@@ -1824,80 +1830,122 @@ Generated by [AVA](https://avajs.dev).
         {␊
             return _rawSignatureValidation(hash, signature) ? IERC1271.isValidSignature.selector : bytes4(0xffffffff);␊
         }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
+        {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC7739 non-upgradeable
+## Account with SignerECDSA with ERC7739 upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC7739 is Account, EIP712, ERC7739, SignerECDSA {␊
-        constructor(address signer)␊
-            EIP712("CustomAccount with SignerECDSAERC7739", "1")␊
-            SignerECDSA(signer)␊
+    contract CustomAccountWithSignerECDSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor() EIP712("CustomAccount with SignerECDSAERC7739", "1") {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __SignerECDSA_init(signer);␊
+        }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
         {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC721Holder non-upgradeable
+## Account with SignerECDSA with ERC721Holder upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC721Holder is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder {␊
-        constructor(address signer)␊
-            EIP712("CustomAccount with SignerECDSAERC721Holder", "1")␊
-            SignerECDSA(signer)␊
+    contract CustomAccountWithSignerECDSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor() EIP712("CustomAccount with SignerECDSAERC721Holder", "1") {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __SignerECDSA_init(signer);␊
+        }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
         {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC1155Holder non-upgradeable
+## Account with SignerECDSA with ERC1155Holder upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC1155Holder is Account, EIP712, ERC7739, SignerECDSA, ERC1155Holder {␊
-        constructor(address signer)␊
-            EIP712("CustomAccount with SignerECDSAERC1155Holder", "1")␊
-            SignerECDSA(signer)␊
+    contract CustomAccountWithSignerECDSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor() EIP712("CustomAccount with SignerECDSAERC1155Holder", "1") {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __SignerECDSA_init(signer);␊
+        }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
         {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC721Holder and ERC1155Holder non-upgradeable
+## Account with SignerECDSA with ERC721Holder and ERC1155Holder upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -1905,32 +1953,55 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerECDSA, ERC721Holder, ERC1155Holder {␊
-        constructor(address signer)␊
+    contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor()␊
             EIP712("CustomAccount with SignerECDSAERC721HolderERC1155Holder", "1")␊
-            SignerECDSA(signer)␊
+        {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __SignerECDSA_init(signer);␊
+        }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
         {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC7821 Execution non-upgradeable
+## Account with SignerECDSA with ERC7821 Execution upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract MyAccount is Account, EIP712, ERC7739, SignerECDSA, ERC7821 {␊
-        constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
+    contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC7821, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor() EIP712("MyAccount", "1") {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __SignerECDSA_init(signer);␊
+        }␊
     ␊
         function _erc7821AuthorizedExecutor(address caller, bytes32 mode, bytes calldata executionData)␊
             internal␊
@@ -1940,58 +2011,80 @@ Generated by [AVA](https://avajs.dev).
         {␊
             return caller == address(entryPoint()) || super._erc7821AuthorizedExecutor(caller, mode, executionData);␊
         }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
+        {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 non-upgradeable
+## Account with SignerECDSA with ERC7579 upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerECDSA {␊
-        constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
+    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor() EIP712("MyAccount", "1") {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __AccountERC7579_init();␊
+            __SignerECDSA_init(signer);␊
+        }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
             view␊
-            override(AccountERC7579, ERC7739)␊
+            override(AccountERC7579Upgradeable, ERC7739)␊
             returns (bytes4)␊
         {␊
             // ERC-7739 can return the ERC-1271 magic value, 0xffffffff (invalid) or 0x77390001 (detection).␊
             // If the returned value is 0xffffffff, fallback to ERC-7579 validation.␊
             bytes4 erc7739magic = ERC7739.isValidSignature(hash, signature);␊
-            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579.isValidSignature(hash, signature) : erc7739magic;␊
+            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579Upgradeable.isValidSignature(hash, signature) : erc7739magic;␊
         }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
+        {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
         function _validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash)␊
             internal␊
-            override(Account, AccountERC7579)␊
+            override(Account, AccountERC7579Upgradeable)␊
             returns (uint256)␊
         {␊
             return super._validateUserOp(userOp, userOpHash);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
-        // AccountERC7579 returns false for _rawSignatureValidation␊
+        // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerECDSA, AbstractSigner, AccountERC7579)␊
+            override(SignerECDSAUpgradeable, AbstractSigner, AccountERC7579Upgradeable)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -1999,29 +2092,45 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 with ERC1271 non-upgradeable
+## Account with SignerECDSA with ERC7579 with ERC1271 upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract MyAccount is Account, IERC1271, AccountERC7579, SignerECDSA {␊
-        constructor(address signer) SignerECDSA(signer) {}␊
+    contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor() {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __AccountERC7579_init();␊
+            __SignerECDSA_init(signer);␊
+        }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
+        {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
         function _validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash)␊
             internal␊
-            override(Account, AccountERC7579)␊
+            override(Account, AccountERC7579Upgradeable)␊
             returns (uint256)␊
         {␊
             return super._validateUserOp(userOp, userOpHash);␊
@@ -2030,20 +2139,20 @@ Generated by [AVA](https://avajs.dev).
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
             view␊
-            override(IERC1271, AccountERC7579)␊
+            override(IERC1271, AccountERC7579Upgradeable)␊
             returns (bytes4)␊
         {␊
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
-        // AccountERC7579 returns false for _rawSignatureValidation␊
+        // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerECDSA, AbstractSigner, AccountERC7579)␊
+            override(SignerECDSAUpgradeable, AbstractSigner, AccountERC7579Upgradeable)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -2051,55 +2160,71 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 with ERC7739 non-upgradeable
+## Account with SignerECDSA with ERC7579 with ERC7739 upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerECDSA {␊
-        constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
+    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor() EIP712("MyAccount", "1") {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __AccountERC7579_init();␊
+            __SignerECDSA_init(signer);␊
+        }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
             view␊
-            override(AccountERC7579, ERC7739)␊
+            override(AccountERC7579Upgradeable, ERC7739)␊
             returns (bytes4)␊
         {␊
             // ERC-7739 can return the ERC-1271 magic value, 0xffffffff (invalid) or 0x77390001 (detection).␊
             // If the returned value is 0xffffffff, fallback to ERC-7579 validation.␊
             bytes4 erc7739magic = ERC7739.isValidSignature(hash, signature);␊
-            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579.isValidSignature(hash, signature) : erc7739magic;␊
+            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579Upgradeable.isValidSignature(hash, signature) : erc7739magic;␊
         }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
+        {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
         function _validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash)␊
             internal␊
-            override(Account, AccountERC7579)␊
+            override(Account, AccountERC7579Upgradeable)␊
             returns (uint256)␊
         {␊
             return super._validateUserOp(userOp, userOpHash);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
-        // AccountERC7579 returns false for _rawSignatureValidation␊
+        // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerECDSA, AbstractSigner, AccountERC7579)␊
+            override(SignerECDSAUpgradeable, AbstractSigner, AccountERC7579Upgradeable)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -2107,56 +2232,72 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 hooks non-upgradeable
+## Account with SignerECDSA with ERC7579 hooks upgradeable uups
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
-    import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊
+    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
+    import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSA} from "@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol";␊
+    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerECDSA {␊
-        constructor(address signer) EIP712("MyAccount", "1") SignerECDSA(signer) {}␊
+    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+        constructor() EIP712("MyAccount", "1") {␊
+            _disableInitializers();␊
+        }␊
+    ␊
+        function initialize(address signer) public initializer {␊
+            __AccountERC7579Hooked_init();␊
+            __SignerECDSA_init(signer);␊
+        }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
             view␊
-            override(AccountERC7579, ERC7739)␊
+            override(AccountERC7579Upgradeable, ERC7739)␊
             returns (bytes4)␊
         {␊
             // ERC-7739 can return the ERC-1271 magic value, 0xffffffff (invalid) or 0x77390001 (detection).␊
             // If the returned value is 0xffffffff, fallback to ERC-7579 validation.␊
             bytes4 erc7739magic = ERC7739.isValidSignature(hash, signature);␊
-            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579.isValidSignature(hash, signature) : erc7739magic;␊
+            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579Upgradeable.isValidSignature(hash, signature) : erc7739magic;␊
         }␊
+    ␊
+        function _authorizeUpgrade(address newImplementation)␊
+            internal␊
+            override␊
+            onlyEntryPointOrSelf␊
+        {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
         function _validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash)␊
             internal␊
-            override(Account, AccountERC7579)␊
+            override(Account, AccountERC7579Upgradeable)␊
             returns (uint256)␊
         {␊
             return super._validateUserOp(userOp, userOpHash);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSA is most derived than AccountERC7579␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerECDSA)␊
+        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
         // to ensure the correct order of function resolution.␊
-        // AccountERC7579 returns false for _rawSignatureValidation␊
+        // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerECDSA, AbstractSigner, AccountERC7579)␊
+            override(SignerECDSAUpgradeable, AbstractSigner, AccountERC7579Upgradeable)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -2164,22 +2305,21 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA named upgradeable uups
+## Account with SignerECDSA named upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSA is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+    contract CustomAccountWithSignerECDSA is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("CustomAccount with SignerECDSA", "1") {␊
             _disableInitializers();␊
@@ -2187,32 +2327,24 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(address signer) public initializer {␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC1271 upgradeable uups
+## Account with SignerECDSA with ERC1271 upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC1271 is Initializable, Account, IERC1271, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+    contract CustomAccountWithSignerECDSAERC1271 is Initializable, Account, IERC1271, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
@@ -2220,7 +2352,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(address signer) public initializer {␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -2231,31 +2362,24 @@ Generated by [AVA](https://avajs.dev).
         {␊
             return _rawSignatureValidation(hash, signature) ? IERC1271.isValidSignature.selector : bytes4(0xffffffff);␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC7739 upgradeable uups
+## Account with SignerECDSA with ERC7739 upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+    contract CustomAccountWithSignerECDSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("CustomAccount with SignerECDSAERC7739", "1") {␊
             _disableInitializers();␊
@@ -2263,34 +2387,26 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(address signer) public initializer {␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC721Holder upgradeable uups
+## Account with SignerECDSA with ERC721Holder upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, UUPSUpgradeable {␊
+    contract CustomAccountWithSignerECDSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("CustomAccount with SignerECDSAERC721Holder", "1") {␊
             _disableInitializers();␊
@@ -2298,34 +2414,26 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(address signer) public initializer {␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC1155Holder upgradeable uups
+## Account with SignerECDSA with ERC1155Holder upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
+    contract CustomAccountWithSignerECDSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("CustomAccount with SignerECDSAERC1155Holder", "1") {␊
             _disableInitializers();␊
@@ -2333,23 +2441,16 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(address signer) public initializer {␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC721Holder and ERC1155Holder upgradeable uups
+## Account with SignerECDSA with ERC721Holder and ERC1155Holder upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -2357,11 +2458,10 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
+    contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor()␊
             EIP712("CustomAccount with SignerECDSAERC721HolderERC1155Holder", "1")␊
@@ -2371,34 +2471,26 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(address signer) public initializer {␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC7821 Execution upgradeable uups
+## Account with SignerECDSA with ERC7821 Execution upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC7821, UUPSUpgradeable {␊
+    contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC7821 {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("MyAccount", "1") {␊
             _disableInitializers();␊
@@ -2406,7 +2498,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(address signer) public initializer {␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _erc7821AuthorizedExecutor(address caller, bytes32 mode, bytes calldata executionData)␊
@@ -2417,21 +2508,15 @@ Generated by [AVA](https://avajs.dev).
         {␊
             return caller == address(entryPoint()) || super._erc7821AuthorizedExecutor(caller, mode, executionData);␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 upgradeable uups
+## Account with SignerECDSA with ERC7579 upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -2439,12 +2524,11 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("MyAccount", "1") {␊
             _disableInitializers();␊
@@ -2453,7 +2537,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(address signer) public initializer {␊
             __AccountERC7579_init();␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -2467,12 +2550,6 @@ Generated by [AVA](https://avajs.dev).
             bytes4 erc7739magic = ERC7739.isValidSignature(hash, signature);␊
             return erc7739magic == bytes4(0xffffffff) ? AccountERC7579Upgradeable.isValidSignature(hash, signature) : erc7739magic;␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
@@ -2499,24 +2576,23 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 with ERC1271 upgradeable uups
+## Account with SignerECDSA with ERC7579 with ERC1271 upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+    contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
@@ -2525,14 +2601,7 @@ Generated by [AVA](https://avajs.dev).
         function initialize(address signer) public initializer {␊
             __AccountERC7579_init();␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
@@ -2568,12 +2637,12 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 with ERC7739 upgradeable uups
+## Account with SignerECDSA with ERC7579 with ERC7739 upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -2581,12 +2650,11 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("MyAccount", "1") {␊
             _disableInitializers();␊
@@ -2595,7 +2663,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(address signer) public initializer {␊
             __AccountERC7579_init();␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -2609,12 +2676,6 @@ Generated by [AVA](https://avajs.dev).
             bytes4 erc7739magic = ERC7739.isValidSignature(hash, signature);␊
             return erc7739magic == bytes4(0xffffffff) ? AccountERC7579Upgradeable.isValidSignature(hash, signature) : erc7739magic;␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
@@ -2641,12 +2702,12 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 hooks upgradeable uups
+## Account with SignerECDSA with ERC7579 hooks upgradeable transparent
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -2655,12 +2716,11 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
-    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerECDSAUpgradeable, UUPSUpgradeable {␊
+    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerECDSAUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() EIP712("MyAccount", "1") {␊
             _disableInitializers();␊
@@ -2669,7 +2729,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(address signer) public initializer {␊
             __AccountERC7579Hooked_init();␊
             __SignerECDSA_init(signer);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -2683,12 +2742,6 @@ Generated by [AVA](https://avajs.dev).
             bytes4 erc7739magic = ERC7739.isValidSignature(hash, signature);␊
             return erc7739magic == bytes4(0xffffffff) ? AccountERC7579Upgradeable.isValidSignature(hash, signature) : erc7739magic;␊
         }␊
-    ␊
-        function _authorizeUpgrade(address newImplementation)␊
-            internal␊
-            override␊
-            onlyEntryPointOrSelf␊
-        {}␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
@@ -2715,55 +2768,37 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA named upgradeable transparent
+## Account with SignerEIP7702 named non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    ␊
-    contract CustomAccountWithSignerECDSA is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
-        constructor() EIP712("CustomAccount with SignerECDSA", "1") {␊
-            _disableInitializers();␊
-        }␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
-        function initialize(address signer) public initializer {␊
-            __SignerECDSA_init(signer);␊
-        }␊
+    contract CustomAccountWithSignerEIP7702 is Account, EIP712, ERC7739, SignerEIP7702 {␊
+        constructor() EIP712("CustomAccount with SignerEIP7702", "1") {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC1271 upgradeable transparent
+## Account with SignerEIP7702 with ERC1271 non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    ␊
-    contract CustomAccountWithSignerECDSAERC1271 is Initializable, Account, IERC1271, SignerECDSAUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
-        constructor() {␊
-            _disableInitializers();␊
-        }␊
-    ␊
-        function initialize(address signer) public initializer {␊
-            __SignerECDSA_init(signer);␊
-        }␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
+    contract CustomAccountWithSignerEIP7702ERC1271 is Account, IERC1271, SignerEIP7702 {␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
             view␊
@@ -2775,92 +2810,68 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7739 upgradeable transparent
+## Account with SignerEIP7702 with ERC7739 non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    ␊
-    contract CustomAccountWithSignerECDSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
-        constructor() EIP712("CustomAccount with SignerECDSAERC7739", "1") {␊
-            _disableInitializers();␊
-        }␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
-        function initialize(address signer) public initializer {␊
-            __SignerECDSA_init(signer);␊
-        }␊
+    contract CustomAccountWithSignerEIP7702ERC7739 is Account, EIP712, ERC7739, SignerEIP7702 {␊
+        constructor() EIP712("CustomAccount with SignerEIP7702ERC7739", "1") {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC721Holder upgradeable transparent
+## Account with SignerEIP7702 with ERC721Holder non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
-        constructor() EIP712("CustomAccount with SignerECDSAERC721Holder", "1") {␊
-            _disableInitializers();␊
-        }␊
-    ␊
-        function initialize(address signer) public initializer {␊
-            __SignerECDSA_init(signer);␊
-        }␊
+    contract CustomAccountWithSignerEIP7702ERC721Holder is Account, EIP712, ERC7739, SignerEIP7702, ERC721Holder {␊
+        constructor() EIP712("CustomAccount with SignerEIP7702ERC721Holder", "1") {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC1155Holder upgradeable transparent
+## Account with SignerEIP7702 with ERC1155Holder non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    ␊
-    contract CustomAccountWithSignerECDSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC1155Holder {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
-        constructor() EIP712("CustomAccount with SignerECDSAERC1155Holder", "1") {␊
-            _disableInitializers();␊
-        }␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
-        function initialize(address signer) public initializer {␊
-            __SignerECDSA_init(signer);␊
-        }␊
+    contract CustomAccountWithSignerEIP7702ERC1155Holder is Account, EIP712, ERC7739, SignerEIP7702, ERC1155Holder {␊
+        constructor() EIP712("CustomAccount with SignerEIP7702ERC1155Holder", "1") {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC721Holder and ERC1155Holder upgradeable transparent
+## Account with SignerEIP7702 with ERC721Holder and ERC1155Holder non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -2868,47 +2879,31 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
-    contract CustomAccountWithSignerECDSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
+    contract CustomAccountWithSignerEIP7702ERC721HolderERC1155Holder is Account, EIP712, ERC7739, SignerEIP7702, ERC721Holder, ERC1155Holder {␊
         constructor()␊
-            EIP712("CustomAccount with SignerECDSAERC721HolderERC1155Holder", "1")␊
-        {␊
-            _disableInitializers();␊
-        }␊
-    ␊
-        function initialize(address signer) public initializer {␊
-            __SignerECDSA_init(signer);␊
-        }␊
+            EIP712("CustomAccount with SignerEIP7702ERC721HolderERC1155Holder", "1")␊
+        {}␊
     }␊
     `
 
-## Account with SignerECDSA with ERC7821 Execution upgradeable transparent
+## Account with SignerEIP7702 with ERC7821 Execution non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    ␊
-    contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC7821 {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
-        constructor() EIP712("MyAccount", "1") {␊
-            _disableInitializers();␊
-        }␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
-        function initialize(address signer) public initializer {␊
-            __SignerECDSA_init(signer);␊
-        }␊
+    contract MyAccount is Account, EIP712, ERC7739, SignerEIP7702, ERC7821 {␊
+        constructor() EIP712("MyAccount", "1") {}␊
     ␊
         function _erc7821AuthorizedExecutor(address caller, bytes32 mode, bytes calldata executionData)␊
             internal␊
@@ -2921,64 +2916,55 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 upgradeable transparent
+## Account with SignerEIP7702 with ERC7579 non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
+    import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    ␊
-    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
-        constructor() EIP712("MyAccount", "1") {␊
-            _disableInitializers();␊
-        }␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
-        function initialize(address signer) public initializer {␊
-            __AccountERC7579_init();␊
-            __SignerECDSA_init(signer);␊
-        }␊
+    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerEIP7702 {␊
+        constructor() EIP712("MyAccount", "1") {}␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
             view␊
-            override(AccountERC7579Upgradeable, ERC7739)␊
+            override(AccountERC7579, ERC7739)␊
             returns (bytes4)␊
         {␊
             // ERC-7739 can return the ERC-1271 magic value, 0xffffffff (invalid) or 0x77390001 (detection).␊
             // If the returned value is 0xffffffff, fallback to ERC-7579 validation.␊
             bytes4 erc7739magic = ERC7739.isValidSignature(hash, signature);␊
-            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579Upgradeable.isValidSignature(hash, signature) : erc7739magic;␊
+            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579.isValidSignature(hash, signature) : erc7739magic;␊
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
         function _validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash)␊
             internal␊
-            override(Account, AccountERC7579Upgradeable)␊
+            override(Account, AccountERC7579)␊
             returns (uint256)␊
         {␊
             return super._validateUserOp(userOp, userOpHash);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
+        // IMPORTANT: Make sure SignerEIP7702 is most derived than AccountERC7579␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerEIP7702)␊
         // to ensure the correct order of function resolution.␊
-        // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
+        // AccountERC7579 returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerECDSAUpgradeable, AbstractSigner, AccountERC7579Upgradeable)␊
+            override(SignerEIP7702, AbstractSigner, AccountERC7579)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -2986,38 +2972,27 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 with ERC1271 upgradeable transparent
+## Account with SignerEIP7702 with ERC7579 with ERC1271 non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
+    import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    ␊
-    contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
-        constructor() {␊
-            _disableInitializers();␊
-        }␊
-    ␊
-        function initialize(address signer) public initializer {␊
-            __AccountERC7579_init();␊
-            __SignerECDSA_init(signer);␊
-        }␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
+    contract MyAccount is Account, IERC1271, AccountERC7579, SignerEIP7702 {␊
         // The following functions are overrides required by Solidity.␊
     ␊
         function _validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash)␊
             internal␊
-            override(Account, AccountERC7579Upgradeable)␊
+            override(Account, AccountERC7579)␊
             returns (uint256)␊
         {␊
             return super._validateUserOp(userOp, userOpHash);␊
@@ -3026,20 +3001,20 @@ Generated by [AVA](https://avajs.dev).
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
             view␊
-            override(IERC1271, AccountERC7579Upgradeable)␊
+            override(IERC1271, AccountERC7579)␊
             returns (bytes4)␊
         {␊
             return super.isValidSignature(hash, signature);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
+        // IMPORTANT: Make sure SignerEIP7702 is most derived than AccountERC7579␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerEIP7702)␊
         // to ensure the correct order of function resolution.␊
-        // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
+        // AccountERC7579 returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerECDSAUpgradeable, AbstractSigner, AccountERC7579Upgradeable)␊
+            override(SignerEIP7702, AbstractSigner, AccountERC7579)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -3047,64 +3022,55 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 with ERC7739 upgradeable transparent
+## Account with SignerEIP7702 with ERC7579 with ERC7739 non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
+    import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    ␊
-    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerECDSAUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
-        constructor() EIP712("MyAccount", "1") {␊
-            _disableInitializers();␊
-        }␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
-        function initialize(address signer) public initializer {␊
-            __AccountERC7579_init();␊
-            __SignerECDSA_init(signer);␊
-        }␊
+    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579, SignerEIP7702 {␊
+        constructor() EIP712("MyAccount", "1") {}␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
             view␊
-            override(AccountERC7579Upgradeable, ERC7739)␊
+            override(AccountERC7579, ERC7739)␊
             returns (bytes4)␊
         {␊
             // ERC-7739 can return the ERC-1271 magic value, 0xffffffff (invalid) or 0x77390001 (detection).␊
             // If the returned value is 0xffffffff, fallback to ERC-7579 validation.␊
             bytes4 erc7739magic = ERC7739.isValidSignature(hash, signature);␊
-            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579Upgradeable.isValidSignature(hash, signature) : erc7739magic;␊
+            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579.isValidSignature(hash, signature) : erc7739magic;␊
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
         function _validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash)␊
             internal␊
-            override(Account, AccountERC7579Upgradeable)␊
+            override(Account, AccountERC7579)␊
             returns (uint256)␊
         {␊
             return super._validateUserOp(userOp, userOpHash);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
+        // IMPORTANT: Make sure SignerEIP7702 is most derived than AccountERC7579␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerEIP7702)␊
         // to ensure the correct order of function resolution.␊
-        // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
+        // AccountERC7579 returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerECDSAUpgradeable, AbstractSigner, AccountERC7579Upgradeable)␊
+            override(SignerEIP7702, AbstractSigner, AccountERC7579)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -3112,65 +3078,56 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## Account with SignerECDSA with ERC7579 hooks upgradeable transparent
+## Account with SignerEIP7702 with ERC7579 hooks non-upgradeable
 
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
-    import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
-    import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
+    import {AccountERC7579} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579.sol";␊
+    import {AccountERC7579Hooked} from "@openzeppelin/contracts/account/extensions/draft-AccountERC7579Hooked.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-    ␊
-    contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerECDSAUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
-        constructor() EIP712("MyAccount", "1") {␊
-            _disableInitializers();␊
-        }␊
+    import {SignerEIP7702} from "@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol";␊
     ␊
-        function initialize(address signer) public initializer {␊
-            __AccountERC7579Hooked_init();␊
-            __SignerECDSA_init(signer);␊
-        }␊
+    contract MyAccount is Account, EIP712, ERC7739, AccountERC7579Hooked, SignerEIP7702 {␊
+        constructor() EIP712("MyAccount", "1") {}␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
             public␊
             view␊
-            override(AccountERC7579Upgradeable, ERC7739)␊
+            override(AccountERC7579, ERC7739)␊
             returns (bytes4)␊
         {␊
             // ERC-7739 can return the ERC-1271 magic value, 0xffffffff (invalid) or 0x77390001 (detection).␊
             // If the returned value is 0xffffffff, fallback to ERC-7579 validation.␊
             bytes4 erc7739magic = ERC7739.isValidSignature(hash, signature);␊
-            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579Upgradeable.isValidSignature(hash, signature) : erc7739magic;␊
+            return erc7739magic == bytes4(0xffffffff) ? AccountERC7579.isValidSignature(hash, signature) : erc7739magic;␊
         }␊
     ␊
         // The following functions are overrides required by Solidity.␊
     ␊
         function _validateUserOp(PackedUserOperation calldata userOp, bytes32 userOpHash)␊
             internal␊
-            override(Account, AccountERC7579Upgradeable)␊
+            override(Account, AccountERC7579)␊
             returns (uint256)␊
         {␊
             return super._validateUserOp(userOp, userOpHash);␊
         }␊
     ␊
-        // IMPORTANT: Make sure SignerECDSAUpgradeable is most derived than AccountERC7579Upgradeable␊
-        // in the inheritance chain (i.e. contract ... is AccountERC7579Upgradeable, ..., SignerECDSAUpgradeable)␊
+        // IMPORTANT: Make sure SignerEIP7702 is most derived than AccountERC7579␊
+        // in the inheritance chain (i.e. contract ... is AccountERC7579, ..., SignerEIP7702)␊
         // to ensure the correct order of function resolution.␊
-        // AccountERC7579Upgradeable returns false for _rawSignatureValidation␊
+        // AccountERC7579 returns false for _rawSignatureValidation␊
         function _rawSignatureValidation(bytes32 hash, bytes calldata signature)␊
             internal␊
             view␊
-            override(SignerECDSAUpgradeable, AbstractSigner, AccountERC7579Upgradeable)␊
+            override(SignerEIP7702, AbstractSigner, AccountERC7579)␊
             returns (bool)␊
         {␊
             return super._rawSignatureValidation(hash, signature);␊
@@ -3183,7 +3140,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -3204,7 +3161,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -3230,7 +3187,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -3251,7 +3208,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -3273,7 +3230,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -3295,7 +3252,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -3318,7 +3275,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -3349,7 +3306,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -3408,7 +3365,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -3460,7 +3417,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -3519,7 +3476,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -3579,15 +3536,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3597,7 +3554,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -3613,14 +3569,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3630,7 +3586,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -3655,15 +3610,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3673,7 +3628,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -3689,16 +3643,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3708,7 +3662,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -3724,16 +3677,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3743,7 +3696,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -3759,7 +3711,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -3767,9 +3719,9 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3781,7 +3733,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -3797,16 +3748,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3816,7 +3767,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _erc7821AuthorizedExecutor(address caller, bytes32 mode, bytes calldata executionData)␊
@@ -3841,7 +3791,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -3849,10 +3799,10 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3863,7 +3813,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __AccountERC7579_init();␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -3914,17 +3863,17 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -3935,7 +3884,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __AccountERC7579_init();␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -3983,7 +3931,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -3991,10 +3939,10 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4005,7 +3953,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __AccountERC7579_init();␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -4056,7 +4003,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -4065,10 +4012,10 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerP256Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -4079,7 +4026,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(bytes32 qx, bytes32 qy) public initializer {␊
             __AccountERC7579Hooked_init();␊
             __SignerP256_init(qx, qy);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -4130,13 +4076,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable {␊
@@ -4156,12 +4102,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1271 is Initializable, Account, IERC1271, SignerP256Upgradeable {␊
@@ -4190,13 +4136,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC7739 is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable {␊
@@ -4216,14 +4162,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder {␊
@@ -4243,14 +4189,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC1155Holder {␊
@@ -4270,7 +4216,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -4278,7 +4224,7 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerP256ERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC721Holder, ERC1155Holder {␊
@@ -4300,14 +4246,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerP256Upgradeable, ERC7821 {␊
@@ -4336,7 +4282,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -4344,7 +4290,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
@@ -4401,14 +4347,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
@@ -4462,7 +4408,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -4470,7 +4416,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
@@ -4527,7 +4473,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -4536,7 +4482,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerP256Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerP256Upgradeable.sol";␊
     ␊
@@ -4593,7 +4539,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -4614,7 +4560,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -4640,7 +4586,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -4661,7 +4607,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -4683,7 +4629,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -4705,7 +4651,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -4728,7 +4674,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -4759,7 +4705,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -4818,7 +4764,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -4870,7 +4816,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -4929,7 +4875,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -4989,15 +4935,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSA is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5007,7 +4953,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -5023,14 +4968,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1271 is Initializable, Account, IERC1271, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5040,7 +4985,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -5065,15 +5009,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5083,7 +5027,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -5099,16 +5042,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5118,7 +5061,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -5134,16 +5076,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5153,7 +5095,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -5169,7 +5110,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -5177,9 +5118,9 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5191,7 +5132,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -5207,16 +5147,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5226,7 +5166,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _erc7821AuthorizedExecutor(address caller, bytes32 mode, bytes calldata executionData)␊
@@ -5251,7 +5190,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -5259,10 +5198,10 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5273,7 +5212,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __AccountERC7579_init();␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -5324,17 +5262,17 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5345,7 +5283,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __AccountERC7579_init();␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -5393,7 +5330,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -5401,10 +5338,10 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5415,7 +5352,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __AccountERC7579_init();␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -5466,7 +5402,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -5475,10 +5411,10 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, SignerRSAUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -5489,7 +5425,6 @@ Generated by [AVA](https://avajs.dev).
         function initialize(bytes memory e, bytes memory n) public initializer {␊
             __AccountERC7579Hooked_init();␊
             __SignerRSA_init(e, n);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -5540,13 +5475,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSA is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable {␊
@@ -5566,12 +5501,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1271 is Initializable, Account, IERC1271, SignerRSAUpgradeable {␊
@@ -5600,13 +5535,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC7739 is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable {␊
@@ -5626,14 +5561,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder {␊
@@ -5653,14 +5588,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC1155Holder {␊
@@ -5680,7 +5615,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -5688,7 +5623,7 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerRSAERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC721Holder, ERC1155Holder {␊
@@ -5710,14 +5645,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerRSAUpgradeable, ERC7821 {␊
@@ -5746,7 +5681,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -5754,7 +5689,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
@@ -5811,14 +5746,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
@@ -5872,7 +5807,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -5880,7 +5815,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
@@ -5937,7 +5872,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -5946,7 +5881,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     import {SignerRSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerRSAUpgradeable.sol";␊
     ␊
@@ -6003,7 +5938,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -6036,7 +5971,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -6076,7 +6011,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -6109,7 +6044,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -6143,7 +6078,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -6177,7 +6112,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -6212,7 +6147,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -6255,7 +6190,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -6326,7 +6261,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -6392,7 +6327,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -6463,7 +6398,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -6535,15 +6470,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisig is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6556,7 +6491,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function addSigners(bytes[] memory signers) public onlyEntryPointOrSelf {␊
@@ -6584,14 +6518,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6604,7 +6538,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -6641,15 +6574,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6662,7 +6595,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function addSigners(bytes[] memory signers) public onlyEntryPointOrSelf {␊
@@ -6690,16 +6622,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6712,7 +6644,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function addSigners(bytes[] memory signers) public onlyEntryPointOrSelf {␊
@@ -6740,16 +6671,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6762,7 +6693,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function addSigners(bytes[] memory signers) public onlyEntryPointOrSelf {␊
@@ -6790,7 +6720,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -6798,9 +6728,9 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6815,7 +6745,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function addSigners(bytes[] memory signers) public onlyEntryPointOrSelf {␊
@@ -6843,16 +6772,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6865,7 +6794,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function addSigners(bytes[] memory signers) public onlyEntryPointOrSelf {␊
@@ -6902,7 +6830,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -6910,10 +6838,10 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -6927,7 +6855,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             __AccountERC7579_init();␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -6990,17 +6917,17 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7014,7 +6941,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             __AccountERC7579_init();␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function addSigners(bytes[] memory signers) public onlyEntryPointOrSelf {␊
@@ -7074,7 +7000,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -7082,10 +7008,10 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7099,7 +7025,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             __AccountERC7579_init();␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -7162,7 +7087,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -7171,10 +7096,10 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, MultiSignerERC7913Upgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -7188,7 +7113,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             __AccountERC7579Hooked_init();␊
             __MultiSignerERC7913_init(signers, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -7251,13 +7175,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisig is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable {␊
@@ -7292,12 +7216,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913Upgradeable {␊
@@ -7341,13 +7265,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable {␊
@@ -7382,14 +7306,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder {␊
@@ -7424,14 +7348,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC1155Holder {␊
@@ -7466,7 +7390,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -7474,7 +7398,7 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC721Holder, ERC1155Holder {␊
@@ -7511,14 +7435,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913Upgradeable, ERC7821 {␊
@@ -7562,7 +7486,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -7570,7 +7494,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
@@ -7642,14 +7566,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
@@ -7718,7 +7642,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -7726,7 +7650,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
@@ -7798,7 +7722,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -7807,7 +7731,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
     ␊
@@ -7879,7 +7803,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -7919,7 +7843,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -7966,7 +7890,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -8006,7 +7930,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -8047,7 +7971,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -8088,7 +8012,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -8130,7 +8054,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -8180,7 +8104,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -8259,7 +8183,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -8333,7 +8257,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -8412,7 +8336,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -8492,15 +8416,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeighted is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8513,7 +8437,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function setSignerWeights(bytes[] memory signers, uint64[] memory weights)␊
@@ -8548,14 +8471,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8568,7 +8491,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -8612,15 +8534,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8635,7 +8557,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function setSignerWeights(bytes[] memory signers, uint64[] memory weights)␊
@@ -8670,16 +8591,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8694,7 +8615,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function setSignerWeights(bytes[] memory signers, uint64[] memory weights)␊
@@ -8729,16 +8649,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8753,7 +8673,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function setSignerWeights(bytes[] memory signers, uint64[] memory weights)␊
@@ -8788,7 +8707,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -8796,9 +8715,9 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8813,7 +8732,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function setSignerWeights(bytes[] memory signers, uint64[] memory weights)␊
@@ -8848,16 +8766,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC7821, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8870,7 +8788,6 @@ Generated by [AVA](https://avajs.dev).
             initializer␊
         {␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function setSignerWeights(bytes[] memory signers, uint64[] memory weights)␊
@@ -8914,7 +8831,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -8922,11 +8839,11 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -8940,7 +8857,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             __AccountERC7579_init();␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -9010,18 +8926,18 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, IERC1271, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9035,7 +8951,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             __AccountERC7579_init();␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function setSignerWeights(bytes[] memory signers, uint64[] memory weights)␊
@@ -9102,7 +9017,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -9110,11 +9025,11 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579Upgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9128,7 +9043,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             __AccountERC7579_init();␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -9198,7 +9112,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -9207,11 +9121,11 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, AccountERC7579HookedUpgradeable, MultiSignerERC7913WeightedUpgradeable, UUPSUpgradeable {␊
         /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -9225,7 +9139,6 @@ Generated by [AVA](https://avajs.dev).
         {␊
             __AccountERC7579Hooked_init();␊
             __MultiSignerERC7913Weighted_init(signers, weights, threshold);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function isValidSignature(bytes32 hash, bytes calldata signature)␊
@@ -9295,13 +9208,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeighted is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable {␊
@@ -9343,12 +9256,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1271 is Initializable, Account, IERC1271, MultiSignerERC7913WeightedUpgradeable {␊
@@ -9399,13 +9312,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC7739 is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable {␊
@@ -9449,14 +9362,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder {␊
@@ -9500,14 +9413,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC1155Holder {␊
@@ -9551,7 +9464,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -9559,7 +9472,7 @@ Generated by [AVA](https://avajs.dev).
     import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
     import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract CustomAccountWithSignerMultisigWeightedERC721HolderERC1155Holder is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC721Holder, ERC1155Holder {␊
@@ -9603,14 +9516,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
     import {ERC7821} from "@openzeppelin/contracts/account/extensions/draft-ERC7821.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     ␊
     contract MyAccount is Initializable, Account, EIP712, ERC7739, MultiSignerERC7913WeightedUpgradeable, ERC7821 {␊
@@ -9661,7 +9574,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -9669,7 +9582,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
@@ -9749,14 +9662,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
     import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
@@ -9833,7 +9746,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -9841,7 +9754,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579Upgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579Upgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
@@ -9921,7 +9834,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AbstractSigner} from "@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol";␊
@@ -9930,7 +9843,7 @@ Generated by [AVA](https://avajs.dev).
     import {AccountERC7579HookedUpgradeable} from "@openzeppelin/contracts-upgradeable/account/extensions/draft-AccountERC7579HookedUpgradeable.sol";␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
     import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {MultiSignerERC7913Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913Upgradeable.sol";␊
     import {MultiSignerERC7913WeightedUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/MultiSignerERC7913WeightedUpgradeable.sol";␊
     import {PackedUserOperation} from "@openzeppelin/contracts/interfaces/draft-IERC4337.sol";␊
diff --git a/packages/core/solidity/src/account.test.ts.snap b/packages/core/solidity/src/account.test.ts.snap
index 8f9f873c2..0e4a35201 100644
Binary files a/packages/core/solidity/src/account.test.ts.snap and b/packages/core/solidity/src/account.test.ts.snap differ
diff --git a/packages/core/solidity/src/contract.test.ts.md b/packages/core/solidity/src/contract.test.ts.md
index f0f01afb2..3dfc5594b 100644
--- a/packages/core/solidity/src/contract.test.ts.md
+++ b/packages/core/solidity/src/contract.test.ts.md
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -21,7 +21,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Footec {␊
@@ -33,7 +33,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Bar} from "./Bar.sol";␊
@@ -47,7 +47,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Bar} from "./Bar.sol";␊
@@ -62,7 +62,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Bar} from "./Bar.sol";␊
@@ -77,7 +77,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Bar} from "./Bar.sol";␊
@@ -93,7 +93,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -105,7 +105,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -125,7 +125,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -149,7 +149,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -162,7 +162,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -177,7 +177,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -192,7 +192,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Bar} from "./Bar.sol";␊
@@ -209,7 +209,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -224,7 +224,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -240,7 +240,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -253,7 +253,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Foo {␊
@@ -267,7 +267,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract FooBarBaz {␊
@@ -279,7 +279,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     /// @custom:security-contact security@example.com␊
diff --git a/packages/core/solidity/src/contract.test.ts.snap b/packages/core/solidity/src/contract.test.ts.snap
index f14822349..df1fc926a 100644
Binary files a/packages/core/solidity/src/contract.test.ts.snap and b/packages/core/solidity/src/contract.test.ts.snap differ
diff --git a/packages/core/solidity/src/custom.test.ts.md b/packages/core/solidity/src/custom.test.ts.md
index 7906d5648..6354fcdc0 100644
--- a/packages/core/solidity/src/custom.test.ts.md
+++ b/packages/core/solidity/src/custom.test.ts.md
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract MyContract {␊
@@ -21,7 +21,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract Contract {␊
@@ -33,7 +33,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -57,10 +57,10 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract MyContract is Initializable {␊
         /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -75,22 +75,21 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
     ␊
         function initialize(address initialOwner) public initializer {␊
             __Ownable_init(initialOwner);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
@@ -106,7 +105,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     contract MyContract {␊
@@ -118,7 +117,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";␊
@@ -133,7 +132,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -150,7 +149,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -165,22 +164,21 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyContract is Initializable, OwnableUpgradeable, UUPSUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
     ␊
         function initialize(address initialOwner) public initializer {␊
             __Ownable_init(initialOwner);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function _authorizeUpgrade(address newImplementation)␊
diff --git a/packages/core/solidity/src/custom.test.ts.snap b/packages/core/solidity/src/custom.test.ts.snap
index 6e45868eb..187a9031e 100644
Binary files a/packages/core/solidity/src/custom.test.ts.snap and b/packages/core/solidity/src/custom.test.ts.snap differ
diff --git a/packages/core/solidity/src/environments/hardhat/package-lock.json b/packages/core/solidity/src/environments/hardhat/package-lock.json
index 8fea47d86..9cc4440e3 100644
--- a/packages/core/solidity/src/environments/hardhat/package-lock.json
+++ b/packages/core/solidity/src/environments/hardhat/package-lock.json
@@ -10,8 +10,8 @@
       "license": "ISC",
       "devDependencies": {
         "@nomicfoundation/hardhat-toolbox": "^6.1.0",
-        "@openzeppelin/contracts": "^5.4.0",
-        "hardhat": "^2.16.1"
+        "@openzeppelin/contracts": "^5.5.0-rc.0",
+        "hardhat": "^2.22.0"
       }
     },
     "node_modules/@adraffy/ens-normalize": {
@@ -48,111 +48,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@ethereumjs/rlp": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-5.0.2.tgz",
-      "integrity": "sha512-DziebCdg4JpGlEqEdGgXmjqcFoJi+JGulUXwEjsZGAscAQ7MyD/7LE/GVCP29vEQxKc7AAwjT3A2ywHp2xfoCA==",
-      "dev": true,
-      "license": "MPL-2.0",
-      "bin": {
-        "rlp": "bin/rlp.cjs"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@ethereumjs/util": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-9.1.0.tgz",
-      "integrity": "sha512-XBEKsYqLGXLah9PNJbgdkigthkG7TAGvlD/sH12beMXEyHDyigfcbdvHhmLyDWgDyOJn4QwiQUaF7yeuhnjdog==",
-      "dev": true,
-      "license": "MPL-2.0",
-      "dependencies": {
-        "@ethereumjs/rlp": "^5.0.2",
-        "ethereum-cryptography": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/@noble/curves": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
-      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/hashes": "1.4.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/@noble/hashes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/@scure/base": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz",
-      "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/@scure/bip32": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz",
-      "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/curves": "~1.4.0",
-        "@noble/hashes": "~1.4.0",
-        "@scure/base": "~1.1.6"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/@scure/bip39": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
-      "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/hashes": "~1.4.0",
-        "@scure/base": "~1.1.6"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/ethereum-cryptography": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz",
-      "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/curves": "1.4.2",
-        "@noble/hashes": "1.4.0",
-        "@scure/bip32": "1.4.0",
-        "@scure/bip39": "1.3.0"
-      }
-    },
     "node_modules/@ethersproject/abi": {
       "version": "5.8.0",
       "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.8.0.tgz",
@@ -737,6 +632,56 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
+    "node_modules/@metamask/eth-sig-util": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@metamask/eth-sig-util/-/eth-sig-util-4.0.1.tgz",
+      "integrity": "sha512-tghyZKLHZjcdlDqCA3gNZmLeR0XvOE9U1qoQO9ohyAZT6Pya+H9vkBPcsyXytmYLNgVoin7CKCmweo/R43V+tQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "ethereumjs-abi": "^0.6.8",
+        "ethereumjs-util": "^6.2.1",
+        "ethjs-util": "^0.1.6",
+        "tweetnacl": "^1.0.3",
+        "tweetnacl-util": "^0.15.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/bn.js": {
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
     "node_modules/@noble/ciphers": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-1.3.0.tgz",
@@ -834,28 +779,28 @@
       }
     },
     "node_modules/@nomicfoundation/edr": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.11.3.tgz",
-      "integrity": "sha512-kqILRkAd455Sd6v8mfP3C1/0tCOynJWY+Ir+k/9Boocu2kObCrsFgG+ZWB7fSBVdd9cPVSNrnhWS+V+PEo637g==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.3.8.tgz",
+      "integrity": "sha512-u2UJ5QpznSHVkZRh6ePWoeVb6kmPrrqh08gCnZ9FHlJV9CITqlrTQHJkacd+INH31jx88pTAJnxePE4XAiH5qg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nomicfoundation/edr-darwin-arm64": "0.11.3",
-        "@nomicfoundation/edr-darwin-x64": "0.11.3",
-        "@nomicfoundation/edr-linux-arm64-gnu": "0.11.3",
-        "@nomicfoundation/edr-linux-arm64-musl": "0.11.3",
-        "@nomicfoundation/edr-linux-x64-gnu": "0.11.3",
-        "@nomicfoundation/edr-linux-x64-musl": "0.11.3",
-        "@nomicfoundation/edr-win32-x64-msvc": "0.11.3"
+        "@nomicfoundation/edr-darwin-arm64": "0.3.8",
+        "@nomicfoundation/edr-darwin-x64": "0.3.8",
+        "@nomicfoundation/edr-linux-arm64-gnu": "0.3.8",
+        "@nomicfoundation/edr-linux-arm64-musl": "0.3.8",
+        "@nomicfoundation/edr-linux-x64-gnu": "0.3.8",
+        "@nomicfoundation/edr-linux-x64-musl": "0.3.8",
+        "@nomicfoundation/edr-win32-x64-msvc": "0.3.8"
       },
       "engines": {
         "node": ">= 18"
       }
     },
     "node_modules/@nomicfoundation/edr-darwin-arm64": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.11.3.tgz",
-      "integrity": "sha512-w0tksbdtSxz9nuzHKsfx4c2mwaD0+l5qKL2R290QdnN9gi9AV62p9DHkOgfBdyg6/a6ZlnQqnISi7C9avk/6VA==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.3.8.tgz",
+      "integrity": "sha512-eB0leCexS8sQEmfyD72cdvLj9djkBzQGP4wSQw6SNf2I4Sw4Cnzb3d45caG2FqFFjbvfqL0t+badUUIceqQuMw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -863,9 +808,9 @@
       }
     },
     "node_modules/@nomicfoundation/edr-darwin-x64": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.11.3.tgz",
-      "integrity": "sha512-QR4jAFrPbOcrO7O2z2ESg+eUeIZPe2bPIlQYgiJ04ltbSGW27FblOzdd5+S3RoOD/dsZGKAvvy6dadBEl0NgoA==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.3.8.tgz",
+      "integrity": "sha512-JksVCS1N5ClwVF14EvO25HCQ+Laljh/KRfHERMVAC9ZwPbTuAd/9BtKvToCBi29uCHWqsXMI4lxCApYQv2nznw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -873,9 +818,9 @@
       }
     },
     "node_modules/@nomicfoundation/edr-linux-arm64-gnu": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.11.3.tgz",
-      "integrity": "sha512-Ktjv89RZZiUmOFPspuSBVJ61mBZQ2+HuLmV67InNlh9TSUec/iDjGIwAn59dx0bF/LOSrM7qg5od3KKac4LJDQ==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.3.8.tgz",
+      "integrity": "sha512-raCE+fOeNXhVBLUo87cgsHSGvYYRB6arih4eG6B9KGACWK5Veebtm9xtKeiD8YCsdUlUfat6F7ibpeNm91fpsA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -883,9 +828,9 @@
       }
     },
     "node_modules/@nomicfoundation/edr-linux-arm64-musl": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.11.3.tgz",
-      "integrity": "sha512-B3sLJx1rL2E9pfdD4mApiwOZSrX0a/KQSBWdlq1uAhFKqkl00yZaY4LejgZndsJAa4iKGQJlGnw4HCGeVt0+jA==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.3.8.tgz",
+      "integrity": "sha512-PwiDp4wBZWMCIy29eKkv8moTKRrpiSDlrc+GQMSZLhOAm8T33JKKXPwD/2EbplbhCygJDGXZdtEKl9x9PaH66A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -893,9 +838,9 @@
       }
     },
     "node_modules/@nomicfoundation/edr-linux-x64-gnu": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.11.3.tgz",
-      "integrity": "sha512-D/4cFKDXH6UYyKPu6J3Y8TzW11UzeQI0+wS9QcJzjlrrfKj0ENW7g9VihD1O2FvXkdkTjcCZYb6ai8MMTCsaVw==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.3.8.tgz",
+      "integrity": "sha512-6AcvA/XKoipGap5jJmQ9Y6yT7Uf39D9lu2hBcDCXnXbMcXaDGw4mn1/L4R63D+9VGZyu1PqlcJixCUZlGGIWlg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -903,9 +848,9 @@
       }
     },
     "node_modules/@nomicfoundation/edr-linux-x64-musl": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.11.3.tgz",
-      "integrity": "sha512-ergXuIb4nIvmf+TqyiDX5tsE49311DrBky6+jNLgsGDTBaN1GS3OFwFS8I6Ri/GGn6xOaT8sKu3q7/m+WdlFzg==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.3.8.tgz",
+      "integrity": "sha512-cxb0sEmZjlwhYWO28sPsV64VDx31ekskhC1IsDXU1p9ntjHSJRmW4KEIqJ2O3QwJap/kLKfMS6TckvY10gjc6w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -913,15 +858,84 @@
       }
     },
     "node_modules/@nomicfoundation/edr-win32-x64-msvc": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.11.3.tgz",
-      "integrity": "sha512-snvEf+WB3OV0wj2A7kQ+ZQqBquMcrozSLXcdnMdEl7Tmn+KDCbmFKBt3Tk0X3qOU4RKQpLPnTxdM07TJNVtung==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.3.8.tgz",
+      "integrity": "sha512-yVuVPqRRNLZk7TbBMkKw7lzCvI8XO8fNTPTYxymGadjr9rEGRuNTU1yBXjfJ59I1jJU/X2TSkRk1OFX0P5tpZQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 18"
       }
     },
+    "node_modules/@nomicfoundation/ethereumjs-common": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.4.tgz",
+      "integrity": "sha512-9Rgb658lcWsjiicr5GzNCjI1llow/7r0k50dLL95OJ+6iZJcVbi15r3Y0xh2cIO+zgX0WIHcbzIu6FeQf9KPrg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-util": "9.0.4"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-rlp": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-5.0.4.tgz",
+      "integrity": "sha512-8H1S3s8F6QueOc/X92SdrA4RDenpiAEqMg5vJH99kcQaCy/a3Q6fgseo75mgWlbanGJXSlAPtnCeG9jvfTYXlw==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "bin": {
+        "rlp": "bin/rlp.cjs"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-tx": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-5.0.4.tgz",
+      "integrity": "sha512-Xjv8wAKJGMrP1f0n2PeyfFCCojHd7iS3s/Ab7qzF1S64kxZ8Z22LCMynArYsVqiFx6rzYy548HNVEyI+AYN/kw==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-common": "4.0.4",
+        "@nomicfoundation/ethereumjs-rlp": "5.0.4",
+        "@nomicfoundation/ethereumjs-util": "9.0.4",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "c-kzg": "^2.1.2"
+      },
+      "peerDependenciesMeta": {
+        "c-kzg": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-util": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-9.0.4.tgz",
+      "integrity": "sha512-sLOzjnSrlx9Bb9EFNtHzK/FJFsfg2re6bsGqinFinH1gCqVfz9YYlXiMWwDM4C/L4ywuHFCYwfKTVr/QHQcU0Q==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-rlp": "5.0.4",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "c-kzg": "^2.1.2"
+      },
+      "peerDependenciesMeta": {
+        "c-kzg": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@nomicfoundation/hardhat-chai-matchers": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-chai-matchers/-/hardhat-chai-matchers-2.1.0.tgz",
@@ -1219,9 +1233,9 @@
       }
     },
     "node_modules/@openzeppelin/contracts": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.4.0.tgz",
-      "integrity": "sha512-eCYgWnLg6WO+X52I16TZt8uEjbtdkgLC0SUX/xnAksjjrQI4Xfn4iBRoI5j55dmlOhDv1Y7BoR3cU7e3WWhC6A==",
+      "version": "5.5.0-rc.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.5.0-rc.0.tgz",
+      "integrity": "sha512-bhJiU4PC3suR1bJ4xkhkAlIZsyAjYr0q3VRgh6tfi8uDpy/NTNpwDeTI+qlGnyXrrnqT04/Qjui6IDHNmAT4wA==",
       "dev": true,
       "license": "MIT"
     },
@@ -1243,6 +1257,7 @@
       "integrity": "sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
@@ -1571,7 +1586,6 @@
       "integrity": "sha512-DLbJ1BPqxvQhIGbeu8VbUC1DiAiahHtAYvA0ZEAa4P31F7IaArc8z3C3BRQdWX4mtLQuABG4yzp76ZrS02Ui1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -1607,6 +1621,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/minimatch": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
@@ -1629,7 +1650,6 @@
       "integrity": "sha512-DRh5K+ka5eJic8CjH7td8QpYEV6Zo10gfRkjHCO3weqZHWDtAaSTFtl4+VMqOJ4N5jcuhZ9/l+yy8rVgw7BQeQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~7.10.0"
       }
@@ -1640,7 +1660,6 @@
       "integrity": "sha512-uRwJqmiXmh9++aSu1VNEn3iIxWOhd8AHXNSdlaLfdAAdSTY9jYVeGWnzejM3dvrkbqE3/hyQkQQ29IFATEGlew==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -1659,7 +1678,6 @@
       "integrity": "sha512-hHxJU6PAEUn0TP4S/ZOzuTUvJWuZ6eIKeNKb5RBpODvSl6hp1Wrw4s7ATY50rklRCScUDpHzVA/DQdSjJ3UoYQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -1966,7 +1984,6 @@
       "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "possible-typed-array-names": "^1.0.0"
       },
@@ -2003,7 +2020,6 @@
       "integrity": "sha512-xz7wQ8xDhdyP7tQxwdteLYeFfS68tSMNCZ/Y37WJ4bhGfKPpqEIlmIyueQHqOyoPhE6xNUqjzRr8ra0eF9VRvA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "safe-buffer": "^5.0.1"
       }
@@ -2026,8 +2042,7 @@
       "resolved": "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz",
       "integrity": "sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/bn.js": {
       "version": "5.2.2",
@@ -2123,7 +2138,6 @@
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "buffer-xor": "^1.0.3",
         "cipher-base": "^1.0.0",
@@ -2139,7 +2153,6 @@
       "integrity": "sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "base-x": "^3.0.2"
       }
@@ -2150,7 +2163,6 @@
       "integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "bs58": "^4.0.0",
         "create-hash": "^1.1.0",
@@ -2169,8 +2181,7 @@
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
       "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/bytes": {
       "version": "3.1.2",
@@ -2188,7 +2199,6 @@
       "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
@@ -2208,7 +2218,6 @@
       "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "es-errors": "^1.3.0",
         "function-bind": "^1.1.2"
@@ -2223,7 +2232,6 @@
       "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.2",
         "get-intrinsic": "^1.3.0"
@@ -2339,19 +2347,28 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "readdirp": "^4.0.1"
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
       },
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 8.10.0"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       }
     },
     "node_modules/ci-info": {
@@ -2367,7 +2384,6 @@
       "integrity": "sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "inherits": "^2.0.4",
         "safe-buffer": "^5.2.1"
@@ -2611,22 +2627,18 @@
       }
     },
     "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
+      "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12"
-      }
+      "license": "MIT"
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/cookie": {
       "version": "0.4.2",
@@ -2644,7 +2656,6 @@
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -2659,7 +2670,6 @@
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cipher-base": "^1.0.3",
         "create-hash": "^1.1.0",
@@ -2781,7 +2791,6 @@
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -2858,7 +2867,6 @@
       "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.1",
         "es-errors": "^1.3.0",
@@ -2936,7 +2944,6 @@
       "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -2947,7 +2954,6 @@
       "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -2958,7 +2964,6 @@
       "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "es-errors": "^1.3.0"
       },
@@ -3097,7 +3102,6 @@
       "integrity": "sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/pbkdf2": "^3.0.0",
         "@types/secp256k1": "^4.0.1",
@@ -3116,6 +3120,51 @@
         "setimmediate": "^1.0.5"
       }
     },
+    "node_modules/ethereumjs-abi": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz",
+      "integrity": "sha512-Tx0r/iXI6r+lRsdvkFDlut0N08jWMnKRZ6Gkq+Nmw75lZe4e6o3EkSnkaBP5NF6+m5PTGAr9JP43N3LyeoglsA==",
+      "deprecated": "This library has been deprecated and usage is discouraged.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.11.8",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ethereumjs-abi/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ethereumjs-abi/node_modules/bn.js": {
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ethereumjs-abi/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
     "node_modules/ethereumjs-util": {
       "version": "7.1.5",
       "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz",
@@ -3207,6 +3256,21 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/ethjs-util": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
+      "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-hex-prefixed": "1.0.0",
+        "strip-hex-prefix": "1.0.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
     "node_modules/eventemitter3": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
@@ -3221,7 +3285,6 @@
       "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "md5.js": "^1.3.4",
         "safe-buffer": "^5.1.1"
@@ -3371,7 +3434,6 @@
       "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "is-callable": "^1.2.7"
       },
@@ -3469,7 +3531,6 @@
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3501,7 +3562,6 @@
       "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.2",
         "es-define-property": "^1.0.1",
@@ -3527,7 +3587,6 @@
       "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "dunder-proto": "^1.0.1",
         "es-object-atoms": "^1.0.0"
@@ -3791,7 +3850,6 @@
       "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -3841,47 +3899,51 @@
       }
     },
     "node_modules/hardhat": {
-      "version": "2.26.3",
-      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.26.3.tgz",
-      "integrity": "sha512-gBfjbxCCEaRgMCRgTpjo1CEoJwqNPhyGMMVHYZJxoQ3LLftp2erSVf8ZF6hTQC0r2wst4NcqNmLWqMnHg1quTw==",
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.22.0.tgz",
+      "integrity": "sha512-t1J+ThxNYANL6ub6yM5XC84RY38vhfG7ODBtVRNQFQozdALo3qZUjxDzyGQU0U0eswe6orK49hq9UpdB7nPXNQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@ethereumjs/util": "^9.1.0",
         "@ethersproject/abi": "^5.1.2",
-        "@nomicfoundation/edr": "^0.11.3",
+        "@metamask/eth-sig-util": "^4.0.0",
+        "@nomicfoundation/edr": "^0.3.0",
+        "@nomicfoundation/ethereumjs-common": "4.0.4",
+        "@nomicfoundation/ethereumjs-tx": "5.0.4",
+        "@nomicfoundation/ethereumjs-util": "9.0.4",
         "@nomicfoundation/solidity-analyzer": "^0.1.0",
         "@sentry/node": "^5.18.1",
+        "@types/bn.js": "^5.1.0",
+        "@types/lru-cache": "^5.1.0",
         "adm-zip": "^0.4.16",
         "aggregate-error": "^3.0.0",
         "ansi-escapes": "^4.3.0",
         "boxen": "^5.1.2",
-        "chokidar": "^4.0.0",
+        "chalk": "^2.4.2",
+        "chokidar": "^3.4.0",
         "ci-info": "^2.0.0",
         "debug": "^4.1.1",
         "enquirer": "^2.3.0",
         "env-paths": "^2.2.0",
         "ethereum-cryptography": "^1.0.3",
-        "find-up": "^5.0.0",
+        "ethereumjs-abi": "^0.6.8",
+        "find-up": "^2.1.0",
         "fp-ts": "1.19.3",
         "fs-extra": "^7.0.1",
+        "glob": "7.2.0",
         "immutable": "^4.0.0-rc.12",
         "io-ts": "1.10.4",
-        "json-stream-stringify": "^3.1.4",
         "keccak": "^3.0.2",
         "lodash": "^4.17.11",
-        "micro-eth-signer": "^0.14.0",
         "mnemonist": "^0.38.0",
         "mocha": "^10.0.0",
         "p-map": "^4.0.0",
-        "picocolors": "^1.1.0",
         "raw-body": "^2.4.1",
         "resolve": "1.17.0",
         "semver": "^6.3.0",
-        "solc": "0.8.26",
+        "solc": "0.7.3",
         "source-map-support": "^0.5.13",
         "stacktrace-parser": "^0.1.10",
-        "tinyglobby": "^0.2.6",
         "tsort": "0.0.1",
         "undici": "^5.14.0",
         "uuid": "^8.3.2",
@@ -4073,6 +4135,72 @@
         "@scure/base": "~1.1.0"
       }
     },
+    "node_modules/hardhat/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/hardhat/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/hardhat/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hardhat/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/hardhat/node_modules/ethereum-cryptography": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz",
@@ -4086,6 +4214,19 @@
         "@scure/bip39": "1.1.1"
       }
     },
+    "node_modules/hardhat/node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/hardhat/node_modules/fs-extra": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
@@ -4101,14 +4242,122 @@
         "node": ">=6 <7 || >=8"
       }
     },
+    "node_modules/hardhat/node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/hardhat/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/hardhat/node_modules/jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
       "dev": true,
       "license": "MIT",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/hardhat/node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/hardhat/node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/hardhat/node_modules/universalify": {
@@ -4159,7 +4408,6 @@
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -4173,7 +4421,6 @@
       "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -4187,7 +4434,6 @@
       "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "has-symbols": "^1.0.3"
       },
@@ -4204,7 +4450,6 @@
       "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "inherits": "^2.0.4",
         "readable-stream": "^3.6.0",
@@ -4231,7 +4476,6 @@
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -4420,7 +4664,6 @@
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -4467,7 +4710,6 @@
       "integrity": "sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.5.0",
         "npm": ">=3"
@@ -4499,7 +4741,6 @@
       "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "which-typed-array": "^1.1.16"
       },
@@ -4528,8 +4769,7 @@
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
       "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/isexe": {
       "version": "2.0.0",
@@ -4601,16 +4841,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/json-stream-stringify": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/json-stream-stringify/-/json-stream-stringify-3.1.6.tgz",
-      "integrity": "sha512-x7fpwxOkbhFCaJDJ8vb1fBY3DdSa4AlITaz+HHILQJzdPMnHEFjxPwVUi1ALIbcIxDE0PNe/0i7frnY8QnBQog==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=7.10.1"
-      }
-    },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -4685,6 +4915,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==",
+      "dev": true,
+      "license": "MIT",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -4839,7 +5079,6 @@
       "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -4850,7 +5089,6 @@
       "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1",
@@ -4877,47 +5115,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/micro-eth-signer": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/micro-eth-signer/-/micro-eth-signer-0.14.0.tgz",
-      "integrity": "sha512-5PLLzHiVYPWClEvZIXXFu5yutzpadb73rnQCpUqIHu3No3coFuWQNfE5tkBQJ7djuLYl6aRLaS0MgWJYGoqiBw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/curves": "~1.8.1",
-        "@noble/hashes": "~1.7.1",
-        "micro-packed": "~0.7.2"
-      }
-    },
-    "node_modules/micro-eth-signer/node_modules/@noble/curves": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.8.2.tgz",
-      "integrity": "sha512-vnI7V6lFNe0tLAuJMu+2sX+FcL14TaCWy1qiczg1VwRmPrpQCdq5ESXQMqUc2tluRNf6irBXrWbl1mGN8uaU/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/hashes": "1.7.2"
-      },
-      "engines": {
-        "node": "^14.21.3 || >=16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/micro-eth-signer/node_modules/@noble/hashes": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.7.2.tgz",
-      "integrity": "sha512-biZ0NUSxyjLLqo6KxEJ1b+C2NAx0wtDoFvCaXHGgUkeHzf3Xc1xKumFKREuT7f7DARNZ/slvYUwFG6B0f2b6hQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^14.21.3 || >=16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/micro-ftch": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/micro-ftch/-/micro-ftch-0.3.1.tgz",
@@ -4926,19 +5123,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/micro-packed": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/micro-packed/-/micro-packed-0.7.3.tgz",
-      "integrity": "sha512-2Milxs+WNC00TRlem41oRswvw31146GiSaoCT7s3Xi2gMUglW5QBeqlQaZeHr5tJx9nm3i57LNXPqxOOaWtTYg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@scure/base": "~1.2.5"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/micromatch": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
@@ -5092,31 +5276,6 @@
         "node": ">= 14.0.0"
       }
     },
-    "node_modules/mocha/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/mocha/node_modules/glob": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
@@ -5151,19 +5310,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/mocha/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
     "node_modules/mocha/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -5478,6 +5624,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/package-json-from-dist": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
@@ -5502,7 +5658,6 @@
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5571,7 +5726,6 @@
       "integrity": "sha512-wfRLBZ0feWRhCIkoMB6ete7czJcnNnqRpcoWQBLqatqXXmelSRqfdDK4F3u9T2s2cXas/hQJcryI/4lAL+XTlA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "create-hash": "~1.1.3",
         "create-hmac": "^1.1.7",
@@ -5590,7 +5744,6 @@
       "integrity": "sha512-snRpch/kwQhcdlnZKYanNF1m0RDlrCdSKQaH87w1FCFPVPNCQ/Il9QJKAX2jVBZddRdaHBMC+zXa9Gw9tmkNUA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cipher-base": "^1.0.1",
         "inherits": "^2.0.1",
@@ -5604,7 +5757,6 @@
       "integrity": "sha512-0TROgQ1/SxE6KmxWSvXHvRj90/Xo1JvZShofnYF+f6ZsGtR4eES7WfrQzPalmyagfKZCXpVnitiRebZulWsbiw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "inherits": "^2.0.1"
       }
@@ -5615,7 +5767,6 @@
       "integrity": "sha512-J7f4wutN8mdbV08MJnXibYpCOPHR+yzy+iQ/AsjMv2j8cLavQ8VGagDFUwwTAdF8FmRKVeNpbTTEwNHCW1g94w==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "hash-base": "^2.0.0",
         "inherits": "^2.0.1"
@@ -5626,7 +5777,8 @@
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -5658,7 +5810,6 @@
       "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -5777,17 +5928,16 @@
       }
     },
     "node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">= 14.18.0"
+      "dependencies": {
+        "picomatch": "^2.2.1"
       },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
+      "engines": {
+        "node": ">=8.10.0"
       }
     },
     "node_modules/rechoir": {
@@ -5881,7 +6031,6 @@
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5911,13 +6060,72 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/rimraf/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/rimraf/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
       "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "hash-base": "^3.0.0",
         "inherits": "^2.0.1"
@@ -5929,7 +6137,6 @@
       "integrity": "sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==",
       "dev": true,
       "license": "MPL-2.0",
-      "peer": true,
       "dependencies": {
         "bn.js": "^5.2.0"
       },
@@ -6155,8 +6362,7 @@
       "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
       "integrity": "sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/secp256k1": {
       "version": "4.0.4",
@@ -6165,7 +6371,6 @@
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "elliptic": "^6.5.7",
         "node-addon-api": "^5.0.0",
@@ -6180,8 +6385,7 @@
       "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz",
       "integrity": "sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/semver": {
       "version": "6.3.1",
@@ -6209,7 +6413,6 @@
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -6227,8 +6430,7 @@
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
       "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
@@ -6243,7 +6445,6 @@
       "integrity": "sha512-8LzC5+bvI45BjpfXU8V5fdU2mfeKiQe1D1gIMn7XUlF3OTUrpdJpPPH4EMAnF0DsHHdSZqCdSss5qCmJKuiO3w==",
       "dev": true,
       "license": "(MIT AND BSD-3-Clause)",
-      "peer": true,
       "dependencies": {
         "inherits": "^2.0.4",
         "safe-buffer": "^5.2.1",
@@ -6420,25 +6621,51 @@
       }
     },
     "node_modules/solc": {
-      "version": "0.8.26",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.26.tgz",
-      "integrity": "sha512-yiPQNVf5rBFHwN6SIf3TUUvVAFKcQqmSUFeq+fb6pNRCo0ZCgpYOZDi3BVoezCPIAcKrVYd/qXlBLUP9wVrZ9g==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.7.3.tgz",
+      "integrity": "sha512-GAsWNAjGzIDg7VxzP6mPjdurby3IkGCjQcM8GFYZT6RyaoUZKmMU6Y7YwG+tFGhv7dwZ8rmR4iwFDrrD99JwqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "command-exists": "^1.2.8",
-        "commander": "^8.1.0",
+        "commander": "3.0.2",
         "follow-redirects": "^1.12.1",
+        "fs-extra": "^0.30.0",
         "js-sha3": "0.8.0",
         "memorystream": "^0.3.1",
+        "require-from-string": "^2.0.0",
         "semver": "^5.5.0",
         "tmp": "0.0.33"
       },
       "bin": {
-        "solcjs": "solc.js"
+        "solcjs": "solcjs"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/solc/node_modules/fs-extra": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+      "integrity": "sha512-UvSPKyhMn6LEd/WpUaV9C9t3zATuqoqfWc3QdPhPLb58prN9tqYPlPWi8Krxi44loBoUzlobqZ3+8tGpxxSzwA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^2.1.0",
+        "klaw": "^1.0.0",
+        "path-is-absolute": "^1.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "node_modules/solc/node_modules/jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
+      "dev": true,
+      "license": "MIT",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
     "node_modules/solc/node_modules/semver": {
@@ -6794,7 +7021,6 @@
       "integrity": "sha512-q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "is-hex-prefixed": "1.0.0"
       },
@@ -6897,54 +7123,6 @@
         "readable-stream": "3"
       }
     },
-    "node_modules/tinyglobby": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fdir": "^6.4.4",
-        "picomatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/SuperchupuDev"
-      }
-    },
-    "node_modules/tinyglobby/node_modules/fdir": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "picomatch": "^3 || ^4"
-      },
-      "peerDependenciesMeta": {
-        "picomatch": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tinyglobby/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -6964,7 +7142,6 @@
       "integrity": "sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "isarray": "^2.0.5",
         "safe-buffer": "^5.2.1",
@@ -7096,6 +7273,20 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/tweetnacl": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
+      "dev": true,
+      "license": "Unlicense"
+    },
+    "node_modules/tweetnacl-util": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz",
+      "integrity": "sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==",
+      "dev": true,
+      "license": "Unlicense"
+    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@@ -7267,7 +7458,6 @@
       "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
@@ -7336,8 +7526,7 @@
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.10.0.tgz",
       "integrity": "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/universalify": {
       "version": "2.0.1",
@@ -7637,7 +7826,6 @@
       "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
diff --git a/packages/core/solidity/src/environments/hardhat/package.json b/packages/core/solidity/src/environments/hardhat/package.json
index 625705c98..efa56c98b 100644
--- a/packages/core/solidity/src/environments/hardhat/package.json
+++ b/packages/core/solidity/src/environments/hardhat/package.json
@@ -9,8 +9,8 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@openzeppelin/contracts": "^5.4.0",
     "@nomicfoundation/hardhat-toolbox": "^6.1.0",
-    "hardhat": "^2.16.1"
+    "@openzeppelin/contracts": "^5.5.0-rc.0",
+    "hardhat": "^2.22.0"
   }
 }
diff --git a/packages/core/solidity/src/environments/hardhat/upgradeable/package-lock.json b/packages/core/solidity/src/environments/hardhat/upgradeable/package-lock.json
index aeeddb705..11be98c33 100644
--- a/packages/core/solidity/src/environments/hardhat/upgradeable/package-lock.json
+++ b/packages/core/solidity/src/environments/hardhat/upgradeable/package-lock.json
@@ -10,10 +10,10 @@
       "license": "ISC",
       "devDependencies": {
         "@nomicfoundation/hardhat-toolbox": "^6.1.0",
-        "@openzeppelin/contracts": "^5.4.0",
-        "@openzeppelin/contracts-upgradeable": "^5.4.0",
+        "@openzeppelin/contracts": "^5.5.0-rc.0",
+        "@openzeppelin/contracts-upgradeable": "^5.5.0-rc.0",
         "@openzeppelin/hardhat-upgrades": "^3.0.0",
-        "hardhat": "^2.16.1"
+        "hardhat": "^2.22.0"
       }
     },
     "node_modules/@adraffy/ens-normalize": {
@@ -743,111 +743,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@ethereumjs/rlp": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-5.0.2.tgz",
-      "integrity": "sha512-DziebCdg4JpGlEqEdGgXmjqcFoJi+JGulUXwEjsZGAscAQ7MyD/7LE/GVCP29vEQxKc7AAwjT3A2ywHp2xfoCA==",
-      "dev": true,
-      "license": "MPL-2.0",
-      "bin": {
-        "rlp": "bin/rlp.cjs"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@ethereumjs/util": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@ethereumjs/util/-/util-9.1.0.tgz",
-      "integrity": "sha512-XBEKsYqLGXLah9PNJbgdkigthkG7TAGvlD/sH12beMXEyHDyigfcbdvHhmLyDWgDyOJn4QwiQUaF7yeuhnjdog==",
-      "dev": true,
-      "license": "MPL-2.0",
-      "dependencies": {
-        "@ethereumjs/rlp": "^5.0.2",
-        "ethereum-cryptography": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/@noble/curves": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz",
-      "integrity": "sha512-TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/hashes": "1.4.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/@noble/hashes": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz",
-      "integrity": "sha512-V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/@scure/base": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz",
-      "integrity": "sha512-8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/@scure/bip32": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz",
-      "integrity": "sha512-sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/curves": "~1.4.0",
-        "@noble/hashes": "~1.4.0",
-        "@scure/base": "~1.1.6"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/@scure/bip39": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz",
-      "integrity": "sha512-disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/hashes": "~1.4.0",
-        "@scure/base": "~1.1.6"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/@ethereumjs/util/node_modules/ethereum-cryptography": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz",
-      "integrity": "sha512-r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/curves": "1.4.2",
-        "@noble/hashes": "1.4.0",
-        "@scure/bip32": "1.4.0",
-        "@scure/bip39": "1.3.0"
-      }
-    },
     "node_modules/@ethersproject/abi": {
       "version": "5.8.0",
       "resolved": "https://registry.npmjs.org/@ethersproject/abi/-/abi-5.8.0.tgz",
@@ -1432,6 +1327,56 @@
         "@jridgewell/sourcemap-codec": "^1.4.10"
       }
     },
+    "node_modules/@metamask/eth-sig-util": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@metamask/eth-sig-util/-/eth-sig-util-4.0.1.tgz",
+      "integrity": "sha512-tghyZKLHZjcdlDqCA3gNZmLeR0XvOE9U1qoQO9ohyAZT6Pya+H9vkBPcsyXytmYLNgVoin7CKCmweo/R43V+tQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "ethereumjs-abi": "^0.6.8",
+        "ethereumjs-util": "^6.2.1",
+        "ethjs-util": "^0.1.6",
+        "tweetnacl": "^1.0.3",
+        "tweetnacl-util": "^0.15.1"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/bn.js": {
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@metamask/eth-sig-util/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
     "node_modules/@noble/ciphers": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-1.3.0.tgz",
@@ -1529,28 +1474,28 @@
       }
     },
     "node_modules/@nomicfoundation/edr": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.11.3.tgz",
-      "integrity": "sha512-kqILRkAd455Sd6v8mfP3C1/0tCOynJWY+Ir+k/9Boocu2kObCrsFgG+ZWB7fSBVdd9cPVSNrnhWS+V+PEo637g==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr/-/edr-0.3.8.tgz",
+      "integrity": "sha512-u2UJ5QpznSHVkZRh6ePWoeVb6kmPrrqh08gCnZ9FHlJV9CITqlrTQHJkacd+INH31jx88pTAJnxePE4XAiH5qg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@nomicfoundation/edr-darwin-arm64": "0.11.3",
-        "@nomicfoundation/edr-darwin-x64": "0.11.3",
-        "@nomicfoundation/edr-linux-arm64-gnu": "0.11.3",
-        "@nomicfoundation/edr-linux-arm64-musl": "0.11.3",
-        "@nomicfoundation/edr-linux-x64-gnu": "0.11.3",
-        "@nomicfoundation/edr-linux-x64-musl": "0.11.3",
-        "@nomicfoundation/edr-win32-x64-msvc": "0.11.3"
+        "@nomicfoundation/edr-darwin-arm64": "0.3.8",
+        "@nomicfoundation/edr-darwin-x64": "0.3.8",
+        "@nomicfoundation/edr-linux-arm64-gnu": "0.3.8",
+        "@nomicfoundation/edr-linux-arm64-musl": "0.3.8",
+        "@nomicfoundation/edr-linux-x64-gnu": "0.3.8",
+        "@nomicfoundation/edr-linux-x64-musl": "0.3.8",
+        "@nomicfoundation/edr-win32-x64-msvc": "0.3.8"
       },
       "engines": {
         "node": ">= 18"
       }
     },
     "node_modules/@nomicfoundation/edr-darwin-arm64": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.11.3.tgz",
-      "integrity": "sha512-w0tksbdtSxz9nuzHKsfx4c2mwaD0+l5qKL2R290QdnN9gi9AV62p9DHkOgfBdyg6/a6ZlnQqnISi7C9avk/6VA==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-arm64/-/edr-darwin-arm64-0.3.8.tgz",
+      "integrity": "sha512-eB0leCexS8sQEmfyD72cdvLj9djkBzQGP4wSQw6SNf2I4Sw4Cnzb3d45caG2FqFFjbvfqL0t+badUUIceqQuMw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1558,9 +1503,9 @@
       }
     },
     "node_modules/@nomicfoundation/edr-darwin-x64": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.11.3.tgz",
-      "integrity": "sha512-QR4jAFrPbOcrO7O2z2ESg+eUeIZPe2bPIlQYgiJ04ltbSGW27FblOzdd5+S3RoOD/dsZGKAvvy6dadBEl0NgoA==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-darwin-x64/-/edr-darwin-x64-0.3.8.tgz",
+      "integrity": "sha512-JksVCS1N5ClwVF14EvO25HCQ+Laljh/KRfHERMVAC9ZwPbTuAd/9BtKvToCBi29uCHWqsXMI4lxCApYQv2nznw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1568,9 +1513,9 @@
       }
     },
     "node_modules/@nomicfoundation/edr-linux-arm64-gnu": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.11.3.tgz",
-      "integrity": "sha512-Ktjv89RZZiUmOFPspuSBVJ61mBZQ2+HuLmV67InNlh9TSUec/iDjGIwAn59dx0bF/LOSrM7qg5od3KKac4LJDQ==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-gnu/-/edr-linux-arm64-gnu-0.3.8.tgz",
+      "integrity": "sha512-raCE+fOeNXhVBLUo87cgsHSGvYYRB6arih4eG6B9KGACWK5Veebtm9xtKeiD8YCsdUlUfat6F7ibpeNm91fpsA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1578,9 +1523,9 @@
       }
     },
     "node_modules/@nomicfoundation/edr-linux-arm64-musl": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.11.3.tgz",
-      "integrity": "sha512-B3sLJx1rL2E9pfdD4mApiwOZSrX0a/KQSBWdlq1uAhFKqkl00yZaY4LejgZndsJAa4iKGQJlGnw4HCGeVt0+jA==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-arm64-musl/-/edr-linux-arm64-musl-0.3.8.tgz",
+      "integrity": "sha512-PwiDp4wBZWMCIy29eKkv8moTKRrpiSDlrc+GQMSZLhOAm8T33JKKXPwD/2EbplbhCygJDGXZdtEKl9x9PaH66A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1588,9 +1533,9 @@
       }
     },
     "node_modules/@nomicfoundation/edr-linux-x64-gnu": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.11.3.tgz",
-      "integrity": "sha512-D/4cFKDXH6UYyKPu6J3Y8TzW11UzeQI0+wS9QcJzjlrrfKj0ENW7g9VihD1O2FvXkdkTjcCZYb6ai8MMTCsaVw==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-gnu/-/edr-linux-x64-gnu-0.3.8.tgz",
+      "integrity": "sha512-6AcvA/XKoipGap5jJmQ9Y6yT7Uf39D9lu2hBcDCXnXbMcXaDGw4mn1/L4R63D+9VGZyu1PqlcJixCUZlGGIWlg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1598,9 +1543,9 @@
       }
     },
     "node_modules/@nomicfoundation/edr-linux-x64-musl": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.11.3.tgz",
-      "integrity": "sha512-ergXuIb4nIvmf+TqyiDX5tsE49311DrBky6+jNLgsGDTBaN1GS3OFwFS8I6Ri/GGn6xOaT8sKu3q7/m+WdlFzg==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-linux-x64-musl/-/edr-linux-x64-musl-0.3.8.tgz",
+      "integrity": "sha512-cxb0sEmZjlwhYWO28sPsV64VDx31ekskhC1IsDXU1p9ntjHSJRmW4KEIqJ2O3QwJap/kLKfMS6TckvY10gjc6w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1608,15 +1553,84 @@
       }
     },
     "node_modules/@nomicfoundation/edr-win32-x64-msvc": {
-      "version": "0.11.3",
-      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.11.3.tgz",
-      "integrity": "sha512-snvEf+WB3OV0wj2A7kQ+ZQqBquMcrozSLXcdnMdEl7Tmn+KDCbmFKBt3Tk0X3qOU4RKQpLPnTxdM07TJNVtung==",
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/edr-win32-x64-msvc/-/edr-win32-x64-msvc-0.3.8.tgz",
+      "integrity": "sha512-yVuVPqRRNLZk7TbBMkKw7lzCvI8XO8fNTPTYxymGadjr9rEGRuNTU1yBXjfJ59I1jJU/X2TSkRk1OFX0P5tpZQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 18"
       }
     },
+    "node_modules/@nomicfoundation/ethereumjs-common": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-common/-/ethereumjs-common-4.0.4.tgz",
+      "integrity": "sha512-9Rgb658lcWsjiicr5GzNCjI1llow/7r0k50dLL95OJ+6iZJcVbi15r3Y0xh2cIO+zgX0WIHcbzIu6FeQf9KPrg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-util": "9.0.4"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-rlp": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-rlp/-/ethereumjs-rlp-5.0.4.tgz",
+      "integrity": "sha512-8H1S3s8F6QueOc/X92SdrA4RDenpiAEqMg5vJH99kcQaCy/a3Q6fgseo75mgWlbanGJXSlAPtnCeG9jvfTYXlw==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "bin": {
+        "rlp": "bin/rlp.cjs"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-tx": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-tx/-/ethereumjs-tx-5.0.4.tgz",
+      "integrity": "sha512-Xjv8wAKJGMrP1f0n2PeyfFCCojHd7iS3s/Ab7qzF1S64kxZ8Z22LCMynArYsVqiFx6rzYy548HNVEyI+AYN/kw==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-common": "4.0.4",
+        "@nomicfoundation/ethereumjs-rlp": "5.0.4",
+        "@nomicfoundation/ethereumjs-util": "9.0.4",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "c-kzg": "^2.1.2"
+      },
+      "peerDependenciesMeta": {
+        "c-kzg": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@nomicfoundation/ethereumjs-util": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@nomicfoundation/ethereumjs-util/-/ethereumjs-util-9.0.4.tgz",
+      "integrity": "sha512-sLOzjnSrlx9Bb9EFNtHzK/FJFsfg2re6bsGqinFinH1gCqVfz9YYlXiMWwDM4C/L4ywuHFCYwfKTVr/QHQcU0Q==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "@nomicfoundation/ethereumjs-rlp": "5.0.4",
+        "ethereum-cryptography": "0.1.3"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "c-kzg": "^2.1.2"
+      },
+      "peerDependenciesMeta": {
+        "c-kzg": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@nomicfoundation/hardhat-chai-matchers": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/@nomicfoundation/hardhat-chai-matchers/-/hardhat-chai-matchers-2.1.0.tgz",
@@ -1924,20 +1938,20 @@
       }
     },
     "node_modules/@openzeppelin/contracts": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.4.0.tgz",
-      "integrity": "sha512-eCYgWnLg6WO+X52I16TZt8uEjbtdkgLC0SUX/xnAksjjrQI4Xfn4iBRoI5j55dmlOhDv1Y7BoR3cU7e3WWhC6A==",
+      "version": "5.5.0-rc.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.5.0-rc.0.tgz",
+      "integrity": "sha512-bhJiU4PC3suR1bJ4xkhkAlIZsyAjYr0q3VRgh6tfi8uDpy/NTNpwDeTI+qlGnyXrrnqT04/Qjui6IDHNmAT4wA==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@openzeppelin/contracts-upgradeable": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.4.0.tgz",
-      "integrity": "sha512-STJKyDzUcYuB35Zub1JpWW58JxvrFFVgQ+Ykdr8A9PGXgtq/obF5uoh07k2XmFyPxfnZdPdBdhkJ/n2YxJ87HQ==",
+      "version": "5.5.0-rc.0",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.5.0-rc.0.tgz",
+      "integrity": "sha512-WJBXTtwBiKuqs2Gwm5g3PLRxlkqVKRVCQmeCG6kBwyhh41w3clQbyj23PiqurWBjzcU123bi+EzbWRM4ro/5UA==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "@openzeppelin/contracts": "5.4.0"
+        "@openzeppelin/contracts": "5.5.0-rc.0"
       }
     },
     "node_modules/@openzeppelin/defender-sdk-base-client": {
@@ -2072,6 +2086,7 @@
       "integrity": "sha512-g/nm5FgUa//MCj1gV09zTJTaM6KBAHqLN907YVQqf7zC49+DcO4B1so4ZX07Ef10Twr6nuqYEH9GEggFXA4Fmg==",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "funding": {
         "url": "https://paulmillr.com/funding/"
       }
@@ -3134,6 +3149,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/@types/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/minimatch": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
@@ -3963,19 +3985,28 @@
       }
     },
     "node_modules/chokidar": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
-      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "readdirp": "^4.0.1"
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
       },
       "engines": {
-        "node": ">= 14.16.0"
+        "node": ">= 8.10.0"
       },
       "funding": {
         "url": "https://paulmillr.com/funding/"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
       }
     },
     "node_modules/ci-info": {
@@ -4233,14 +4264,11 @@
       }
     },
     "node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
+      "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">= 12"
-      }
+      "license": "MIT"
     },
     "node_modules/compare-versions": {
       "version": "6.1.1",
@@ -4254,8 +4282,7 @@
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
       "dev": true,
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/cookie": {
       "version": "0.4.2",
@@ -4735,6 +4762,51 @@
         "setimmediate": "^1.0.5"
       }
     },
+    "node_modules/ethereumjs-abi": {
+      "version": "0.6.8",
+      "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.8.tgz",
+      "integrity": "sha512-Tx0r/iXI6r+lRsdvkFDlut0N08jWMnKRZ6Gkq+Nmw75lZe4e6o3EkSnkaBP5NF6+m5PTGAr9JP43N3LyeoglsA==",
+      "deprecated": "This library has been deprecated and usage is discouraged.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.11.8",
+        "ethereumjs-util": "^6.0.0"
+      }
+    },
+    "node_modules/ethereumjs-abi/node_modules/@types/bn.js": {
+      "version": "4.11.6",
+      "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
+      "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/ethereumjs-abi/node_modules/bn.js": {
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.2.tgz",
+      "integrity": "sha512-n4DSx829VRTRByMRGdjQ9iqsN0Bh4OolPsFnaZBLcbi8iXcB+kJ9s7EnRt4wILZNV3kPLHkRVfOc/HvhC3ovDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ethereumjs-abi/node_modules/ethereumjs-util": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
+      "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "@types/bn.js": "^4.11.3",
+        "bn.js": "^4.11.0",
+        "create-hash": "^1.1.2",
+        "elliptic": "^6.5.2",
+        "ethereum-cryptography": "^0.1.3",
+        "ethjs-util": "0.1.6",
+        "rlp": "^2.2.3"
+      }
+    },
     "node_modules/ethereumjs-util": {
       "version": "7.1.5",
       "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz",
@@ -4833,6 +4905,21 @@
       "license": "MIT",
       "peer": true
     },
+    "node_modules/ethjs-util": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
+      "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-hex-prefixed": "1.0.0",
+        "strip-hex-prefix": "1.0.0"
+      },
+      "engines": {
+        "node": ">=6.5.0",
+        "npm": ">=3"
+      }
+    },
     "node_modules/eventemitter3": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
@@ -5486,47 +5573,51 @@
       }
     },
     "node_modules/hardhat": {
-      "version": "2.26.3",
-      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.26.3.tgz",
-      "integrity": "sha512-gBfjbxCCEaRgMCRgTpjo1CEoJwqNPhyGMMVHYZJxoQ3LLftp2erSVf8ZF6hTQC0r2wst4NcqNmLWqMnHg1quTw==",
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.22.0.tgz",
+      "integrity": "sha512-t1J+ThxNYANL6ub6yM5XC84RY38vhfG7ODBtVRNQFQozdALo3qZUjxDzyGQU0U0eswe6orK49hq9UpdB7nPXNQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@ethereumjs/util": "^9.1.0",
         "@ethersproject/abi": "^5.1.2",
-        "@nomicfoundation/edr": "^0.11.3",
+        "@metamask/eth-sig-util": "^4.0.0",
+        "@nomicfoundation/edr": "^0.3.0",
+        "@nomicfoundation/ethereumjs-common": "4.0.4",
+        "@nomicfoundation/ethereumjs-tx": "5.0.4",
+        "@nomicfoundation/ethereumjs-util": "9.0.4",
         "@nomicfoundation/solidity-analyzer": "^0.1.0",
         "@sentry/node": "^5.18.1",
+        "@types/bn.js": "^5.1.0",
+        "@types/lru-cache": "^5.1.0",
         "adm-zip": "^0.4.16",
         "aggregate-error": "^3.0.0",
         "ansi-escapes": "^4.3.0",
         "boxen": "^5.1.2",
-        "chokidar": "^4.0.0",
+        "chalk": "^2.4.2",
+        "chokidar": "^3.4.0",
         "ci-info": "^2.0.0",
         "debug": "^4.1.1",
         "enquirer": "^2.3.0",
         "env-paths": "^2.2.0",
         "ethereum-cryptography": "^1.0.3",
-        "find-up": "^5.0.0",
+        "ethereumjs-abi": "^0.6.8",
+        "find-up": "^2.1.0",
         "fp-ts": "1.19.3",
         "fs-extra": "^7.0.1",
+        "glob": "7.2.0",
         "immutable": "^4.0.0-rc.12",
         "io-ts": "1.10.4",
-        "json-stream-stringify": "^3.1.4",
         "keccak": "^3.0.2",
         "lodash": "^4.17.11",
-        "micro-eth-signer": "^0.14.0",
         "mnemonist": "^0.38.0",
         "mocha": "^10.0.0",
         "p-map": "^4.0.0",
-        "picocolors": "^1.1.0",
         "raw-body": "^2.4.1",
         "resolve": "1.17.0",
         "semver": "^6.3.0",
-        "solc": "0.8.26",
+        "solc": "0.7.3",
         "source-map-support": "^0.5.13",
         "stacktrace-parser": "^0.1.10",
-        "tinyglobby": "^0.2.6",
         "tsort": "0.0.1",
         "undici": "^5.14.0",
         "uuid": "^8.3.2",
@@ -5718,27 +5809,106 @@
         "@scure/base": "~1.1.0"
       }
     },
-    "node_modules/hardhat/node_modules/ethereum-cryptography": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz",
-      "integrity": "sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw==",
+    "node_modules/hardhat/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@noble/hashes": "1.2.0",
-        "@noble/secp256k1": "1.7.1",
-        "@scure/bip32": "1.1.5",
-        "@scure/bip39": "1.1.1"
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/hardhat/node_modules/fs-extra": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+    "node_modules/hardhat/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.1.2",
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/hardhat/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/hardhat/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/hardhat/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/hardhat/node_modules/ethereum-cryptography": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz",
+      "integrity": "sha512-6yFQC9b5ug6/17CQpCyE3k9eKBMdhyVjzUy1WkiuY/E4vj/SXDBbCw8QEIaXqf0Mf2SnY6RmpDcwlUmBSS0EJw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@noble/hashes": "1.2.0",
+        "@noble/secp256k1": "1.7.1",
+        "@scure/bip32": "1.1.5",
+        "@scure/bip39": "1.1.1"
+      }
+    },
+    "node_modules/hardhat/node_modules/find-up": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+      "integrity": "sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/fs-extra": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+      "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
         "jsonfile": "^4.0.0",
         "universalify": "^0.1.0"
       },
@@ -5746,6 +5916,38 @@
         "node": ">=6 <7 || >=8"
       }
     },
+    "node_modules/hardhat/node_modules/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/hardhat/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/hardhat/node_modules/jsonfile": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -5756,6 +5958,82 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/hardhat/node_modules/locate-path": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+      "integrity": "sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^2.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/hardhat/node_modules/p-limit": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+      "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/p-locate": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+      "integrity": "sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/hardhat/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/hardhat/node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -6137,7 +6415,6 @@
       "integrity": "sha512-WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=6.5.0",
         "npm": ">=3"
@@ -6287,16 +6564,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/json-stream-stringify": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/json-stream-stringify/-/json-stream-stringify-3.1.6.tgz",
-      "integrity": "sha512-x7fpwxOkbhFCaJDJ8vb1fBY3DdSa4AlITaz+HHILQJzdPMnHEFjxPwVUi1ALIbcIxDE0PNe/0i7frnY8QnBQog==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=7.10.1"
-      }
-    },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -6371,6 +6638,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==",
+      "dev": true,
+      "license": "MIT",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -6561,47 +6838,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/micro-eth-signer": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/micro-eth-signer/-/micro-eth-signer-0.14.0.tgz",
-      "integrity": "sha512-5PLLzHiVYPWClEvZIXXFu5yutzpadb73rnQCpUqIHu3No3coFuWQNfE5tkBQJ7djuLYl6aRLaS0MgWJYGoqiBw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/curves": "~1.8.1",
-        "@noble/hashes": "~1.7.1",
-        "micro-packed": "~0.7.2"
-      }
-    },
-    "node_modules/micro-eth-signer/node_modules/@noble/curves": {
-      "version": "1.8.2",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.8.2.tgz",
-      "integrity": "sha512-vnI7V6lFNe0tLAuJMu+2sX+FcL14TaCWy1qiczg1VwRmPrpQCdq5ESXQMqUc2tluRNf6irBXrWbl1mGN8uaU/g==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@noble/hashes": "1.7.2"
-      },
-      "engines": {
-        "node": "^14.21.3 || >=16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/micro-eth-signer/node_modules/@noble/hashes": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.7.2.tgz",
-      "integrity": "sha512-biZ0NUSxyjLLqo6KxEJ1b+C2NAx0wtDoFvCaXHGgUkeHzf3Xc1xKumFKREuT7f7DARNZ/slvYUwFG6B0f2b6hQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^14.21.3 || >=16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/micro-ftch": {
       "version": "0.3.1",
       "resolved": "https://registry.npmjs.org/micro-ftch/-/micro-ftch-0.3.1.tgz",
@@ -6610,19 +6846,6 @@
       "license": "MIT",
       "peer": true
     },
-    "node_modules/micro-packed": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/micro-packed/-/micro-packed-0.7.3.tgz",
-      "integrity": "sha512-2Milxs+WNC00TRlem41oRswvw31146GiSaoCT7s3Xi2gMUglW5QBeqlQaZeHr5tJx9nm3i57LNXPqxOOaWtTYg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@scure/base": "~1.2.5"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
     "node_modules/micromatch": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
@@ -6772,31 +6995,6 @@
         "node": ">= 14.0.0"
       }
     },
-    "node_modules/mocha/node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
     "node_modules/mocha/node_modules/glob": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
@@ -6831,19 +7029,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/mocha/node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
     "node_modules/mocha/node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -7178,6 +7363,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/p-try": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+      "integrity": "sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/package-json-from-dist": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
@@ -7202,7 +7397,6 @@
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7322,7 +7516,8 @@
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "dev": true,
-      "license": "ISC"
+      "license": "ISC",
+      "peer": true
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -7500,17 +7695,16 @@
       }
     },
     "node_modules/readdirp": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
-      "integrity": "sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">= 14.18.0"
+      "dependencies": {
+        "picomatch": "^2.2.1"
       },
-      "funding": {
-        "type": "individual",
-        "url": "https://paulmillr.com/funding/"
+      "engines": {
+        "node": ">=8.10.0"
       }
     },
     "node_modules/rechoir": {
@@ -7604,7 +7798,6 @@
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -7644,6 +7837,66 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/rimraf/node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/rimraf/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rimraf/node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/ripemd160": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
@@ -8145,25 +8398,51 @@
       }
     },
     "node_modules/solc": {
-      "version": "0.8.26",
-      "resolved": "https://registry.npmjs.org/solc/-/solc-0.8.26.tgz",
-      "integrity": "sha512-yiPQNVf5rBFHwN6SIf3TUUvVAFKcQqmSUFeq+fb6pNRCo0ZCgpYOZDi3BVoezCPIAcKrVYd/qXlBLUP9wVrZ9g==",
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/solc/-/solc-0.7.3.tgz",
+      "integrity": "sha512-GAsWNAjGzIDg7VxzP6mPjdurby3IkGCjQcM8GFYZT6RyaoUZKmMU6Y7YwG+tFGhv7dwZ8rmR4iwFDrrD99JwqA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "command-exists": "^1.2.8",
-        "commander": "^8.1.0",
+        "commander": "3.0.2",
         "follow-redirects": "^1.12.1",
+        "fs-extra": "^0.30.0",
         "js-sha3": "0.8.0",
         "memorystream": "^0.3.1",
+        "require-from-string": "^2.0.0",
         "semver": "^5.5.0",
         "tmp": "0.0.33"
       },
       "bin": {
-        "solcjs": "solc.js"
+        "solcjs": "solcjs"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/solc/node_modules/fs-extra": {
+      "version": "0.30.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
+      "integrity": "sha512-UvSPKyhMn6LEd/WpUaV9C9t3zATuqoqfWc3QdPhPLb58prN9tqYPlPWi8Krxi44loBoUzlobqZ3+8tGpxxSzwA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^2.1.0",
+        "klaw": "^1.0.0",
+        "path-is-absolute": "^1.0.0",
+        "rimraf": "^2.2.8"
+      }
+    },
+    "node_modules/solc/node_modules/jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==",
+      "dev": true,
+      "license": "MIT",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
     "node_modules/solc/node_modules/semver": {
@@ -8526,7 +8805,6 @@
       "integrity": "sha512-q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "is-hex-prefixed": "1.0.0"
       },
@@ -8642,54 +8920,6 @@
         "readable-stream": "3"
       }
     },
-    "node_modules/tinyglobby": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "fdir": "^6.4.4",
-        "picomatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/SuperchupuDev"
-      }
-    },
-    "node_modules/tinyglobby/node_modules/fdir": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
-      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "picomatch": "^3 || ^4"
-      },
-      "peerDependenciesMeta": {
-        "picomatch": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tinyglobby/node_modules/picomatch": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
     "node_modules/tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
@@ -8853,6 +9083,20 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/tweetnacl": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
+      "integrity": "sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==",
+      "dev": true,
+      "license": "Unlicense"
+    },
+    "node_modules/tweetnacl-util": {
+      "version": "0.15.1",
+      "resolved": "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz",
+      "integrity": "sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw==",
+      "dev": true,
+      "license": "Unlicense"
+    },
     "node_modules/type-check": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
diff --git a/packages/core/solidity/src/environments/hardhat/upgradeable/package.json b/packages/core/solidity/src/environments/hardhat/upgradeable/package.json
index 4da184ef9..de95c8ac1 100644
--- a/packages/core/solidity/src/environments/hardhat/upgradeable/package.json
+++ b/packages/core/solidity/src/environments/hardhat/upgradeable/package.json
@@ -9,10 +9,10 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@openzeppelin/contracts": "^5.4.0",
-    "@openzeppelin/contracts-upgradeable": "^5.4.0",
-    "@openzeppelin/hardhat-upgrades": "^3.0.0",
     "@nomicfoundation/hardhat-toolbox": "^6.1.0",
-    "hardhat": "^2.16.1"
+    "@openzeppelin/contracts": "^5.5.0-rc.0",
+    "@openzeppelin/contracts-upgradeable": "^5.5.0-rc.0",
+    "@openzeppelin/hardhat-upgrades": "^3.0.0",
+    "hardhat": "^2.22.0"
   }
 }
diff --git a/packages/core/solidity/src/erc1155.test.ts.md b/packages/core/solidity/src/erc1155.test.ts.md
index 470826aa4..21603a59c 100644
--- a/packages/core/solidity/src/erc1155.test.ts.md
+++ b/packages/core/solidity/src/erc1155.test.ts.md
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
@@ -32,7 +32,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
@@ -55,7 +55,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -92,7 +92,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -115,7 +115,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
@@ -132,7 +132,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
@@ -156,7 +156,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
@@ -197,7 +197,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
@@ -234,7 +234,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -287,7 +287,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -324,7 +324,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
@@ -357,21 +357,21 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
     import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessControlUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
     ␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -441,15 +441,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
     import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
     import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessControlUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable, UUPSUpgradeable {␊
         bytes32 public constant URI_SETTER_ROLE = keccak256("URI_SETTER_ROLE");␊
@@ -457,7 +457,7 @@ Generated by [AVA](https://avajs.dev).
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
         bytes32 public constant UPGRADER_ROLE = keccak256("UPGRADER_ROLE");␊
     ␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -470,7 +470,6 @@ Generated by [AVA](https://avajs.dev).
             __AccessControl_init();␊
             __ERC1155Pausable_init();␊
             __ERC1155Burnable_init();␊
-            __UUPSUpgradeable_init();␊
     ␊
             _grantRole(DEFAULT_ADMIN_ROLE, defaultAdmin);␊
             _grantRole(PAUSER_ROLE, pauser);␊
@@ -535,18 +534,18 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
     import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
     import {ERC1155BurnableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155BurnableUpgradeable.sol";␊
     import {ERC1155PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155PausableUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC1155Upgradeable, AccessManagedUpgradeable, ERC1155PausableUpgradeable, ERC1155BurnableUpgradeable, UUPSUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -556,7 +555,6 @@ Generated by [AVA](https://avajs.dev).
             __AccessManaged_init(initialAuthority);␊
             __ERC1155Pausable_init();␊
             __ERC1155Burnable_init();␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function setURI(string memory newuri) public restricted {␊
diff --git a/packages/core/solidity/src/erc1155.test.ts.snap b/packages/core/solidity/src/erc1155.test.ts.snap
index a7faff1b1..8fc337553 100644
Binary files a/packages/core/solidity/src/erc1155.test.ts.snap and b/packages/core/solidity/src/erc1155.test.ts.snap differ
diff --git a/packages/core/solidity/src/erc20.test.ts.md b/packages/core/solidity/src/erc20.test.ts.md
index e422ee059..ca7efd98e 100644
--- a/packages/core/solidity/src/erc20.test.ts.md
+++ b/packages/core/solidity/src/erc20.test.ts.md
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -25,7 +25,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -41,7 +41,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -58,7 +58,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -97,7 +97,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -140,7 +140,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -179,7 +179,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -219,7 +219,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -240,7 +240,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -256,7 +256,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -277,7 +277,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -298,7 +298,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -319,7 +319,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -344,7 +344,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -373,7 +373,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊
@@ -390,7 +390,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -406,7 +406,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -442,7 +442,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -478,7 +478,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -523,7 +523,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -540,7 +540,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -570,7 +570,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -602,7 +602,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -639,7 +639,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -681,7 +681,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -711,7 +711,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -740,7 +740,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -774,7 +774,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -820,7 +820,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -854,19 +854,19 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20PermitUpgradeable {␊
         address public tokenBridge;␊
         error Unauthorized();␊
     ␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -891,19 +891,19 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
     import {ERC20BridgeableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-ERC20BridgeableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20PermitUpgradeable {␊
         address internal constant SUPERCHAIN_TOKEN_BRIDGE = 0x4200000000000000000000000000000000000028;␊
         error Unauthorized();␊
     ␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -930,7 +930,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -951,7 +951,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -984,7 +984,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -1020,7 +1020,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
@@ -1032,9 +1032,9 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, AccessControlUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
         bytes32 public constant TOKEN_BRIDGE_ROLE = keccak256("TOKEN_BRIDGE_ROLE");␊
@@ -1043,7 +1043,7 @@ Generated by [AVA](https://avajs.dev).
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
         bytes32 public constant UPGRADER_ROLE = keccak256("UPGRADER_ROLE");␊
     ␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -1061,7 +1061,6 @@ Generated by [AVA](https://avajs.dev).
             __ERC20Permit_init("MyToken");␊
             __ERC20Votes_init();␊
             __ERC20FlashMint_init();␊
-            __UUPSUpgradeable_init();␊
     ␊
             _grantRole(DEFAULT_ADMIN_ROLE, defaultAdmin);␊
             _grantRole(TOKEN_BRIDGE_ROLE, tokenBridge);␊
@@ -1129,7 +1128,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
@@ -1140,14 +1139,14 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
     ␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -1217,7 +1216,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
@@ -1228,16 +1227,16 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessControlUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
         bytes32 public constant PAUSER_ROLE = keccak256("PAUSER_ROLE");␊
         bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");␊
         bytes32 public constant UPGRADER_ROLE = keccak256("UPGRADER_ROLE");␊
     ␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -1254,7 +1253,6 @@ Generated by [AVA](https://avajs.dev).
             __ERC20Permit_init("MyToken");␊
             __ERC20Votes_init();␊
             __ERC20FlashMint_init();␊
-            __UUPSUpgradeable_init();␊
     ␊
             _mint(recipient, 2000 * 10 ** decimals());␊
             _grantRole(DEFAULT_ADMIN_ROLE, defaultAdmin);␊
@@ -1315,7 +1313,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
@@ -1326,12 +1324,12 @@ Generated by [AVA](https://avajs.dev).
     import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
     import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
     import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC20Upgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, AccessManagedUpgradeable, ERC1363Upgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -1348,7 +1346,6 @@ Generated by [AVA](https://avajs.dev).
             __ERC20Permit_init("MyToken");␊
             __ERC20Votes_init();␊
             __ERC20FlashMint_init();␊
-            __UUPSUpgradeable_init();␊
     ␊
             _mint(recipient, 2000 * 10 ** decimals());␊
         }␊
diff --git a/packages/core/solidity/src/erc20.test.ts.snap b/packages/core/solidity/src/erc20.test.ts.snap
index c78c752bc..4b27a4bfd 100644
Binary files a/packages/core/solidity/src/erc20.test.ts.snap and b/packages/core/solidity/src/erc20.test.ts.snap differ
diff --git a/packages/core/solidity/src/erc721.test.ts.md b/packages/core/solidity/src/erc721.test.ts.md
index 5cbc3f8d9..4dc9462b0 100644
--- a/packages/core/solidity/src/erc721.test.ts.md
+++ b/packages/core/solidity/src/erc721.test.ts.md
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -24,7 +24,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -39,7 +39,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -58,7 +58,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -100,7 +100,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -136,7 +136,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -184,7 +184,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -237,7 +237,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -253,7 +253,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -290,7 +290,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -328,7 +328,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -351,7 +351,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -387,7 +387,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -410,7 +410,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";␊
@@ -437,7 +437,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
@@ -471,7 +471,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
@@ -505,7 +505,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {EIP712} from "@openzeppelin/contracts/utils/cryptography/EIP712.sol";␊
@@ -548,7 +548,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
@@ -557,11 +557,11 @@ Generated by [AVA](https://avajs.dev).
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -621,7 +621,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {EIP712Upgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol";␊
@@ -630,12 +630,12 @@ Generated by [AVA](https://avajs.dev).
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, OwnableUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -648,7 +648,6 @@ Generated by [AVA](https://avajs.dev).
             __ERC721Burnable_init();␊
             __EIP712_init("MyToken", "1");␊
             __ERC721Votes_init();␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function pause() public onlyOwner {␊
@@ -702,7 +701,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
@@ -712,11 +711,11 @@ Generated by [AVA](https://avajs.dev).
     import {ERC721EnumerableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";␊
     import {ERC721PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721PausableUpgradeable.sol";␊
     import {ERC721VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721VotesUpgradeable.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyToken is Initializable, ERC721Upgradeable, ERC721EnumerableUpgradeable, ERC721PausableUpgradeable, AccessManagedUpgradeable, ERC721BurnableUpgradeable, EIP712Upgradeable, ERC721VotesUpgradeable, UUPSUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -729,7 +728,6 @@ Generated by [AVA](https://avajs.dev).
             __ERC721Burnable_init();␊
             __EIP712_init("MyToken", "1");␊
             __ERC721Votes_init();␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function pause() public restricted {␊
diff --git a/packages/core/solidity/src/erc721.test.ts.snap b/packages/core/solidity/src/erc721.test.ts.snap
index a2ed828ab..7d9f91d00 100644
Binary files a/packages/core/solidity/src/erc721.test.ts.snap and b/packages/core/solidity/src/erc721.test.ts.snap differ
diff --git a/packages/core/solidity/src/generate/account.ts b/packages/core/solidity/src/generate/account.ts
index 685e23bb8..b1d082543 100644
--- a/packages/core/solidity/src/generate/account.ts
+++ b/packages/core/solidity/src/generate/account.ts
@@ -8,7 +8,7 @@ const account = {
   signatureValidation: [false, 'ERC1271', 'ERC7739'] as const,
   ERC721Holder: [false, true] as const,
   ERC1155Holder: [false, true] as const,
-  signer: ['ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const,
+  signer: ['ECDSA', 'EIP7702', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const,
   batchedExecution: [false, true] as const,
   ERC7579Modules: [false, 'AccountERC7579', 'AccountERC7579Hooked'] as const,
   access: [false] as const,
diff --git a/packages/core/solidity/src/get-imports.test.ts b/packages/core/solidity/src/get-imports.test.ts
index d6f1509bb..53a694e91 100644
--- a/packages/core/solidity/src/get-imports.test.ts
+++ b/packages/core/solidity/src/get-imports.test.ts
@@ -38,6 +38,7 @@ test('erc721 auto increment', t => {
     '@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol',
     '@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol',
     '@openzeppelin/contracts/token/ERC721/utils/ERC721Utils.sol',
+    '@openzeppelin/contracts/utils/Bytes.sol',
     '@openzeppelin/contracts/utils/Context.sol',
     '@openzeppelin/contracts/utils/Panic.sol',
     '@openzeppelin/contracts/utils/Strings.sol',
@@ -62,8 +63,6 @@ test('erc721 auto increment uups', t => {
 
   t.deepEqual(files, [
     '@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol',
-    '@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol',
-    '@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol',
     '@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol',
     '@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol',
     '@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol',
@@ -72,12 +71,16 @@ test('erc721 auto increment uups', t => {
     '@openzeppelin/contracts/interfaces/draft-IERC6093.sol',
     '@openzeppelin/contracts/proxy/ERC1967/ERC1967Utils.sol',
     '@openzeppelin/contracts/proxy/beacon/IBeacon.sol',
+    '@openzeppelin/contracts/proxy/utils/Initializable.sol',
+    '@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol',
     '@openzeppelin/contracts/token/ERC721/IERC721.sol',
     '@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol',
     '@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol',
     '@openzeppelin/contracts/token/ERC721/utils/ERC721Utils.sol',
     '@openzeppelin/contracts/utils/Address.sol',
+    '@openzeppelin/contracts/utils/Bytes.sol',
     '@openzeppelin/contracts/utils/Errors.sol',
+    '@openzeppelin/contracts/utils/LowLevelCall.sol',
     '@openzeppelin/contracts/utils/Panic.sol',
     '@openzeppelin/contracts/utils/StorageSlot.sol',
     '@openzeppelin/contracts/utils/Strings.sol',
diff --git a/packages/core/solidity/src/governor.test.ts.md b/packages/core/solidity/src/governor.test.ts.md
index 8ab51e516..f47dede64 100644
--- a/packages/core/solidity/src/governor.test.ts.md
+++ b/packages/core/solidity/src/governor.test.ts.md
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -99,7 +99,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -185,7 +185,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -277,7 +277,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -369,7 +369,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -458,7 +458,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -553,7 +553,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -639,7 +639,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -725,7 +725,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -817,7 +817,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -906,7 +906,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -992,7 +992,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -1082,7 +1082,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -1168,7 +1168,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -1254,7 +1254,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -1343,7 +1343,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -1429,7 +1429,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -1518,7 +1518,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {Governor} from "@openzeppelin/contracts/governance/Governor.sol";␊
@@ -1604,7 +1604,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {GovernorUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/GovernorUpgradeable.sol";␊
@@ -1613,12 +1613,12 @@ Generated by [AVA](https://avajs.dev).
     import {GovernorVotesUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesUpgradeable.sol";␊
     import {GovernorVotesQuorumFractionUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/extensions/GovernorVotesQuorumFractionUpgradeable.sol";␊
     import {IVotes} from "@openzeppelin/contracts/governance/utils/IVotes.sol";␊
-    import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+    import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
     import {TimelockControllerUpgradeable} from "@openzeppelin/contracts-upgradeable/governance/TimelockControllerUpgradeable.sol";␊
-    import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+    import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
     ␊
     contract MyGovernor is Initializable, GovernorUpgradeable, GovernorCountingSimpleUpgradeable, GovernorVotesUpgradeable, GovernorVotesQuorumFractionUpgradeable, GovernorTimelockControlUpgradeable, UUPSUpgradeable {␊
-        /// @custom:oz-upgrades-unsafe-allow constructor␊
+        /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
         constructor() {␊
             _disableInitializers();␊
         }␊
@@ -1632,7 +1632,6 @@ Generated by [AVA](https://avajs.dev).
             __GovernorVotes_init(_token);␊
             __GovernorVotesQuorumFraction_init(4);␊
             __GovernorTimelockControl_init(_timelock);␊
-            __UUPSUpgradeable_init();␊
         }␊
     ␊
         function votingDelay() public pure override returns (uint256) {␊
diff --git a/packages/core/solidity/src/governor.test.ts.snap b/packages/core/solidity/src/governor.test.ts.snap
index 6eca252ca..8c6cb71b3 100644
Binary files a/packages/core/solidity/src/governor.test.ts.snap and b/packages/core/solidity/src/governor.test.ts.snap differ
diff --git a/packages/core/solidity/src/set-upgradeable.ts b/packages/core/solidity/src/set-upgradeable.ts
index 723dbe77f..b95fd6111 100644
--- a/packages/core/solidity/src/set-upgradeable.ts
+++ b/packages/core/solidity/src/set-upgradeable.ts
@@ -21,6 +21,7 @@ function setUpgradeableBase(
   c.addParent({
     name: 'Initializable',
     path: '@openzeppelin/contracts/proxy/utils/Initializable.sol',
+    transpiled: false,
   });
 
   switch (upgradeable) {
@@ -32,6 +33,7 @@ function setUpgradeableBase(
       const UUPSUpgradeable = {
         name: 'UUPSUpgradeable',
         path: '@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol',
+        transpiled: false,
       };
       c.addParent(UUPSUpgradeable);
       c.addOverride(UUPSUpgradeable, functions._authorizeUpgrade);
diff --git a/packages/core/solidity/src/signer.ts b/packages/core/solidity/src/signer.ts
index a9a156930..7d91f60cf 100644
--- a/packages/core/solidity/src/signer.ts
+++ b/packages/core/solidity/src/signer.ts
@@ -3,7 +3,7 @@ import { OptionsError } from './error';
 import type { Upgradeable } from './set-upgradeable';
 import { defineFunctions } from './utils/define-functions';
 
-export const SignerOptions = [false, 'ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const;
+export const SignerOptions = [false, 'ECDSA', 'EIP7702', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const;
 export type SignerOptions = (typeof SignerOptions)[number];
 
 export function addSigner(c: ContractBuilder, signer: SignerOptions, upgradeable: Upgradeable): void {
@@ -13,11 +13,11 @@ export function addSigner(c: ContractBuilder, signer: SignerOptions, upgradeable
   c.addOverride({ name: signerName }, signerFunctions._rawSignatureValidation);
 
   switch (signer) {
-    case 'ERC7702':
+    case 'EIP7702':
       c.addParent(signers[signer]);
       if (upgradeable) {
         throw new OptionsError({
-          erc7702: 'EOAs can upgrade by redelegating to a new account',
+          eip7702: 'EOAs can upgrade by redelegating to a new account',
           upgradeable: 'EOAs can upgrade by redelegating to a new account',
         });
       }
@@ -38,14 +38,14 @@ export function addSigner(c: ContractBuilder, signer: SignerOptions, upgradeable
 }
 
 export const signers = {
-  ERC7702: {
-    name: 'SignerERC7702',
-    path: '@openzeppelin/contracts/utils/cryptography/signers/SignerERC7702.sol',
-  },
   ECDSA: {
     name: 'SignerECDSA',
     path: '@openzeppelin/contracts/utils/cryptography/signers/SignerECDSA.sol',
   },
+  EIP7702: {
+    name: 'SignerEIP7702',
+    path: '@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol',
+  },
   P256: {
     name: 'SignerP256',
     path: '@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol',
@@ -64,7 +64,7 @@ export const signers = {
   },
 };
 
-export const signerArgs: Record<Exclude<SignerOptions, false | 'ERC7702'>, { name: string; type: string }[]> = {
+export const signerArgs: Record<Exclude<SignerOptions, false | 'EIP7702'>, { name: string; type: string }[]> = {
   ECDSA: [{ name: 'signer', type: 'address' }],
   P256: [
     { name: 'qx', type: 'bytes32' },
diff --git a/packages/core/solidity/src/stablecoin.test.ts.md b/packages/core/solidity/src/stablecoin.test.ts.md
index e19309035..0f98979f1 100644
--- a/packages/core/solidity/src/stablecoin.test.ts.md
+++ b/packages/core/solidity/src/stablecoin.test.ts.md
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -25,7 +25,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -42,7 +42,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -81,7 +81,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -124,7 +124,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessManaged} from "@openzeppelin/contracts/access/manager/AccessManaged.sol";␊
@@ -163,7 +163,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -203,7 +203,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -224,7 +224,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -240,7 +240,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -265,7 +265,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -294,7 +294,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC1363} from "@openzeppelin/contracts/token/ERC20/extensions/ERC1363.sol";␊
@@ -311,7 +311,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -327,7 +327,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 269f9b5␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0 and Community Contracts commit 269f9b5␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -362,7 +362,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 269f9b5␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0 and Community Contracts commit 269f9b5␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -408,7 +408,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 269f9b5␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0 and Community Contracts commit 269f9b5␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -454,7 +454,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -490,7 +490,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -526,7 +526,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -571,7 +571,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
     pragma solidity ^0.8.27;␊
     ␊
     import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";␊
@@ -588,7 +588,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Contracts ^5.4.0 and Community Contracts commit 269f9b5␊
+    // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0 and Community Contracts commit 269f9b5␊
     pragma solidity ^0.8.27;␊
     ␊
     import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
diff --git a/packages/core/solidity/src/stablecoin.test.ts.snap b/packages/core/solidity/src/stablecoin.test.ts.snap
index f95c85798..989508abd 100644
Binary files a/packages/core/solidity/src/stablecoin.test.ts.snap and b/packages/core/solidity/src/stablecoin.test.ts.snap differ
diff --git a/packages/core/solidity/src/utils/version.ts b/packages/core/solidity/src/utils/version.ts
index 10ab4ab89..0fbf8ad76 100644
--- a/packages/core/solidity/src/utils/version.ts
+++ b/packages/core/solidity/src/utils/version.ts
@@ -1,4 +1,4 @@
 /**
  * Semantic version string representing of the minimum compatible version of Contracts to display in output.
  */
-export const compatibleContractsSemver = '^5.4.0';
+export const compatibleContractsSemver = '^5.5.0-rc.0';
diff --git a/packages/core/solidity/src/zip-foundry.test.ts.md b/packages/core/solidity/src/zip-foundry.test.ts.md
index f3f4dfc1f..fe8c2ae3b 100644
--- a/packages/core/solidity/src/zip-foundry.test.ts.md
+++ b/packages/core/solidity/src/zip-foundry.test.ts.md
@@ -37,7 +37,7 @@ Generated by [AVA](https://avajs.dev).
         forge init --force --quiet␊
       ␊
         # Install OpenZeppelin Contracts␊
-        forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z --quiet␊
+        forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z-rc.0 --quiet␊
       ␊
         # Remove unneeded Foundry template files␊
         rm src/Counter.sol␊
@@ -120,7 +120,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -234,7 +234,7 @@ Generated by [AVA](https://avajs.dev).
         forge init --force --quiet␊
       ␊
         # Install OpenZeppelin Contracts and Upgrades␊
-        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z --quiet␊
+        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z-rc.0 --quiet␊
         forge install OpenZeppelin/openzeppelin-foundry-upgrades --quiet␊
       ␊
         # Remove unneeded Foundry template files␊
@@ -330,7 +330,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
@@ -340,16 +340,16 @@ Generated by [AVA](https://avajs.dev).
       import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
       import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
       import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
       import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, OwnableUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
           address public tokenBridge;␊
           error Unauthorized();␊
       ␊
-          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
           constructor() {␊
               _disableInitializers();␊
           }␊
@@ -366,7 +366,6 @@ Generated by [AVA](https://avajs.dev).
               __ERC20Permit_init("My Token");␊
               __ERC20Votes_init();␊
               __ERC20FlashMint_init();␊
-              __UUPSUpgradeable_init();␊
       ␊
               require(tokenBridge_ != address(0), "Invalid tokenBridge_ address");␊
               tokenBridge = tokenBridge_;␊
@@ -477,7 +476,7 @@ Generated by [AVA](https://avajs.dev).
         forge init --force --quiet␊
       ␊
         # Install OpenZeppelin Contracts and Upgrades␊
-        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z --quiet␊
+        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z-rc.0 --quiet␊
         forge install OpenZeppelin/openzeppelin-foundry-upgrades --quiet␊
       ␊
         # Remove unneeded Foundry template files␊
@@ -572,19 +571,19 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {AccessControlUpgradeable} from "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol";␊
       import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
       import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC20Upgradeable, ERC20PermitUpgradeable, AccessControlUpgradeable, UUPSUpgradeable {␊
           bytes32 public constant UPGRADER_ROLE = keccak256("UPGRADER_ROLE");␊
       ␊
-          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
           constructor() {␊
               _disableInitializers();␊
           }␊
@@ -593,7 +592,6 @@ Generated by [AVA](https://avajs.dev).
               __ERC20_init("My Token", "MTK");␊
               __ERC20Permit_init("My Token");␊
               __AccessControl_init();␊
-              __UUPSUpgradeable_init();␊
       ␊
               _grantRole(DEFAULT_ADMIN_ROLE, defaultAdmin);␊
               _grantRole(UPGRADER_ROLE, upgrader);␊
@@ -666,7 +664,7 @@ Generated by [AVA](https://avajs.dev).
         forge init --force --quiet␊
       ␊
         # Install OpenZeppelin Contracts and Upgrades␊
-        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z --quiet␊
+        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z-rc.0 --quiet␊
         forge install OpenZeppelin/openzeppelin-foundry-upgrades --quiet␊
       ␊
         # Remove unneeded Foundry template files␊
@@ -760,16 +758,16 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
-          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
           constructor() {␊
               _disableInitializers();␊
           }␊
@@ -777,7 +775,6 @@ Generated by [AVA](https://avajs.dev).
           function initialize(address initialOwner) public initializer {␊
               __ERC721_init("My Token", "MTK");␊
               __Ownable_init(initialOwner);␊
-              __UUPSUpgradeable_init();␊
           }␊
       ␊
           function _authorizeUpgrade(address newImplementation)␊
@@ -846,7 +843,7 @@ Generated by [AVA](https://avajs.dev).
         forge init --force --quiet␊
       ␊
         # Install OpenZeppelin Contracts␊
-        forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z --quiet␊
+        forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z-rc.0 --quiet␊
       ␊
         # Remove unneeded Foundry template files␊
         rm src/Counter.sol␊
@@ -926,7 +923,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
@@ -997,7 +994,7 @@ Generated by [AVA](https://avajs.dev).
         forge init --force --quiet␊
       ␊
         # Install OpenZeppelin Contracts and Upgrades␊
-        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z --quiet␊
+        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z-rc.0 --quiet␊
         forge install OpenZeppelin/openzeppelin-foundry-upgrades --quiet␊
       ␊
         # Remove unneeded Foundry template files␊
@@ -1092,15 +1089,15 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {ERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC1155Upgradeable, OwnableUpgradeable {␊
-          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
           constructor() {␊
               _disableInitializers();␊
           }␊
@@ -1175,7 +1172,7 @@ Generated by [AVA](https://avajs.dev).
         forge init --force --quiet␊
       ␊
         # Install OpenZeppelin Contracts␊
-        forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z --quiet␊
+        forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z-rc.0 --quiet␊
       ␊
         # Remove unneeded Foundry template files␊
         rm src/Counter.sol␊
@@ -1255,7 +1252,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -1323,7 +1320,7 @@ Generated by [AVA](https://avajs.dev).
         forge init --force --quiet␊
       ␊
         # Install OpenZeppelin Contracts and Upgrades␊
-        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z --quiet␊
+        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z-rc.0 --quiet␊
         forge install OpenZeppelin/openzeppelin-foundry-upgrades --quiet␊
       ␊
         # Remove unneeded Foundry template files␊
@@ -1420,7 +1417,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -1428,9 +1425,9 @@ Generated by [AVA](https://avajs.dev).
       import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
       import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
       import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -1440,7 +1437,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
           function initialize(address signer) public initializer {␊
               __SignerECDSA_init(signer);␊
-              __UUPSUpgradeable_init();␊
           }␊
       ␊
           function _authorizeUpgrade(address newImplementation)␊
@@ -1512,7 +1508,7 @@ Generated by [AVA](https://avajs.dev).
         forge init --force --quiet␊
       ␊
         # Install OpenZeppelin Contracts␊
-        forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z --quiet␊
+        forge install OpenZeppelin/openzeppelin-contracts@vX.Y.Z-rc.0 --quiet␊
       ␊
         # Remove unneeded Foundry template files␊
         rm src/Counter.sol␊
@@ -1588,7 +1584,7 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       contract MyContract {␊
@@ -1647,7 +1643,7 @@ Generated by [AVA](https://avajs.dev).
         forge init --force --quiet␊
       ␊
         # Install OpenZeppelin Contracts and Upgrades␊
-        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z --quiet␊
+        forge install OpenZeppelin/openzeppelin-contracts-upgradeable@vX.Y.Z-rc.0 --quiet␊
         forge install OpenZeppelin/openzeppelin-foundry-upgrades --quiet␊
       ␊
         # Remove unneeded Foundry template files␊
@@ -1743,14 +1739,14 @@ Generated by [AVA](https://avajs.dev).
       }␊
       `,
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {AccessManagedUpgradeable} from "@openzeppelin/contracts-upgradeable/access/manager/AccessManagedUpgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       ␊
       contract MyContract is Initializable, AccessManagedUpgradeable {␊
-          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
           constructor() {␊
               _disableInitializers();␊
           }␊
diff --git a/packages/core/solidity/src/zip-foundry.test.ts.snap b/packages/core/solidity/src/zip-foundry.test.ts.snap
index 7debb3adf..3c752e803 100644
Binary files a/packages/core/solidity/src/zip-foundry.test.ts.snap and b/packages/core/solidity/src/zip-foundry.test.ts.snap differ
diff --git a/packages/core/solidity/src/zip-hardhat.test.ts.md b/packages/core/solidity/src/zip-hardhat.test.ts.md
index 745b178b5..fa2f92ddd 100644
--- a/packages/core/solidity/src/zip-hardhat.test.ts.md
+++ b/packages/core/solidity/src/zip-hardhat.test.ts.md
@@ -10,7 +10,7 @@ Generated by [AVA](https://avajs.dev).
 
     [
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {AccessControl} from "@openzeppelin/contracts/access/AccessControl.sol";␊
@@ -75,6 +75,7 @@ Generated by [AVA](https://avajs.dev).
         solidity: {␊
           version: "0.8.27",␊
           settings: {␊
+            evmVersion: 'cancun',␊
             optimizer: {␊
               enabled: true,␊
             },␊
@@ -95,9 +96,9 @@ Generated by [AVA](https://avajs.dev).
         "author": "",␊
         "license": "MIT",␊
         "devDependencies": {␊
-          "@openzeppelin/contracts": "^5.4.0",␊
           "@nomicfoundation/hardhat-toolbox": "^6.1.0",␊
-          "hardhat": "^2.16.1"␊
+          "@openzeppelin/contracts": "^5.5.0-rc.0",␊
+          "hardhat": "^2.22.0"␊
         }␊
       }`,
       `import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";␊
@@ -137,7 +138,7 @@ Generated by [AVA](https://avajs.dev).
 
     [
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {ERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";␊
@@ -147,16 +148,16 @@ Generated by [AVA](https://avajs.dev).
       import {ERC20PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PausableUpgradeable.sol";␊
       import {ERC20PermitUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20PermitUpgradeable.sol";␊
       import {ERC20VotesUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20VotesUpgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       import {NoncesUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/NoncesUpgradeable.sol";␊
       import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC20Upgradeable, ERC20BridgeableUpgradeable, ERC20BurnableUpgradeable, ERC20PausableUpgradeable, OwnableUpgradeable, ERC20PermitUpgradeable, ERC20VotesUpgradeable, ERC20FlashMintUpgradeable, UUPSUpgradeable {␊
           address public tokenBridge;␊
           error Unauthorized();␊
       ␊
-          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
           constructor() {␊
               _disableInitializers();␊
           }␊
@@ -173,7 +174,6 @@ Generated by [AVA](https://avajs.dev).
               __ERC20Permit_init("My Token");␊
               __ERC20Votes_init();␊
               __ERC20FlashMint_init();␊
-              __UUPSUpgradeable_init();␊
       ␊
               require(tokenBridge_ != address(0), "Invalid tokenBridge_ address");␊
               tokenBridge = tokenBridge_;␊
@@ -231,6 +231,7 @@ Generated by [AVA](https://avajs.dev).
         solidity: {␊
           version: "0.8.27",␊
           settings: {␊
+            evmVersion: 'cancun',␊
             optimizer: {␊
               enabled: true,␊
             },␊
@@ -251,11 +252,11 @@ Generated by [AVA](https://avajs.dev).
         "author": "",␊
         "license": "MIT",␊
         "devDependencies": {␊
-          "@openzeppelin/contracts": "^5.4.0",␊
-          "@openzeppelin/contracts-upgradeable": "^5.4.0",␊
-          "@openzeppelin/hardhat-upgrades": "^3.0.0",␊
           "@nomicfoundation/hardhat-toolbox": "^6.1.0",␊
-          "hardhat": "^2.16.1"␊
+          "@openzeppelin/contracts": "^5.5.0-rc.0",␊
+          "@openzeppelin/contracts-upgradeable": "^5.5.0-rc.0",␊
+          "@openzeppelin/hardhat-upgrades": "^3.0.0",␊
+          "hardhat": "^2.22.0"␊
         }␊
       }`,
       `import { ethers, upgrades } from "hardhat";␊
@@ -303,16 +304,16 @@ Generated by [AVA](https://avajs.dev).
 
     [
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {ERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/ERC721Upgradeable.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyToken is Initializable, ERC721Upgradeable, OwnableUpgradeable, UUPSUpgradeable {␊
-          /// @custom:oz-upgrades-unsafe-allow constructor␊
+          /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
           constructor() {␊
               _disableInitializers();␊
           }␊
@@ -320,7 +321,6 @@ Generated by [AVA](https://avajs.dev).
           function initialize(address initialOwner) public initializer {␊
               __ERC721_init("My Token", "MTK");␊
               __Ownable_init(initialOwner);␊
-              __UUPSUpgradeable_init();␊
           }␊
       ␊
           function _authorizeUpgrade(address newImplementation)␊
@@ -338,6 +338,7 @@ Generated by [AVA](https://avajs.dev).
         solidity: {␊
           version: "0.8.27",␊
           settings: {␊
+            evmVersion: 'cancun',␊
             optimizer: {␊
               enabled: true,␊
             },␊
@@ -358,11 +359,11 @@ Generated by [AVA](https://avajs.dev).
         "author": "",␊
         "license": "MIT",␊
         "devDependencies": {␊
-          "@openzeppelin/contracts": "^5.4.0",␊
-          "@openzeppelin/contracts-upgradeable": "^5.4.0",␊
-          "@openzeppelin/hardhat-upgrades": "^3.0.0",␊
           "@nomicfoundation/hardhat-toolbox": "^6.1.0",␊
-          "hardhat": "^2.16.1"␊
+          "@openzeppelin/contracts": "^5.5.0-rc.0",␊
+          "@openzeppelin/contracts-upgradeable": "^5.5.0-rc.0",␊
+          "@openzeppelin/hardhat-upgrades": "^3.0.0",␊
+          "hardhat": "^2.22.0"␊
         }␊
       }`,
       `import { ethers, upgrades } from "hardhat";␊
@@ -408,7 +409,7 @@ Generated by [AVA](https://avajs.dev).
 
     [
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {ERC1155} from "@openzeppelin/contracts/token/ERC1155/ERC1155.sol";␊
@@ -433,6 +434,7 @@ Generated by [AVA](https://avajs.dev).
         solidity: {␊
           version: "0.8.27",␊
           settings: {␊
+            evmVersion: 'cancun',␊
             optimizer: {␊
               enabled: true,␊
             },␊
@@ -453,9 +455,9 @@ Generated by [AVA](https://avajs.dev).
         "author": "",␊
         "license": "MIT",␊
         "devDependencies": {␊
-          "@openzeppelin/contracts": "^5.4.0",␊
           "@nomicfoundation/hardhat-toolbox": "^6.1.0",␊
-          "hardhat": "^2.16.1"␊
+          "@openzeppelin/contracts": "^5.5.0-rc.0",␊
+          "hardhat": "^2.22.0"␊
         }␊
       }`,
       `import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";␊
@@ -492,7 +494,7 @@ Generated by [AVA](https://avajs.dev).
 
     [
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -514,6 +516,7 @@ Generated by [AVA](https://avajs.dev).
         solidity: {␊
           version: "0.8.27",␊
           settings: {␊
+            evmVersion: 'cancun',␊
             optimizer: {␊
               enabled: true,␊
             },␊
@@ -534,9 +537,9 @@ Generated by [AVA](https://avajs.dev).
         "author": "",␊
         "license": "MIT",␊
         "devDependencies": {␊
-          "@openzeppelin/contracts": "^5.4.0",␊
           "@nomicfoundation/hardhat-toolbox": "^6.1.0",␊
-          "hardhat": "^2.16.1"␊
+          "@openzeppelin/contracts": "^5.5.0-rc.0",␊
+          "hardhat": "^2.22.0"␊
         }␊
       }`,
       `import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";␊
@@ -571,7 +574,7 @@ Generated by [AVA](https://avajs.dev).
 
     [
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       import {Account} from "@openzeppelin/contracts/account/Account.sol";␊
@@ -579,9 +582,9 @@ Generated by [AVA](https://avajs.dev).
       import {ERC1155Holder} from "@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol";␊
       import {ERC721Holder} from "@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol";␊
       import {ERC7739} from "@openzeppelin/contracts/utils/cryptography/signers/draft-ERC7739.sol";␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       import {SignerECDSAUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/cryptography/signers/SignerECDSAUpgradeable.sol";␊
-      import {UUPSUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol";␊
+      import {UUPSUpgradeable} from "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol";␊
       ␊
       contract MyAccount is Initializable, Account, EIP712, ERC7739, SignerECDSAUpgradeable, ERC721Holder, ERC1155Holder, UUPSUpgradeable {␊
           /// @custom:oz-upgrades-unsafe-allow-reachable constructor␊
@@ -591,7 +594,6 @@ Generated by [AVA](https://avajs.dev).
       ␊
           function initialize(address signer) public initializer {␊
               __SignerECDSA_init(signer);␊
-              __UUPSUpgradeable_init();␊
           }␊
       ␊
           function _authorizeUpgrade(address newImplementation)␊
@@ -609,6 +611,7 @@ Generated by [AVA](https://avajs.dev).
         solidity: {␊
           version: "0.8.27",␊
           settings: {␊
+            evmVersion: 'cancun',␊
             optimizer: {␊
               enabled: true,␊
             },␊
@@ -629,11 +632,11 @@ Generated by [AVA](https://avajs.dev).
         "author": "",␊
         "license": "MIT",␊
         "devDependencies": {␊
-          "@openzeppelin/contracts": "^5.4.0",␊
-          "@openzeppelin/contracts-upgradeable": "^5.4.0",␊
-          "@openzeppelin/hardhat-upgrades": "^3.0.0",␊
           "@nomicfoundation/hardhat-toolbox": "^6.1.0",␊
-          "hardhat": "^2.16.1"␊
+          "@openzeppelin/contracts": "^5.5.0-rc.0",␊
+          "@openzeppelin/contracts-upgradeable": "^5.5.0-rc.0",␊
+          "@openzeppelin/hardhat-upgrades": "^3.0.0",␊
+          "hardhat": "^2.22.0"␊
         }␊
       }`,
       `import { ethers, upgrades } from "hardhat";␊
@@ -677,7 +680,7 @@ Generated by [AVA](https://avajs.dev).
 
     [
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
       contract MyContract {␊
@@ -691,6 +694,7 @@ Generated by [AVA](https://avajs.dev).
         solidity: {␊
           version: "0.8.27",␊
           settings: {␊
+            evmVersion: 'cancun',␊
             optimizer: {␊
               enabled: true,␊
             },␊
@@ -711,9 +715,9 @@ Generated by [AVA](https://avajs.dev).
         "author": "",␊
         "license": "MIT",␊
         "devDependencies": {␊
-          "@openzeppelin/contracts": "^5.4.0",␊
           "@nomicfoundation/hardhat-toolbox": "^6.1.0",␊
-          "hardhat": "^2.16.1"␊
+          "@openzeppelin/contracts": "^5.5.0-rc.0",␊
+          "hardhat": "^2.22.0"␊
         }␊
       }`,
       `import { buildModule } from "@nomicfoundation/hardhat-ignition/modules";␊
@@ -746,10 +750,10 @@ Generated by [AVA](https://avajs.dev).
 
     [
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Contracts ^5.4.0␊
+      // Compatible with OpenZeppelin Contracts ^5.5.0-rc.0␊
       pragma solidity ^0.8.27;␊
       ␊
-      import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";␊
+      import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";␊
       ␊
       contract MyContract is Initializable {␊
           /// @custom:oz-upgrades-unsafe-allow constructor␊
@@ -766,6 +770,7 @@ Generated by [AVA](https://avajs.dev).
         solidity: {␊
           version: "0.8.27",␊
           settings: {␊
+            evmVersion: 'cancun',␊
             optimizer: {␊
               enabled: true,␊
             },␊
@@ -786,11 +791,11 @@ Generated by [AVA](https://avajs.dev).
         "author": "",␊
         "license": "MIT",␊
         "devDependencies": {␊
-          "@openzeppelin/contracts": "^5.4.0",␊
-          "@openzeppelin/contracts-upgradeable": "^5.4.0",␊
-          "@openzeppelin/hardhat-upgrades": "^3.0.0",␊
           "@nomicfoundation/hardhat-toolbox": "^6.1.0",␊
-          "hardhat": "^2.16.1"␊
+          "@openzeppelin/contracts": "^5.5.0-rc.0",␊
+          "@openzeppelin/contracts-upgradeable": "^5.5.0-rc.0",␊
+          "@openzeppelin/hardhat-upgrades": "^3.0.0",␊
+          "hardhat": "^2.22.0"␊
         }␊
       }`,
       `import { ethers, upgrades } from "hardhat";␊
diff --git a/packages/core/solidity/src/zip-hardhat.test.ts.snap b/packages/core/solidity/src/zip-hardhat.test.ts.snap
index 29d2250f4..eca869787 100644
Binary files a/packages/core/solidity/src/zip-hardhat.test.ts.snap and b/packages/core/solidity/src/zip-hardhat.test.ts.snap differ
diff --git a/packages/core/solidity/src/zip-hardhat.ts b/packages/core/solidity/src/zip-hardhat.ts
index b85d36663..2a122c8b1 100644
--- a/packages/core/solidity/src/zip-hardhat.ts
+++ b/packages/core/solidity/src/zip-hardhat.ts
@@ -15,6 +15,7 @@ const config: HardhatUserConfig = {
   solidity: {
     version: "${SOLIDITY_VERSION}",
     settings: {
+      evmVersion: 'cancun',
       optimizer: {
         enabled: true,
       },
diff --git a/packages/mcp/src/solidity/schemas.ts b/packages/mcp/src/solidity/schemas.ts
index 9bdebed84..c68ae6a73 100644
--- a/packages/mcp/src/solidity/schemas.ts
+++ b/packages/mcp/src/solidity/schemas.ts
@@ -123,8 +123,8 @@ export const accountSchema = {
   ERC1155Holder: z.boolean().optional().describe(solidityAccountDescriptions.ERC1155Holder),
   signer: z
     .literal(false)
-    .or(z.literal('ERC7702'))
     .or(z.literal('ECDSA'))
+    .or(z.literal('EIP7702'))
     .or(z.literal('P256'))
     .or(z.literal('RSA'))
     .or(z.literal('Multisig'))
diff --git a/packages/ui/api/ai-assistant/function-definitions/solidity.ts b/packages/ui/api/ai-assistant/function-definitions/solidity.ts
index 81cc84a4f..05a5357af 100644
--- a/packages/ui/api/ai-assistant/function-definitions/solidity.ts
+++ b/packages/ui/api/ai-assistant/function-definitions/solidity.ts
@@ -202,7 +202,7 @@ export const solidityAccountAIFunctionDefinition = {
       signer: {
         anyOf: [
           { type: 'boolean', enum: [false] },
-          { type: 'string', enum: ['ECDSA', 'ERC7702', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] },
+          { type: 'string', enum: ['ECDSA', 'EIP7702', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] },
         ],
         description: solidityAccountDescriptions.signer,
       },
diff --git a/packages/ui/src/solidity/AccountControls.svelte b/packages/ui/src/solidity/AccountControls.svelte
index 628cc0f54..b248defe9 100644
--- a/packages/ui/src/solidity/AccountControls.svelte
+++ b/packages/ui/src/solidity/AccountControls.svelte
@@ -25,7 +25,7 @@
   let upgradeNotSupported = false;
   let upgradeNotSupportedReason = '';
   $: {
-    if (opts.signer === 'ERC7702') {
+    if (opts.signer === 'EIP7702') {
       upgradeNotSupported = true;
       upgradeNotSupportedReason = 'EOAs can upgrade by redelegating to a new account';
     } else {
@@ -175,8 +175,8 @@
         making it suitable for accounts controlled by EOAs.
       </HelpTooltip>
     </label>
-    <label class:checked={opts.signer === 'ERC7702'}>
-      <input type="radio" bind:group={opts.signer} value="ERC7702" use:error={errors?.erc7702} />
+    <label class:checked={opts.signer === 'EIP7702'}>
+      <input type="radio" bind:group={opts.signer} value="EIP7702" use:error={errors?.eip7702} />
       EOA Delegation
       <HelpTooltip link="https://docs.openzeppelin.com/contracts/eoa-delegation">
         Special ECDSA validation that uses the account's own address as the signer. Enables EOAs to delegate execution
diff --git a/yarn.lock b/yarn.lock
index 7dca4b0f8..fee71b273 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -807,18 +807,17 @@
 
 "@openzeppelin/community-contracts@git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#269f9b5":
   version "0.0.1"
-  uid "269f9b5e51a290d09fa9b5a5e927062c20910763"
   resolved "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#269f9b5e51a290d09fa9b5a5e927062c20910763"
 
-"@openzeppelin/contracts-upgradeable@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.4.0.tgz#a325066da702d0a8be091eb17136d3e9c92cc76a"
-  integrity sha512-STJKyDzUcYuB35Zub1JpWW58JxvrFFVgQ+Ykdr8A9PGXgtq/obF5uoh07k2XmFyPxfnZdPdBdhkJ/n2YxJ87HQ==
+"@openzeppelin/contracts-upgradeable@^5.5.0-rc.0":
+  version "5.5.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.5.0-rc.0.tgz#53d23e8d941956d65ec18dc161b90e652e6a321f"
+  integrity sha512-WJBXTtwBiKuqs2Gwm5g3PLRxlkqVKRVCQmeCG6kBwyhh41w3clQbyj23PiqurWBjzcU123bi+EzbWRM4ro/5UA==
 
-"@openzeppelin/contracts@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.4.0.tgz#177594bdb2d86c71f5d1052fe40cb4edb95fb20f"
-  integrity sha512-eCYgWnLg6WO+X52I16TZt8uEjbtdkgLC0SUX/xnAksjjrQI4Xfn4iBRoI5j55dmlOhDv1Y7BoR3cU7e3WWhC6A==
+"@openzeppelin/contracts@^5.5.0-rc.0":
+  version "5.5.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-5.5.0-rc.0.tgz#5c143bfc6362702d8ce7fde76d009d9633a9f01e"
+  integrity sha512-bhJiU4PC3suR1bJ4xkhkAlIZsyAjYr0q3VRgh6tfi8uDpy/NTNpwDeTI+qlGnyXrrnqT04/Qjui6IDHNmAT4wA==
 
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"