@openzeppelin/wizard 0.9.0 → 0.10.2

package/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",
+    "hardhat": "^2.22.0"
   }
-}
+}

package/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",
+        "@openzeppelin/contracts-upgradeable": "^5.5.0",
         "@openzeppelin/hardhat-upgrades": "^3.0.0",
-        "hardhat": "^2.16.1"
+        "hardhat": "^2.22.0"
       }
     },
     "node_modules/@adraffy/ens-normalize": {
@@ -1924,20 +1924,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",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.5.0.tgz",
+      "integrity": "sha512-R8hq4zmKKWP2c7OxeRgAcjZwvF5W0Qq2OIX7degrtdM52Q9xYr4MLJdUAVPKGUewNJ1qo+M6YiZLLnNUnjP/gg==",
       "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",
+      "resolved": "https://registry.npmjs.org/@openzeppelin/contracts-upgradeable/-/contracts-upgradeable-5.5.0.tgz",
+      "integrity": "sha512-Va5hKG5oaK0EE5bXTVWugcGimMHazxL+SL523dH6WVbGiuLXwuWr9oxtLyPHQSVGtgmlIgtKNR5V+OUpCIUwFQ==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
-        "@openzeppelin/contracts": "5.4.0"
+        "@openzeppelin/contracts": "5.5.0"
       }
     },
     "node_modules/@openzeppelin/defender-sdk-base-client": {
@@ -3963,19 +3963,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": {
@@ -5486,9 +5495,9 @@
       }
     },
     "node_modules/hardhat": {
-      "version": "2.26.3",
-      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.26.3.tgz",
-      "integrity": "sha512-gBfjbxCCEaRgMCRgTpjo1CEoJwqNPhyGMMVHYZJxoQ3LLftp2erSVf8ZF6hTQC0r2wst4NcqNmLWqMnHg1quTw==",
+      "version": "2.26.5",
+      "resolved": "https://registry.npmjs.org/hardhat/-/hardhat-2.26.5.tgz",
+      "integrity": "sha512-TvFKUPGRaoemeVpnKsXt5I+kVCNrzP2cLwyNUveu0JKf2Q0lzh6LTgVBsWyYPlXAwBzyUQ6fsL98UgyF/QdOfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -5718,6 +5727,22 @@
         "@scure/base": "~1.1.0"
       }
     },
+    "node_modules/hardhat/node_modules/chokidar": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
+      "integrity": "sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "readdirp": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14.16.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/hardhat/node_modules/ethereum-cryptography": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-1.2.0.tgz",
@@ -5756,6 +5781,20 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/hardhat/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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14.18.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/hardhat/node_modules/universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -6772,31 +6811,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 +6845,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",
@@ -7500,17 +7501,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": {
@@ -8643,14 +8643,14 @@
       }
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fdir": "^6.4.4",
-        "picomatch": "^4.0.2"
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": ">=12.0.0"

package/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",
+    "@openzeppelin/contracts-upgradeable": "^5.5.0",
+    "@openzeppelin/hardhat-upgrades": "^3.0.0",
+    "hardhat": "^2.22.0"
   }
-}
+}

package/src/erc20.ts

