[Solidity] Upgrade @openzeppelin/contracts to 5.5.0-rc.0

.changeset/lazy-seals-cover.md

@@ -0,0 +1,10 @@
+---
+'@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
+- **Breaking changes**:
+  - Solidity account signer: `ERC7702` option is renamed as `EIP7702`. Imported contract `SignerERC7702` is renamed as `SignerEIP7702`.
+  - Solidity upgradeable contracts: `Initializable` and `UUPSUpgradeable` are imported from `@openzeppelin/contracts` instead of `@openzeppelin/contracts-upgradeable`.

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

packages/core/solidity/package.json

@@ -23,8 +23,8 @@
   },
   "devDependencies": {
     "@openzeppelin/community-contracts": "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#b0ddd27",
-    "@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",

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) {

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 [email protected]␊

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)␊