Add Account and increase pragma to 0.8.27 (#486)

Co-authored-by: Eric Lau <[email protected]>

Author: ernestognw

package.json

@@ -35,4 +35,4 @@
     "typescript-eslint": "^8.29.0",
     "wsrun": "^5.2.4"
   }
-}
+}

packages/core/solidity/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Unreleased
+
+- Add `account` contract types for ERC-4337. ([#486](https://github.com/OpenZeppelin/contracts-wizard/pull/486))
+
+- **Potentially breaking changes**:
+  - Update pragma versions to 0.8.27. ([#486](https://github.com/OpenZeppelin/contracts-wizard/pull/486))
+
 ## 0.5.4 (2025-04-01)
 
 - Add validation for ERC20 premint field. ([#488](https://github.com/OpenZeppelin/contracts-wizard/pull/488))

packages/core/solidity/README.md

@@ -18,10 +18,11 @@ The following contract types are supported:
 - `erc1155`
 - `stablecoin`
 - `realWorldAsset`
+- `account`
 - `governor`
 - `custom`
 
-Note that `stablecoin` and `realWorldAsset` are experimental and may be subject to change.
+Note that `stablecoin`, `realWorldAsset`, and `account` are experimental and may be subject to change.
 
 Each contract type has functions/constants as defined below.
 
@@ -41,6 +42,9 @@ function print(opts?: ERC1155Options): string
 function print(opts?: StablecoinOptions): string
 ```
 ```js
+function print(opts?: AccountOptions): string
+```
+```js
 function print(opts?: GovernorOptions): string
 ```
 ```js
@@ -62,6 +66,9 @@ const defaults: Required<ERC1155Options>
 const defaults: Required<StablecoinOptions>
 ```
 ```js
+const defaults: Required<AccountOptions>
+```
+```js
 const defaults: Required<GovernorOptions>
 ```
 ```js
@@ -88,7 +95,10 @@ function isAccessControlRequired(opts: Partial<GovernorOptions>): boolean
 ```js
 function isAccessControlRequired(opts: Partial<CustomOptions>): boolean
 ```
-Whether any of the provided options require access control to be enabled. If this returns `true`, then calling `print` with the same options would cause the `access` option to default to `'ownable'` if it was `undefined` or `false`. 
+Whether any of the provided options require access control to be enabled. If this returns `true`, then calling `print` with the same options would cause the `access` option to default to `'ownable'` if it was `undefined` or `false`.
+
+> Note that contracts such as `account`, have its own way of handling permissions and do not support the `access` option.
+Thus, that type does not include `isAccessControlRequired`.
 
 ### Examples
 
@@ -119,4 +129,4 @@ const contract = erc20.print({
   ...erc20.defaults,
   upgradeable: 'uups',
 });
-```
+```

packages/core/solidity/hardhat.config.js

@@ -41,5 +41,14 @@ task(TASK_COMPILE_SOLIDITY_MERGE_COMPILATION_JOBS, async ({ compilationJobs }, _
  * @type import('hardhat/config').HardhatUserConfig
  */
 module.exports = {
-  solidity: SOLIDITY_VERSION,
+  solidity: {
+    version: SOLIDITY_VERSION,
+    settings: {
+      evmVersion: 'cancun',
+      optimizer: {
+        enabled: true,
+        runs: 200,
+      },
+    },
+  },
 };

packages/core/solidity/package.json

@@ -24,17 +24,17 @@
   },
   "devDependencies": {
     "@openzeppelin/community-contracts": "https://github.com/OpenZeppelin/openzeppelin-community-contracts",
-    "@openzeppelin/contracts": "^5.1.0",
-    "@openzeppelin/contracts-upgradeable": "^5.1.0",
+    "@openzeppelin/contracts": "^5.3.0",
+    "@openzeppelin/contracts-upgradeable": "^5.3.0",
     "@types/node": "^18.0.0",
     "@types/semver": "^7.5.7",
     "ava": "^6.0.0",
-    "hardhat": "^2.1.1",
+    "hardhat": "^2.22.11",
     "jszip": "^3.6.0",
     "rimraf": "^5.0.0",
     "semver": "^7.6.0",
     "solidity-ast": "^0.4.18",
     "ts-node": "^10.4.0",
     "typescript": "^5.0.0"
   }
-}
+}

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

@@ -0,0 +1,109 @@
+import test from 'ava';
+import { account } from '.';
+
+import type { AccountOptions } from './account';
+import { buildAccount } from './account';
+import { printContract } from './print';
+
+/**
+ * Tests external API for equivalence with internal API
+ */
+function testAPIEquivalence(title: string, opts?: AccountOptions) {
+  test(title, t => {
+    t.is(
+      account.print(opts),
+      printContract(
+        buildAccount({
+          name: 'MyAccount',
+          signatureValidation: 'ERC7739',
+          ERC721Holder: true,
+          ERC1155Holder: true,
+          batchedExecution: false,
+          ERC7579Modules: false,
+          ...opts,
+        }),
+      ),
+    );
+  });
+}
+
+function testAccount(title: string, opts: Partial<AccountOptions>) {
+  const fullOpts = {
+    name: 'MyAccount',
+    ERC1271: false as const,
+    ERC721Holder: false,
+    ERC1155Holder: false,
+    ERC7821: false as const,
+    ERC7579: false as const,
+    ...opts,
+  };
+  test(title, t => {
+    const c = buildAccount(fullOpts);
+    t.snapshot(printContract(c));
+  });
+  testAPIEquivalence(`${title} API equivalence`, fullOpts);
+}
+
+testAPIEquivalence('account API default');
+
+test('account API assert defaults', async t => {
+  t.is(account.print(account.defaults), account.print());
+});
+
+for (const signer of [undefined, 'ERC7702', 'ECDSA', 'P256', 'RSA'] as const) {
+  let title = 'Account';
+  if (signer) {
+    title += ` with Signer${signer}`;
+  }
+
+  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 hooks`, {
+    signer,
+    ERC7579Modules: 'AccountERC7579Hooked',
+  });
+}