@@ -237,7 +237,7 @@ function addPremint(
  * Check for potential premint overflow assuming the user's contract has decimals() = 18
  *
  * @param baseUnits The base units of the token, before applying power of 10
- * @param decimalPlace If positive, the number of assumed decimal places in the least significant digits of `validatedBaseUnits`. Ignored if <= 0.
+ * @param decimalPlace If positive, the number of assumed decimal places in the least significant digits of `baseUnits`. Ignored if <= 0.
  * @throws OptionsError if the calculated value would overflow uint256
  */
 function checkPotentialPremintOverflow(baseUnits: bigint, decimalPlace: number) {

package/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', 'Multisig', 'MultisigWeighted', 'P256', 'RSA', 'WebAuthn'] as const,
   batchedExecution: [false, true] as const,
   ERC7579Modules: [false, 'AccountERC7579', 'AccountERC7579Hooked'] as const,
   access: [false] as const,

package/src/generate/stablecoin.ts

@@ -43,8 +43,8 @@ const erc20Full = {
 };
 
 const stablecoinExtensions = {
-  limitations: [false, 'allowlist', 'blocklist'] as const,
-  custodian: booleans,
+  restrictions: [false, 'allowlist', 'blocklist'] as const,
+  freezable: booleans,
   upgradeable: [false] as const,
 };
 

package/src/get-versioned-remappings.ts

@@ -0,0 +1,10 @@
+import type { CommonOptions } from './common-options';
+import contracts from '../openzeppelin-contracts';
+
+export function getVersionedRemappings(opts?: CommonOptions): string[] {
+  const remappings = [`@openzeppelin/contracts/=@openzeppelin/contracts@${contracts.version}/`];
+  if (opts?.upgradeable) {
+    remappings.push(`@openzeppelin/contracts-upgradeable/=@openzeppelin/contracts-upgradeable@${contracts.version}/`);
+  }
+  return remappings;
+}

package/src/print.ts

@@ -101,16 +101,20 @@ function printConstructor(contract: Contract, helpers: Helpers): Lines[] {
   if (hasParentParams || hasConstructorCode || (helpers.upgradeable && parentsWithInitializers.length > 0)) {
     if (helpers.upgradeable) {
       const upgradeableParents = parentsWithInitializers.filter(p => inferTranspiled(p.contract));
-      const nonUpgradeableParents = contract.parents.filter(p => !inferTranspiled(p.contract));
+      // Omit Initializable and UUPSUpgradeable since they don't have explicit constructors
+      const nonUpgradeableParentsWithConstructors = contract.parents.filter(
+        p =>
+          !inferTranspiled(p.contract) && p.contract.name !== 'Initializable' && p.contract.name !== 'UUPSUpgradeable',
+      );
       const constructor = printFunction2(
         [
-          nonUpgradeableParents.length > 0
+          nonUpgradeableParentsWithConstructors.length > 0
             ? '/// @custom:oz-upgrades-unsafe-allow-reachable constructor'
             : '/// @custom:oz-upgrades-unsafe-allow constructor',
         ],
         'constructor',
         [],
-        nonUpgradeableParents.flatMap(p => printParentConstructor(p, helpers)),
+        nonUpgradeableParentsWithConstructors.flatMap(p => printParentConstructor(p, helpers)),
         ['_disableInitializers();'],
       );
       const initializer = printFunction2(

package/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);

package/src/signer.ts

@@ -3,7 +3,16 @@ 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',
+  'Multisig',
+  'MultisigWeighted',
+  'P256',
+  'RSA',
+  'WebAuthn',
+] as const;
 export type SignerOptions = (typeof SignerOptions)[number];
 
 export function addSigner(c: ContractBuilder, signer: SignerOptions, upgradeable: Upgradeable): void {
@@ -13,11 +22,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',
         });
       }
@@ -34,25 +43,37 @@ export function addSigner(c: ContractBuilder, signer: SignerOptions, upgradeable
       );
       break;
     }
+    case 'WebAuthn': {
+      signerArgs.P256.forEach(arg => c.addConstructorArgument(arg));
+      c.addParent(
+        signers.P256,
+        signerArgs.P256.map(arg => ({ lit: arg.name })),
+      );
+      c.addParent(signers[signer]);
+      c.addImportOnly({
+        name: 'AbstractSigner',
+        path: '@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol',
+        transpiled: false,
+      });
+      c.addOverride({ name: 'AbstractSigner', transpiled: false }, signerFunctions._rawSignatureValidation);
+      c.addOverride({ name: 'SignerP256' }, signerFunctions._rawSignatureValidation);
+      break;
+    }
+    default: {
+      const _: never = signer;
+      throw new Error('Unknown signer');
+    }
   }
 }
 
 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',
   },
-  P256: {
-    name: 'SignerP256',
-    path: '@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol',
-  },
-  RSA: {
-    name: 'SignerRSA',
-    path: '@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol',
+  EIP7702: {
+    name: 'SignerEIP7702',
+    path: '@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol',
   },
   Multisig: {
     name: 'MultiSignerERC7913',
@@ -62,18 +83,26 @@ export const signers = {
     name: 'MultiSignerERC7913Weighted',
     path: '@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol',
   },
+  P256: {
+    name: 'SignerP256',
+    path: '@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol',
+  },
+  RSA: {
+    name: 'SignerRSA',
+    path: '@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol',
+  },
+  WebAuthn: {
+    name: 'SignerWebAuthn',
+    path: '@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol',
+  },
 };
 
-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' },
     { name: 'qy', type: 'bytes32' },
   ],
