@openzeppelin/wizard 0.5.3 → 0.5.5

package/dist/signer.js

@@ -0,0 +1,115 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.signerFunctions = exports.signers = exports.SignerOptions = void 0;
+exports.addSigner = addSigner;
+const define_functions_1 = require("./utils/define-functions");
+exports.SignerOptions = [false, 'ERC7702', 'ECDSA', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'];
+function addSigner(c, signer) {
+    if (!signer)
+        return;
+    const parent = exports.signers[signer];
+    const name = parent.name;
+    c.addParent(parent);
+    c.addOverride({ name: name === exports.signers.MultisigWeighted.name ? exports.signers.Multisig.name : name }, exports.signerFunctions._rawSignatureValidation);
+    // ERC-7702 doesn't require initialization
+    if (signer === 'ERC7702')
+        return;
+    c.addParent({
+        name: 'Initializable',
+        path: '@openzeppelin/contracts/proxy/utils/Initializable.sol',
+    });
+    const fn = exports.signerFunctions[`initialize${signer}`];
+    c.addModifier('initializer', fn);
+    const args = fn.args;
+    switch (signer) {
+        case 'Multisig':
+            c.addFunctionCode(`_addSigners(${args[0].name});`, fn);
+            c.addFunctionCode(`_setThreshold(${args[1].name});`, fn);
+            break;
+        case 'MultisigWeighted':
+            c.addFunctionCode(`_addSigners(${args[0].name});`, fn);
+            c.addFunctionCode(`_setSignerWeights(${args[0].name}, ${args[1].name});`, fn);
+            c.addFunctionCode(`_setThreshold(${args[2].name});`, fn);
+            break;
+        case 'ECDSA':
+        case 'P256':
+        case 'RSA':
+            c.addFunctionCode(`_setSigner(${fn.args
+                .map(({ name }) => name)
+                .join(', ')
+                .trimEnd()});`, fn);
+    }
+}
+exports.signers = {
+    ERC7702: {
+        name: 'SignerERC7702',
+        path: '@openzeppelin/community-contracts/utils/cryptography/SignerERC7702.sol',
+    },
+    ECDSA: {
+        name: 'SignerECDSA',
+        path: '@openzeppelin/community-contracts/utils/cryptography/SignerECDSA.sol',
+    },
+    P256: {
+        name: 'SignerP256',
+        path: '@openzeppelin/community-contracts/utils/cryptography/SignerP256.sol',
+    },
+    RSA: {
+        name: 'SignerRSA',
+        path: '@openzeppelin/community-contracts/utils/cryptography/SignerRSA.sol',
+    },
+    Multisig: {
+        name: 'MultiSignerERC7913',
+        path: '@openzeppelin/community-contracts/utils/cryptography/MultiSignerERC7913.sol',
+    },
+    MultisigWeighted: {
+        name: 'MultiSignerERC7913Weighted',
+        path: '@openzeppelin/community-contracts/utils/cryptography/MultiSignerERC7913Weighted.sol',
+    },
+};
+exports.signerFunctions = {
+    ...(0, define_functions_1.defineFunctions)({
+        initializeECDSA: {
+            kind: 'public',
+            args: [{ name: 'signer', type: 'address' }],
+        },
+        initializeP256: {
+            kind: 'public',
+            args: [
+                { name: 'qx', type: 'bytes32' },
+                { name: 'qy', type: 'bytes32' },
+            ],
+        },
+        initializeRSA: {
+            kind: 'public',
+            args: [
+                { name: 'e', type: 'bytes memory' },
+                { name: 'n', type: 'bytes memory' },
+            ],
+        },
+        initializeMultisig: {
+            kind: 'public',
+            args: [
+                { name: 'signers', type: 'bytes[] memory' },
+                { name: 'threshold', type: 'uint256' },
+            ],
+        },
+        initializeMultisigWeighted: {
+            kind: 'public',
+            args: [
+                { name: 'signers', type: 'bytes[] memory' },
+                { name: 'weights', type: 'uint256[] memory' },
+                { name: 'threshold', type: 'uint256' },
+            ],
+        },
+        _rawSignatureValidation: {
+            kind: 'internal',
+            args: [
+                { name: 'hash', type: 'bytes32' },
+                { name: 'signature', type: 'bytes calldata' },
+            ],
+            returns: ['bool'],
+            mutability: 'view',
+        },
+    }),
+};
+//# sourceMappingURL=signer.js.map

package/dist/signer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"signer.js","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"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"}

package/dist/solidity-version.json

@@ -1 +1 @@
-"0.8.22"
+"0.8.27"

package/dist/stablecoin.js

@@ -48,7 +48,7 @@ function addLimitations(c, access, mode) {
     const type = mode === 'allowlist';
     const ERC20Limitation = {
         name: type ? 'ERC20Allowlist' : 'ERC20Blocklist',
-        path: `@openzeppelin/community-contracts/contracts/token/ERC20/extensions/${type ? 'ERC20Allowlist' : 'ERC20Blocklist'}.sol`,
+        path: `@openzeppelin/community-contracts/token/ERC20/extensions/${type ? 'ERC20Allowlist' : 'ERC20Blocklist'}.sol`,
     };
     c.addParent(ERC20Limitation);
     c.addOverride(ERC20Limitation, functions._update);
@@ -64,7 +64,7 @@ function addLimitations(c, access, mode) {
 function addCustodian(c, access) {
     const ERC20Custodian = {
         name: 'ERC20Custodian',
-        path: '@openzeppelin/community-contracts/contracts/token/ERC20/extensions/ERC20Custodian.sol',
+        path: '@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Custodian.sol',
     };
     c.addParent(ERC20Custodian);
     c.addOverride(ERC20Custodian, functions._update);

package/dist/stablecoin.js.map

@@ -1 +1 @@
-{"version":3,"file":"stablecoin.js","sourceRoot":"","sources":["../src/stablecoin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"stablecoin.js","sourceRoot":"","sources":["../src/stablecoin.ts"],"names":[],"mappings":"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"}

package/dist/test.js

@@ -22,6 +22,9 @@ test.serial('erc1155 result compiles', async (t) => {
 test.serial('stablecoin result compiles', async (t) => {
     await testCompile(t, 'Stablecoin');
 });
+test.serial('account result compiles', async (t) => {
+    await testCompile(t, 'Account');
+});
 test.serial('governor result compiles', async (t) => {
     await testCompile(t, 'Governor');
 });
@@ -53,6 +56,8 @@ function isAccessControlRequired(opts) {
             return api_1.stablecoin.isAccessControlRequired(opts);
         case 'RealWorldAsset':
             return api_1.stablecoin.isAccessControlRequired(opts);
+        case 'Account':
+            throw new Error(`Not applicable for ${opts.kind}`);
         case 'Governor':
             return api_1.governor.isAccessControlRequired(opts);
         case 'Custom':
@@ -64,12 +69,18 @@ function isAccessControlRequired(opts) {
 test('is access control required', async (t) => {
     for (const contract of (0, sources_1.generateSources)('all')) {
         const regexOwnable = /import.*Ownable(Upgradeable)?.sol.*/gm;
-        if (!contract.options.access) {
-            if (isAccessControlRequired(contract.options)) {
-                t.regex(contract.source, regexOwnable, JSON.stringify(contract.options));
-            }
-            else {
-                t.notRegex(contract.source, regexOwnable, JSON.stringify(contract.options));
+        switch (contract.options.kind) {
+            case 'Account':
+                break;
+            default: {
+                if (!contract.options.access) {
+                    if (isAccessControlRequired(contract.options)) {
+                        t.regex(contract.source, regexOwnable, JSON.stringify(contract.options));
+                    }
+                    else {
+                        t.notRegex(contract.source, regexOwnable, JSON.stringify(contract.options));
+                    }
+                }
             }
         }
     }

package/dist/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}

package/dist/utils/convert-strings.d.ts

@@ -0,0 +1,11 @@
+export declare const UINT256_MAX: bigint;
+/**
+ * Checks that a string is a valid `uint256` value and converts it to bigint.
+ *
+ * @param value The value to check.
+ * @param field The field name to use in the error if the value is invalid.
+ * @throws OptionsError if the value is not a valid number or is greater than the maximum value for `uint256`.
+ * @returns The value as a bigint.
+ */
+export declare function toUint256(value: string, field: string): bigint;
+//# sourceMappingURL=convert-strings.d.ts.map

package/dist/utils/convert-strings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"convert-strings.d.ts","sourceRoot":"","sources":["../../src/utils/convert-strings.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,WAAW,QAAuC,CAAC;AAEhE;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAc9D"}

package/dist/utils/convert-strings.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UINT256_MAX = void 0;
+exports.toUint256 = toUint256;
+const error_1 = require("../error");
+exports.UINT256_MAX = BigInt(2) ** BigInt(256) - BigInt(1);
+/**
+ * Checks that a string is a valid `uint256` value and converts it to bigint.
+ *
+ * @param value The value to check.
+ * @param field The field name to use in the error if the value is invalid.
+ * @throws OptionsError if the value is not a valid number or is greater than the maximum value for `uint256`.
+ * @returns The value as a bigint.
+ */
+function toUint256(value, field) {
+    const isValidNumber = /^\d+$/.test(value);
+    if (!isValidNumber) {
+        throw new error_1.OptionsError({
+            [field]: 'Not a valid number',
+        });
+    }
+    const numValue = BigInt(value);
+    if (numValue > exports.UINT256_MAX) {
+        throw new error_1.OptionsError({
+            [field]: 'Value is greater than uint256 max value',
+        });
+    }
+    return numValue;
+}
+//# sourceMappingURL=convert-strings.js.map

package/dist/utils/convert-strings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convert-strings.js","sourceRoot":"","sources":["../../src/utils/convert-strings.ts"],"names":[],"mappings":";;;AAYA,8BAcC;AA1BD,oCAAwC;AAE3B,QAAA,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;AAEhE;;;;;;;GAOG;AACH,SAAgB,SAAS,CAAC,KAAa,EAAE,KAAa;IACpD,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1C,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,oBAAY,CAAC;YACrB,CAAC,KAAK,CAAC,EAAE,oBAAoB;SAC9B,CAAC,CAAC;IACL,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,QAAQ,GAAG,mBAAW,EAAE,CAAC;QAC3B,MAAM,IAAI,oBAAY,CAAC;YACrB,CAAC,KAAK,CAAC,EAAE,yCAAyC;SACnD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/dist/utils/sanitize.d.ts

@@ -0,0 +1,2 @@
+export declare function stringifyUnicodeSafe(str: string): string;
+//# sourceMappingURL=sanitize.d.ts.map

package/dist/utils/sanitize.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../src/utils/sanitize.ts"],"names":[],"mappings":"AAAA,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAKxD"}

package/dist/utils/sanitize.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stringifyUnicodeSafe = stringifyUnicodeSafe;
+function stringifyUnicodeSafe(str) {
+    // eslint-disable-next-line no-control-regex
+    const containsUnicode = /[^\x00-\x7F]/.test(str);
+    return containsUnicode ? `unicode"${str.replace(/"/g, '\\"')}"` : JSON.stringify(str);
+}
+//# sourceMappingURL=sanitize.js.map

package/dist/utils/sanitize.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sanitize.js","sourceRoot":"","sources":["../../src/utils/sanitize.ts"],"names":[],"mappings":";;AAAA,oDAKC;AALD,SAAgB,oBAAoB,CAAC,GAAW;IAC9C,4CAA4C;IAC5C,MAAM,eAAe,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEjD,OAAO,eAAe,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AACxF,CAAC"}

package/dist/zip-foundry.js

@@ -184,17 +184,17 @@ then
   mv README.md README-oz.md
 
   # Initialize sample Foundry project
-  forge init --force --no-commit --quiet
+  forge init --force --quiet
 
 ${c.upgradeable
     ? `\
   # Install OpenZeppelin Contracts and Upgrades
-  forge install OpenZeppelin/openzeppelin-contracts-upgradeable@v${openzeppelin_contracts_1.default.version} --no-commit --quiet
-  forge install OpenZeppelin/openzeppelin-foundry-upgrades --no-commit --quiet\
+  forge install OpenZeppelin/openzeppelin-contracts-upgradeable@v${openzeppelin_contracts_1.default.version} --quiet
+  forge install OpenZeppelin/openzeppelin-foundry-upgrades --quiet\
 `
     : `\
   # Install OpenZeppelin Contracts
-  forge install OpenZeppelin/openzeppelin-contracts@v${openzeppelin_contracts_1.default.version} --no-commit --quiet\
+  forge install OpenZeppelin/openzeppelin-contracts@v${openzeppelin_contracts_1.default.version} --quiet\
 `}
 
   # Remove unneeded Foundry template files

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard",
-  "version": "0.5.3",
+  "version": "0.5.5",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
@@ -19,17 +19,16 @@
     "test": "ava",
     "test:update-snapshots": "ava --update-snapshots",
     "test:watch": "ava --watch",
-    "version": "node ../../../scripts/bump-changelog.js",
     "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": "https://github.com/OpenZeppelin/openzeppelin-community-contracts",
-    "@openzeppelin/contracts": "^5.1.0",
-    "@openzeppelin/contracts-upgradeable": "^5.1.0",
-    "@types/node": "^18.0.0",
+    "@openzeppelin/contracts": "^5.3.0",
+    "@openzeppelin/contracts-upgradeable": "^5.3.0",
+    "@types/node": "^20.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",

package/src/account.ts

@@ -0,0 +1,292 @@
+import { ContractBuilder } from './contract';
+import type { Contract } from './contract';
+import { defineFunctions } from './utils/define-functions';
+import { printContract } from './print';
+import { defaults as commonDefaults, withCommonDefaults, type CommonOptions } from './common-options';
+import { setInfo } from './set-info';
+import { addSigner, signerFunctions, signers, type SignerOptions } from './signer';
+
+export const defaults: Required<AccountOptions> = {
+  ...commonDefaults,
+  name: 'MyAccount',
+  signatureValidation: 'ERC7739',
+  ERC721Holder: true,
+  ERC1155Holder: true,
+  signer: 'ECDSA',
+  batchedExecution: false,
+  ERC7579Modules: false,
+} as const;
+
+export const SignatureValidationOptions = [false, 'ERC1271', 'ERC7739'] as const;
+export type SignatureValidationOptions = (typeof SignatureValidationOptions)[number];
+
+export const ERC7579ModulesOptions = [false, 'AccountERC7579', 'AccountERC7579Hooked'] as const;
+export type ERC7579ModulesOptions = (typeof ERC7579ModulesOptions)[number];
+
+export interface AccountOptions extends CommonOptions {
+  name: string;
+  signatureValidation?: SignatureValidationOptions;
+  ERC721Holder?: boolean;
+  ERC1155Holder?: boolean;
+  signer?: SignerOptions;
+  batchedExecution?: boolean;
+  ERC7579Modules?: ERC7579ModulesOptions;
+}
+
+function withDefaults(opts: AccountOptions): Required<AccountOptions> {
+  return {
+    ...withCommonDefaults(opts),
+    name: opts.name ?? defaults.name,
+    signatureValidation: opts.signatureValidation ?? defaults.signatureValidation,
+    ERC721Holder: opts.ERC721Holder ?? defaults.ERC721Holder,
+    ERC1155Holder: opts.ERC1155Holder ?? defaults.ERC1155Holder,
+    signer: opts.signer ?? defaults.signer,
+    batchedExecution: opts.batchedExecution ?? defaults.batchedExecution,
+    ERC7579Modules: opts.ERC7579Modules ?? defaults.ERC7579Modules,
+  };
+}
+
+export function printAccount(opts: AccountOptions = defaults): string {
+  return printContract(buildAccount(opts));
+}
+
+export function buildAccount(opts: AccountOptions): Contract {
+  const allOpts = withDefaults(opts);
+
+  allOpts.upgradeable = false; // Upgradeability is not yet available for the community contracts
+  allOpts.access = false; // Access control options are not used for Account
+
+  const c = new ContractBuilder(allOpts.name);
+
+  addParents(c, allOpts);
+  overrideRawSignatureValidation(c, allOpts);
+  setInfo(c, allOpts.info);
+
+  if (opts.ERC7579Modules) {
+    c.addImportOnly({
+      name: 'PackedUserOperation',
+      path: '@openzeppelin/contracts/interfaces/draft-IERC4337.sol',
+    });
+  }
+
+  return c;
+}
+
+function addParents(c: ContractBuilder, opts: AccountOptions): void {
+  // Base
+  c.addParent({
+    name: 'Account',
+    path: `@openzeppelin/community-contracts/account/Account.sol`,
+  });
+  c.addOverride({ name: 'Account' }, functions._validateUserOp);
+
+  if (opts.signatureValidation === 'ERC7739') addEIP712(c, opts);
+
+  // Extensions
+  addSignatureValidation(c, opts);
+  addERC7579Modules(c, opts);
+  addSigner(c, opts.signer ?? false);
+  addMultisigFunctions(c, opts);
+  addBatchedExecution(c, opts);
+  addERC721Holder(c, opts);
+  addERC1155Holder(c, opts);
+}
+
+function addSignatureValidation(c: ContractBuilder, opts: AccountOptions) {
+  switch (opts.signatureValidation) {
+    case 'ERC7739':
+      c.addParent({
+        name: 'ERC7739',
+        path: '@openzeppelin/community-contracts/utils/cryptography/ERC7739.sol',
+      });
+      break;
+    case 'ERC1271':
+      c.addParent({
+        name: 'IERC1271',
+        path: '@openzeppelin/contracts/interfaces/IERC1271.sol',
+      });
+      c.addOverride({ name: 'IERC1271' }, functions.isValidSignature);
+      if (!opts.ERC7579Modules) {
+        c.setFunctionBody(
+          [
+            'return _rawSignatureValidation(hash, signature) ? IERC1271.isValidSignature.selector : bytes4(0xffffffff);',
+          ],
+          functions.isValidSignature,
+        );
+      }
+      break;
+  }
+}
+
+function addERC721Holder(c: ContractBuilder, opts: AccountOptions): void {
+  if (!opts.ERC721Holder) return;
+  c.addParent({
+    name: 'ERC721Holder',
+    path: '@openzeppelin/contracts/token/ERC721/utils/ERC721Holder.sol',
+  });
+}
+
+function addERC1155Holder(c: ContractBuilder, opts: AccountOptions): void {
+  if (!opts.ERC1155Holder) return;
+  c.addParent({
+    name: 'ERC1155Holder',
+    path: '@openzeppelin/contracts/token/ERC1155/utils/ERC1155Holder.sol',
+  });
+}
+
+function addBatchedExecution(c: ContractBuilder, opts: AccountOptions): void {
+  // ERC-7579 is a superset of ERC-7821
+  if (!opts.batchedExecution || !!opts.ERC7579Modules) return;
+  c.addParent({
+    name: 'ERC7821',
+    path: '@openzeppelin/community-contracts/account/extensions/ERC7821.sol',
+  });
+  c.addOverride({ name: 'ERC7821' }, functions._erc7821AuthorizedExecutor);
+  c.setFunctionBody(
+    ['return caller == address(entryPoint()) || super._erc7821AuthorizedExecutor(caller, mode, executionData);'],
+    functions._erc7821AuthorizedExecutor,
+  );
+}
+
+function addERC7579Modules(c: ContractBuilder, opts: AccountOptions): void {
+  if (!opts.ERC7579Modules) return;
+  c.addParent({
+    name: opts.ERC7579Modules,
+    path: `@openzeppelin/community-contracts/account/extensions/${opts.ERC7579Modules}.sol`,
+  });
+  if (opts.ERC7579Modules !== 'AccountERC7579') {
+    c.addImportOnly({
+      name: 'AccountERC7579',
+      path: `@openzeppelin/community-contracts/account/extensions/AccountERC7579.sol`,
+    });
+  }
+  c.addOverride({ name: 'AccountERC7579' }, functions.isValidSignature);
+  c.addOverride({ name: 'AccountERC7579' }, functions._validateUserOp);
+
+  if (opts.signatureValidation !== 'ERC7739') return;
+  c.addOverride({ name: 'ERC7739' }, functions.isValidSignature);
+  c.setFunctionBody(
+    [
+      '// 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;',
+    ],
+    functions.isValidSignature,
+  );
+}
+
+function addMultisigFunctions(c: ContractBuilder, opts: AccountOptions): void {
+  switch (opts.signer) {
+    case 'MultisigWeighted':
+      c.addFunctionCode(
+        `_setSignerWeights(${functions.setSignerWeights.args.map(({ name }) => name).join(', ')});`,
+        functions.setSignerWeights,
+      );
+    // eslint-disable-next-line no-fallthrough
+    case 'Multisig':
+      c.addFunctionCode(`_addSigners(${functions.addSigners.args[0]!.name});`, functions.addSigners);
+      c.addFunctionCode(`_removeSigners(${functions.removeSigners.args[0]!.name});`, functions.removeSigners);
+      c.addFunctionCode(`_setThreshold(${functions.setThreshold.args[0]!.name});`, functions.setThreshold);
+      break;
+    default:
+  }
+}
+
+function addEIP712(c: ContractBuilder, opts: AccountOptions): void {
+  if (opts.signatureValidation != 'ERC7739') return;
+  c.addParent(
+    {
+      name: 'EIP712',
+      path: '@openzeppelin/contracts/utils/cryptography/EIP712.sol',
+    },
+    [opts.name, '1'],
+  );
+}
+
+function overrideRawSignatureValidation(c: ContractBuilder, opts: AccountOptions): void {
+  if (opts.signer && !opts.ERC7579Modules) return; // Signer implements _rawSignatureValidation alone
+  if (!opts.signer && opts.ERC7579Modules) return; // AccountERC7579 implements _rawSignatureValidation alone
+
+  // If no signer or ERC-7579 is used, we need to override the _rawSignatureValidation function
+  // to provide a custom validation logic
+  if (!opts.signer && !opts.ERC7579Modules) {
+    // Custom validation logic
+    c.addOverride({ name: 'Account' }, signerFunctions._rawSignatureValidation);
+    c.setFunctionBody(['// Custom validation logic', 'return false;'], signerFunctions._rawSignatureValidation);
+  }
+
+  // Dissambiguate between Signer and AccountERC7579
+  if (opts.signer && opts.ERC7579Modules) {
+    c.addImportOnly({
+      name: 'AbstractSigner',
+      path: '@openzeppelin/community-contracts/utils/cryptography/AbstractSigner.sol',
+    });
+    c.addOverride({ name: 'AbstractSigner' }, signerFunctions._rawSignatureValidation);
+    c.addOverride({ name: 'AccountERC7579' }, signerFunctions._rawSignatureValidation);
+    c.setFunctionComments(
+      [
+        `// IMPORTANT: Make sure Signer${opts.signer} is most derived than AccountERC7579`,
+        `// in the inheritance chain (i.e. contract ... is AccountERC7579, ..., Signer${opts.signer})`,
+        '// to ensure the correct order of function resolution.',
+        '// AccountERC7579 returns false for `_rawSignatureValidation`',
+      ],
+      signerFunctions._rawSignatureValidation,
+    );
+    // Base override for `_rawSignatureValidation` given MultiSignerERC7913Weighted is MultiSignerERC7913
+    if (opts.signer === 'MultisigWeighted') {
+      c.addImportOnly(signers.Multisig);
+    }
+  }
+}
+
+const functions = {
+  ...defineFunctions({
+    isValidSignature: {
+      kind: 'public' as const,
+      mutability: 'view' as const,
+      args: [
+        { name: 'hash', type: 'bytes32' },
+        { name: 'signature', type: 'bytes calldata' },
+      ],
+      returns: ['bytes4'],
+    },
+    _validateUserOp: {
+      kind: 'internal' as const,
+      args: [
+        { name: 'userOp', type: 'PackedUserOperation calldata' },
+        { name: 'userOpHash', type: 'bytes32' },
+      ],
+      returns: ['uint256'],
+    },
+    _erc7821AuthorizedExecutor: {
+      kind: 'internal' as const,
+      args: [
+        { name: 'caller', type: 'address' },
+        { name: 'mode', type: 'bytes32' },
+        { name: 'executionData', type: 'bytes calldata' },
+      ],
+      returns: ['bool'],
+      mutability: 'view' as const,
+    },
+    addSigners: {
+      kind: 'public' as const,
+      args: [{ name: 'signers', type: 'bytes[] memory' }],
+    },
+    removeSigners: {
+      kind: 'public' as const,
+      args: [{ name: 'signers', type: 'bytes[] memory' }],
+    },
+    setThreshold: {
+      kind: 'public' as const,
+      args: [{ name: 'threshold', type: 'uint256' }],
+    },
+    setSignerWeights: {
+      kind: 'public' as const,
+      args: [
+        { name: 'signers', type: 'bytes[] memory' },
+        { name: 'weights', type: 'uint256[] memory' },
+      ],
+    },
+  }),
+};