Update migrated imports from community to vanilla contracts

.changeset/odd-ants-hunt.md

@@ -0,0 +1,6 @@
+---
+'@openzeppelin/wizard': minor
+'@openzeppelin/contracts-mcp': minor
+---
+
+Add constructors for `SignerECDSA`, `SignerP256`, `SignerRSA`, `SignerERC7702`, `SignerERC7913`, `MultiSignerERC7913` and `MultiSignerERC7913Weighted`

.changeset/sad-nails-smash.md

@@ -0,0 +1,6 @@
+---
+'@openzeppelin/wizard': minor
+'@openzeppelin/contracts-mcp': minor
+---
+
+Enable upgradeability for `AccountERC7579`, `AccountERC7579Hooked`, `SignerECDSA`, `SignerP256`, `SignerRSA`, `SignerERC7702`, `SignerERC7913` and `MultiSignerERC7913`

.changeset/sour-hats-grow.md

@@ -0,0 +1,6 @@
+---
+'@openzeppelin/wizard': minor
+'@openzeppelin/contracts-mcp': minor
+---
+
+**Breaking change**: Use `Account`, `AccountERC7579`, `AccountERC7579Hooked`, `ERC7812`, `ERC7739Utils`, `ERC7913Utils`, `AbstractSigner`, `SignerECDSA`, `SignerP256`, `SignerRSA`, `SignerERC7702`, `SignerERC7913`, `MultiSignerERC7913`, and `MultiSignerERC7913Weighted` from OpenZeppelin Contracts 5.4.0 instead of Community Contracts

.github/workflows/test.yml

@@ -111,7 +111,7 @@ jobs:
         working-directory: packages/ui
       - name: Run tests
         if: matrix.variant == 'default'
-        run: yarn test '**/*.test.ts' '!**/*.compile.test.ts'
+        run: yarn test '**/*.test.ts' '**/test.ts' '!**/*.compile.test.ts'
         working-directory: packages/core/${{matrix.package}}
 
       - name: Get list of changed files

packages/common/src/ai/descriptions/solidity.ts

@@ -8,8 +8,7 @@ export const solidityPrompts = {
   Stablecoin:
     'Make a stablecoin token that uses the ERC-20 standard. Experimental, some features are not audited and are subject to change.',
   RWA: 'Make a real-world asset token that uses the ERC-20 standard. Experimental, some features are not audited and are subject to change.',
-  Account:
-    'Make an account contract that follows the ERC-4337 standard. Experimental, some features are not audited and are subject to change.',
+  Account: 'Make an account contract that follows the ERC-4337 standard.',
   Governor: 'Make a contract to implement governance, such as for a DAO.',
   Custom: 'Make a custom smart contract.',
 };

packages/core/solidity/README.md

@@ -22,7 +22,7 @@ The following contract types are supported:
 - `governor`
 - `custom`
 
-Note that `stablecoin`, `realWorldAsset`, and `account` are experimental and may be subject to change.
+Note that `stablecoin`, and `realWorldAsset` are experimental and may be subject to change.
 
 Each contract type has functions/constants as defined below.
 

packages/core/solidity/package.json