-  RSA: [
-    { name: 'e', type: 'bytes memory' },
-    { name: 'n', type: 'bytes memory' },
-  ],
   Multisig: [
     { name: 'signers', type: 'bytes[] memory' },
     { name: 'threshold', type: 'uint64' },
@@ -83,6 +112,11 @@ export const signerArgs: Record<Exclude<SignerOptions, false | 'ERC7702'>, { nam
     { name: 'weights', type: 'uint64[] memory' },
     { name: 'threshold', type: 'uint64' },
   ],
+  RSA: [
+    { name: 'e', type: 'bytes memory' },
+    { name: 'n', type: 'bytes memory' },
+  ],
+  WebAuthn: [],
 };
 
 export const signerFunctions = defineFunctions({

package/src/stablecoin.ts

@@ -1,6 +1,6 @@
 import type { Contract, ContractBuilder } from './contract';
 import type { Access } from './set-access-control';
-import { setAccessControl, requireAccessControl } from './set-access-control';
+import { requireAccessControl } from './set-access-control';
 import { defineFunctions } from './utils/define-functions';
 import { printContract } from './print';
 import type { ERC20Options } from './erc20';
@@ -12,16 +12,16 @@ import {
 } from './erc20';
 
 export interface StablecoinOptions extends ERC20Options {
-  limitations?: false | 'allowlist' | 'blocklist';
-  custodian?: boolean;
+  restrictions?: false | 'allowlist' | 'blocklist';
+  freezable?: boolean;
 }
 
 export const defaults: Required<StablecoinOptions> = {
   ...erc20defaults,
   name: 'MyStablecoin',
   symbol: 'MST',
-  limitations: false,
-  custodian: false,
+  restrictions: false,
+  freezable: false,
 } as const;
 
 function withDefaults(opts: StablecoinOptions): Required<StablecoinOptions> {
@@ -29,8 +29,8 @@ function withDefaults(opts: StablecoinOptions): Required<StablecoinOptions> {
     ...withERC20Defaults(opts),
     name: opts.name ?? defaults.name,
     symbol: opts.symbol ?? defaults.symbol,
-    limitations: opts.limitations ?? defaults.limitations,
-    custodian: opts.custodian ?? defaults.custodian,
+    restrictions: opts.restrictions ?? defaults.restrictions,
+    freezable: opts.freezable ?? defaults.freezable,
   };
 }
 
@@ -39,7 +39,7 @@ export function printStablecoin(opts: StablecoinOptions = defaults): string {
 }
 
 export function isAccessControlRequired(opts: Partial<StablecoinOptions>): boolean {
-  return opts.mintable || opts.limitations !== false || opts.custodian || opts.pausable || opts.upgradeable === 'uups';
+  return opts.mintable || opts.restrictions !== false || opts.freezable || opts.pausable || opts.upgradeable === 'uups';
 }
 
 export function buildStablecoin(opts: StablecoinOptions): Contract {
@@ -50,96 +50,70 @@ export function buildStablecoin(opts: StablecoinOptions): Contract {
 
   const c = buildERC20(allOpts);
 
-  if (allOpts.custodian) {
-    addCustodian(c, allOpts.access);
+  if (allOpts.freezable) {
+    addFreezable(c, allOpts.access);
   }
 
-  if (allOpts.limitations) {
-    addLimitations(c, allOpts.access, allOpts.limitations);
+  if (allOpts.restrictions) {
+    addRestrictions(c, allOpts.access, allOpts.restrictions);
   }
 
   return c;
 }
 
-function addLimitations(c: ContractBuilder, access: Access, mode: boolean | 'allowlist' | 'blocklist') {
-  const type = mode === 'allowlist';
-  const ERC20Limitation = {
-    name: type ? 'ERC20Allowlist' : 'ERC20Blocklist',
-    path: `@openzeppelin/community-contracts/token/ERC20/extensions/${type ? 'ERC20Allowlist' : 'ERC20Blocklist'}.sol`,
+function addRestrictions(c: ContractBuilder, access: Access, mode: 'allowlist' | 'blocklist') {
+  const isAllowlist = mode === 'allowlist';
+  const ERC20Restricted = {
+    name: 'ERC20Restricted',
+    path: `@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Restricted.sol`,
   };
 
-  c.addParent(ERC20Limitation);
-  c.addOverride(ERC20Limitation, functions._update);
-  c.addOverride(ERC20Limitation, functions._approve);
+  c.addParent(ERC20Restricted);
+  c.addOverride(ERC20Restricted, functions._update);
 
-  const [addFn, removeFn] = type
+  if (isAllowlist) {
+    c.addOverride(ERC20Restricted, functions.isUserAllowed);
+    c.setFunctionBody([`return getRestriction(user) == Restriction.ALLOWED;`], functions.isUserAllowed);
+  }
+
+  const [addFn, removeFn] = isAllowlist
     ? [functions.allowUser, functions.disallowUser]
     : [functions.blockUser, functions.unblockUser];
 
   requireAccessControl(c, addFn, access, 'LIMITER', 'limiter');
-  c.addFunctionCode(`_${type ? 'allowUser' : 'blockUser'}(user);`, addFn);
+  c.addFunctionCode(`_${isAllowlist ? 'allow' : 'block'}User(user);`, addFn);
 
   requireAccessControl(c, removeFn, access, 'LIMITER', 'limiter');
-  c.addFunctionCode(`_${type ? 'disallowUser' : 'unblockUser'}(user);`, removeFn);
+  c.addFunctionCode(`_resetUser(user);`, removeFn);
 }
 
-function addCustodian(c: ContractBuilder, access: Access) {
-  const ERC20Custodian = {
-    name: 'ERC20Custodian',
-    path: '@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Custodian.sol',
+function addFreezable(c: ContractBuilder, access: Access) {
+  const ERC20Freezable = {
+    name: 'ERC20Freezable',
+    path: '@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Freezable.sol',
   };
 
-  c.addParent(ERC20Custodian);
-  c.addOverride(ERC20Custodian, functions._update);
-  c.addOverride(ERC20Custodian, functions._isCustodian);
+  c.addParent(ERC20Freezable);
+  c.addOverride(ERC20Freezable, functions._update);
 
   if (access === false) {
     access = 'ownable';
   }
 
-  setAccessControl(c, access);
-
-  switch (access) {
-    case 'ownable': {
-      c.setFunctionBody([`return user == owner();`], functions._isCustodian);
-      break;
-    }
-    case 'roles': {
-      const roleOwner = 'custodian';
-      const roleId = 'CUSTODIAN_ROLE';
-      const addedConstant = c.addConstantOrImmutableOrErrorDefinition(
-        `bytes32 public constant ${roleId} = keccak256("${roleId}");`,
-      );
-      if (roleOwner && addedConstant) {
-        c.addConstructorArgument({ type: 'address', name: roleOwner });
-        c.addConstructorCode(`_grantRole(${roleId}, ${roleOwner});`);
-      }
-      c.setFunctionBody([`return hasRole(CUSTODIAN_ROLE, user);`], functions._isCustodian);
-      break;
-    }
-    case 'managed': {
-      c.addImportOnly({
-        name: 'AuthorityUtils',
-        path: `@openzeppelin/contracts/access/manager/AuthorityUtils.sol`,
-      });
-      const logic = [
-        `(bool immediate,) = AuthorityUtils.canCallWithDelay(authority(), user, address(this), bytes4(_msgData()[0:4]));`,
-        `return immediate;`,
-      ];
-      c.setFunctionBody(logic, functions._isCustodian);
-      break;
-    }
-  }
+  const freezeFn = functions.freeze;
+  requireAccessControl(c, freezeFn, access, 'FREEZER', 'freezer');
+  c.setFunctionBody([`_setFrozen(user, amount);`], freezeFn);
 }
 
 const functions = {
   ...erc20functions,
   ...defineFunctions({
-    _isCustodian: {
-      kind: 'internal' as const,
-      args: [{ name: 'user', type: 'address' }],
-      returns: ['bool'],
-      mutability: 'view' as const,
+    freeze: {
+      kind: 'public' as const,
+      args: [
+        { name: 'user', type: 'address' },
+        { name: 'amount', type: 'uint256' },
+      ],
     },
 
     allowUser: {
@@ -161,5 +135,12 @@ const functions = {
       kind: 'public' as const,
       args: [{ name: 'user', type: 'address' }],
     },
+
+    isUserAllowed: {
+      kind: 'public' as const,
+      args: [{ name: 'user', type: 'address' }],
+      returns: ['bool'],
+      mutability: 'view' as const,
+    },
   }),
 };