@@ -22,7 +22,7 @@
     "update-env": "rm ./src/environments/hardhat/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat && rm ./src/environments/hardhat/upgradeable/package-lock.json && npm install --package-lock-only --prefix ./src/environments/hardhat/upgradeable"
   },
   "devDependencies": {
-    "@openzeppelin/community-contracts": "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#de17c8e",
+    "@openzeppelin/community-contracts": "git+https://github.com/OpenZeppelin/openzeppelin-community-contracts.git#2d607bd",
     "@openzeppelin/contracts": "^5.4.0",
     "@openzeppelin/contracts-upgradeable": "^5.4.0",
     "@types/node": "^20.0.0",

packages/core/solidity/src/account.test.ts

@@ -50,72 +50,98 @@ test('account API assert defaults', async t => {
   t.is(account.print(account.defaults), account.print());
 });
 
-for (const signer of [false, 'ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const) {
-  let title = 'Account';
-  if (signer) {
-    title += ` with Signer${signer}`;
+function format(upgradeable: false | 'uups' | 'transparent') {
+  switch (upgradeable) {
+    case false:
+      return 'non-upgradeable';
+    case 'uups':
+      return 'upgradeable uups';
+    case 'transparent':
+      return 'upgradeable transparent';
   }
+}
 
-  testAccount(`${title} named`, {
-    name: `Custom${title}`,
-    signer,
-  });
-
-  testAccount(`${title} with ERC1271`, {
-    name: `Custom${title}ERC1271`,
-    signatureValidation: 'ERC1271',
-    signer,
-  });
-
-  testAccount(`${title} with ERC7739`, {
-    name: `Custom${title}ERC7739`,
-    signatureValidation: 'ERC7739',
-    signer,
-  });
-
-  testAccount(`${title} with ERC721Holder`, {
-    name: `Custom${title}ERC721Holder`,
-    ERC721Holder: true,
-    signer,
-  });
-
-  testAccount(`${title} with ERC1155Holder`, {
-    name: `Custom${title}ERC1155Holder`,
-    ERC1155Holder: true,
-    signer,
-  });
-
-  testAccount(`${title} with ERC721Holder and ERC1155Holder`, {
-    name: `Custom${title}ERC721HolderERC1155Holder`,
-    ERC721Holder: true,
-    ERC1155Holder: true,
-    signer,
-  });
-
-  testAccount(`${title} with ERC7821 Execution`, {
-    signer,
-    batchedExecution: true,
-  });
-
-  testAccount(`${title} with ERC7579`, {
-    signer,
-    ERC7579Modules: 'AccountERC7579',
-  });
-
-  testAccount(`${title} with ERC7579 with ERC1271`, {
-    signer,
-    ERC7579Modules: 'AccountERC7579',
-    signatureValidation: 'ERC1271',
-  });
-
-  testAccount(`${title} with ERC7579 with ERC7739`, {
-    signer,
-    ERC7579Modules: 'AccountERC7579',
-    signatureValidation: 'ERC7739',
-  });
-
-  testAccount(`${title} with ERC7579 hooks`, {
-    signer,
-    ERC7579Modules: 'AccountERC7579Hooked',
-  });
+for (const signer of [false, 'ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'] as const) {
+  for (const upgradeable of [false, 'uups', 'transparent'] as const) {
+    if (signer === 'ERC7702' && !!upgradeable) continue;
+
+    let title = 'Account';
+    if (signer) {
+      title += ` with Signer${signer}`;
+    }
+
+    testAccount(`${title} named ${format(upgradeable)}`, {
+      name: `Custom${title}`,
+      signer,
+      upgradeable,
+    });
+
+    testAccount(`${title} with ERC1271 ${format(upgradeable)}`, {
+      name: `Custom${title}ERC1271`,
+      signatureValidation: 'ERC1271',
+      signer,
+      upgradeable,
+    });
+
+    testAccount(`${title} with ERC7739 ${format(upgradeable)}`, {
+      name: `Custom${title}ERC7739`,
+      signatureValidation: 'ERC7739',
+      signer,
+      upgradeable,
+    });
+
+    testAccount(`${title} with ERC721Holder ${format(upgradeable)}`, {
+      name: `Custom${title}ERC721Holder`,
+      ERC721Holder: true,
+      signer,
+      upgradeable,
+    });
+
+    testAccount(`${title} with ERC1155Holder ${format(upgradeable)}`, {
+      name: `Custom${title}ERC1155Holder`,
+      ERC1155Holder: true,
+      signer,
+      upgradeable,
+    });
+
+    testAccount(`${title} with ERC721Holder and ERC1155Holder ${format(upgradeable)}`, {
+      name: `Custom${title}ERC721HolderERC1155Holder`,
+      ERC721Holder: true,
+      ERC1155Holder: true,
+      signer,
+      upgradeable,
+    });
+
+    testAccount(`${title} with ERC7821 Execution ${format(upgradeable)}`, {
+      signer,
+      upgradeable,
+      batchedExecution: true,
+    });
+
+    testAccount(`${title} with ERC7579 ${format(upgradeable)}`, {
+      signer,
+      upgradeable,
+      ERC7579Modules: 'AccountERC7579',
+    });
+
+    testAccount(`${title} with ERC7579 with ERC1271 ${format(upgradeable)}`, {
+      signer,
+      upgradeable,
+      ERC7579Modules: 'AccountERC7579',
+      signatureValidation: 'ERC1271',
+    });
+
+    testAccount(`${title} with ERC7579 with ERC7739 ${format(upgradeable)}`, {
+      signer,
+      upgradeable,
+      ERC7579Modules: 'AccountERC7579',
+      signatureValidation: 'ERC7739',
+    });
+
+    testAccount(`${title} with ERC7579 hooks ${format(upgradeable)}`, {
+      signer,
+      upgradeable,
+      ERC7579Modules: 'AccountERC7579Hooked',
+    });
+  }
 }