@openzeppelin/wizard 0.10.0 → 0.10.3

package/README.md

@@ -24,81 +24,42 @@ The following contract types are supported:
 
 Note that `stablecoin` and `realWorldAsset` are experimental and may be subject to change.
 
-Each contract type has functions/constants as defined below.
-
 ### Functions
 
+Each contract type implements a common API with methods that take contract-specific options (e.g., `ERC20Options` for `erc20`, `ERC721Options` for `erc721`, etc.). This ensures type safety and allows for contract-specific features.
+
 #### `print`
 ```js
-function print(opts?: ERC20Options): string
-```
-```js
-function print(opts?: ERC721Options): string
-```
-```js
-function print(opts?: ERC1155Options): string
-```
-```js
-function print(opts?: StablecoinOptions): string
-```
-```js
-function print(opts?: AccountOptions): string
-```
-```js
-function print(opts?: GovernorOptions): string
-```
-```js
-function print(opts?: CustomOptions): string
+function print(opts?: Options): string
 ```
 Returns a string representation of a contract generated using the provided options. If `opts` is not provided, uses [`defaults`](#defaults).
 
-#### `defaults`
-```js
-const defaults: Required<ERC20Options>
-```
-```js
-const defaults: Required<ERC721Options>
-```
-```js
-const defaults: Required<ERC1155Options>
-```
-```js
-const defaults: Required<StablecoinOptions>
-```
+#### `getVersionedRemappings`
 ```js
-const defaults: Required<AccountOptions>
+function getVersionedRemappings(opts?: Options): string[]
 ```
+Returns an array of remappings that map unversioned import prefixes to versioned import prefixes. For example:
 ```js
-const defaults: Required<GovernorOptions>
+[
+  "@openzeppelin/contracts/=@openzeppelin/contracts@5.5.0/",
+  "@openzeppelin/contracts-upgradeable/=@openzeppelin/contracts-upgradeable@5.5.0/"
+]
 ```
+If the contract options include upgradeability, the upgradeable remapping is included. If `opts` is not provided, uses [`defaults`](#defaults).
+
+#### `defaults`
 ```js
-const defaults: Required<CustomOptions>
+const defaults: Required<Options>
 ```
-The default options that are used for [`print`](#print).
+The default options that are used for [`print`](#print) and [`getVersionedRemappings`](#getVersionedRemappings).
 
 #### `isAccessControlRequired`
 ```js
-function isAccessControlRequired(opts: Partial<ERC20Options>): boolean
-```
-```js
-function isAccessControlRequired(opts: Partial<ERC721Options>): boolean
-```
-```js
-function isAccessControlRequired(opts: Partial<ERC1155Options>): boolean
-```
-```js
-function isAccessControlRequired(opts: Partial<StablecoinOptions>): boolean
-```
-```js
-function isAccessControlRequired(opts: Partial<GovernorOptions>): boolean
-```
-```js
-function isAccessControlRequired(opts: Partial<CustomOptions>): boolean
+function isAccessControlRequired(opts: Partial<Options>): 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`.
 
-> 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`.
+> Note that contracts such as `account` have their own way of handling permissions and do not support the `access` option. Thus, that type does not include `isAccessControlRequired`.
 
 ### Examples
 
@@ -129,4 +90,3 @@ const contract = erc20.print({
   ...erc20.defaults,
   upgradeable: 'uups',
 });
-```

package/dist/account.js

@@ -201,16 +201,20 @@ function overrideRawSignatureValidation(c, opts) {
     // Disambiguate between Signer and AccountERC7579
     if (opts.signer && opts.ERC7579Modules) {
         const accountName = opts.upgradeable ? (0, options_1.upgradeableName)('AccountERC7579') : 'AccountERC7579';
-        const signerName = opts.upgradeable ? (0, options_1.upgradeableName)(`Signer${opts.signer}`) : `Signer${opts.signer}`;
-        c.addImportOnly({
-            name: 'AbstractSigner',
-            path: '@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol',
-            transpiled: false,
-        });
-        c.addOverride({ name: 'AbstractSigner', transpiled: false }, signer_1.signerFunctions._rawSignatureValidation);
+        const signerBaseName = signer_1.signers[opts.signer].name;
+        const signerName = opts.upgradeable ? (0, options_1.upgradeableName)(signerBaseName) : signerBaseName;
+        // WebAuthnSigner depends inherits from P256Signer, so the AbstractSigner override is handled by `addSigner`
+        if (opts.signer !== 'WebAuthn') {
+            c.addImportOnly({
+                name: 'AbstractSigner',
+                path: '@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol',
+                transpiled: false,
+            });
+            c.addOverride({ name: 'AbstractSigner', transpiled: false }, signer_1.signerFunctions._rawSignatureValidation);
+        }
         c.addOverride({ name: 'AccountERC7579' }, signer_1.signerFunctions._rawSignatureValidation);
         c.setFunctionComments([
-            `// IMPORTANT: Make sure ${signerName} is most derived than ${accountName}`,
+            `// IMPORTANT: Make sure ${signerName} is more derived than ${accountName}`,
             `// in the inheritance chain (i.e. contract ... is ${accountName}, ..., ${signerName})`,
             '// to ensure the correct order of function resolution.',
             `// ${accountName} returns false for _rawSignatureValidation`,

package/dist/account.js.map

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

package/dist/api.d.ts

@@ -11,6 +11,17 @@ export interface WizardContractAPI<Options extends CommonOptions> {
      * Returns a string representation of a contract generated using the provided options. If opts is not provided, uses `defaults`.
      */
     print: (opts?: Options) => string;
+    /**
+     * Returns remappings that map unversioned import prefixes to versioned import prefixes.
+     * @example
+     * ```ts
+     * [
+     *   "@openzeppelin/contracts/=@openzeppelin/contracts@5.5.0/",
+     *   "@openzeppelin/contracts-upgradeable/=@openzeppelin/contracts-upgradeable@5.5.0/"
+     * ]
+     * ```
+     */
+    getVersionedRemappings: (opts?: Options) => string[];
     /**
      * The default options that are used for `print`.
      */

package/dist/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAM5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAM9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAMhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAMtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAMlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAO9C,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,aAAa;IAC9D;;OAEG;IACH,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;IAElC;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB,CAAC,OAAO,SAAS,aAAa;IAC7D;;;OAGG;IACH,uBAAuB,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC;CAC9D;AAED,MAAM,MAAM,KAAK,GAAG,iBAAiB,CAAC,YAAY,CAAC,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACrF,MAAM,MAAM,MAAM,GAAG,iBAAiB,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;AACxF,MAAM,MAAM,OAAO,GAAG,iBAAiB,CAAC,cAAc,CAAC,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;AAC3F,MAAM,MAAM,UAAU,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;AACpG,MAAM,MAAM,cAAc,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;AACxG,MAAM,MAAM,OAAO,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;AACxD,MAAM,MAAM,QAAQ,GAAG,iBAAiB,CAAC,eAAe,CAAC,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;AAC9F,MAAM,MAAM,MAAM,GAAG,iBAAiB,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;AAExF,eAAO,MAAM,KAAK,EAAE,KAInB,CAAC;AACF,eAAO,MAAM,MAAM,EAAE,MAIpB,CAAC;AACF,eAAO,MAAM,OAAO,EAAE,OAIrB,CAAC;AACF,eAAO,MAAM,UAAU,EAAE,UAIxB,CAAC;AACF,eAAO,MAAM,OAAO,EAAE,OAGrB,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,cAI5B,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,QAItB,CAAC;AACF,eAAO,MAAM,MAAM,EAAE,MAIpB,CAAC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAM5C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAM9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAMhD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAMtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAMlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAQ9C,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,aAAa;IAC9D;;OAEG;IACH,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;IAElC;;;;;;;;;OASG;IACH,sBAAsB,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,KAAK,MAAM,EAAE,CAAC;IAErD;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB,CAAC,OAAO,SAAS,aAAa;IAC7D;;;OAGG;IACH,uBAAuB,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC;CAC9D;AAED,MAAM,MAAM,KAAK,GAAG,iBAAiB,CAAC,YAAY,CAAC,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACrF,MAAM,MAAM,MAAM,GAAG,iBAAiB,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;AACxF,MAAM,MAAM,OAAO,GAAG,iBAAiB,CAAC,cAAc,CAAC,GAAG,gBAAgB,CAAC,cAAc,CAAC,CAAC;AAC3F,MAAM,MAAM,UAAU,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;AACpG,MAAM,MAAM,cAAc,GAAG,iBAAiB,CAAC,iBAAiB,CAAC,GAAG,gBAAgB,CAAC,iBAAiB,CAAC,CAAC;AACxG,MAAM,MAAM,OAAO,GAAG,iBAAiB,CAAC,cAAc,CAAC,CAAC;AACxD,MAAM,MAAM,QAAQ,GAAG,iBAAiB,CAAC,eAAe,CAAC,GAAG,gBAAgB,CAAC,eAAe,CAAC,CAAC;AAC9F,MAAM,MAAM,MAAM,GAAG,iBAAiB,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAAC,aAAa,CAAC,CAAC;AAExF,eAAO,MAAM,KAAK,EAAE,KAKnB,CAAC;AACF,eAAO,MAAM,MAAM,EAAE,MAKpB,CAAC;AACF,eAAO,MAAM,OAAO,EAAE,OAKrB,CAAC;AACF,eAAO,MAAM,UAAU,EAAE,UAKxB,CAAC;AACF,eAAO,MAAM,OAAO,EAAE,OAIrB,CAAC;AACF,eAAO,MAAM,cAAc,EAAE,cAK5B,CAAC;AACF,eAAO,MAAM,QAAQ,EAAE,QAKtB,CAAC;AACF,eAAO,MAAM,MAAM,EAAE,MAKpB,CAAC"}

package/dist/api.js

@@ -8,42 +8,51 @@ const stablecoin_1 = require("./stablecoin");
 const account_1 = require("./account");
 const governor_1 = require("./governor");
 const custom_1 = require("./custom");
+const get_versioned_remappings_1 = require("./get-versioned-remappings");
 exports.erc20 = {
     print: erc20_1.printERC20,
+    getVersionedRemappings: get_versioned_remappings_1.getVersionedRemappings,
     defaults: erc20_1.defaults,
     isAccessControlRequired: erc20_1.isAccessControlRequired,
 };
 exports.erc721 = {
     print: erc721_1.printERC721,
+    getVersionedRemappings: get_versioned_remappings_1.getVersionedRemappings,
     defaults: erc721_1.defaults,
     isAccessControlRequired: erc721_1.isAccessControlRequired,
 };
 exports.erc1155 = {
     print: erc1155_1.printERC1155,
+    getVersionedRemappings: get_versioned_remappings_1.getVersionedRemappings,
     defaults: erc1155_1.defaults,
     isAccessControlRequired: erc1155_1.isAccessControlRequired,
 };
 exports.stablecoin = {
     print: stablecoin_1.printStablecoin,
+    getVersionedRemappings: get_versioned_remappings_1.getVersionedRemappings,
     defaults: stablecoin_1.defaults,
     isAccessControlRequired: stablecoin_1.isAccessControlRequired,
 };
 exports.account = {
     print: account_1.printAccount,
+    getVersionedRemappings: get_versioned_remappings_1.getVersionedRemappings,
     defaults: account_1.defaults,
 };
 exports.realWorldAsset = {
     print: stablecoin_1.printStablecoin,
+    getVersionedRemappings: get_versioned_remappings_1.getVersionedRemappings,
     defaults: stablecoin_1.defaults,
     isAccessControlRequired: stablecoin_1.isAccessControlRequired,
 };
 exports.governor = {
     print: governor_1.printGovernor,
+    getVersionedRemappings: get_versioned_remappings_1.getVersionedRemappings,
     defaults: governor_1.defaults,
     isAccessControlRequired: governor_1.isAccessControlRequired,
 };
 exports.custom = {
     print: custom_1.printCustom,
+    getVersionedRemappings: get_versioned_remappings_1.getVersionedRemappings,
     defaults: custom_1.defaults,
     isAccessControlRequired: custom_1.isAccessControlRequired,
 };

package/dist/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";;;AAEA,mCAIiB;AAEjB,qCAIkB;AAElB,uCAImB;AAEnB,6CAIsB;AAEtB,uCAAsE;AAEtE,yCAIoB;AAEpB,qCAIkB;AA+BL,QAAA,KAAK,GAAU;IAC1B,KAAK,EAAE,kBAAU;IACjB,QAAQ,EAAE,gBAAa;IACvB,uBAAuB,EAAE,+BAA4B;CACtD,CAAC;AACW,QAAA,MAAM,GAAW;IAC5B,KAAK,EAAE,oBAAW;IAClB,QAAQ,EAAE,iBAAc;IACxB,uBAAuB,EAAE,gCAA6B;CACvD,CAAC;AACW,QAAA,OAAO,GAAY;IAC9B,KAAK,EAAE,sBAAY;IACnB,QAAQ,EAAE,kBAAe;IACzB,uBAAuB,EAAE,iCAA8B;CACxD,CAAC;AACW,QAAA,UAAU,GAAe;IACpC,KAAK,EAAE,4BAAe;IACtB,QAAQ,EAAE,qBAAkB;IAC5B,uBAAuB,EAAE,oCAAiC;CAC3D,CAAC;AACW,QAAA,OAAO,GAAY;IAC9B,KAAK,EAAE,sBAAY;IACnB,QAAQ,EAAE,kBAAe;CAC1B,CAAC;AACW,QAAA,cAAc,GAAmB;IAC5C,KAAK,EAAE,4BAAe;IACtB,QAAQ,EAAE,qBAAkB;IAC5B,uBAAuB,EAAE,oCAAiC;CAC3D,CAAC;AACW,QAAA,QAAQ,GAAa;IAChC,KAAK,EAAE,wBAAa;IACpB,QAAQ,EAAE,mBAAgB;IAC1B,uBAAuB,EAAE,kCAA+B;CACzD,CAAC;AACW,QAAA,MAAM,GAAW;IAC5B,KAAK,EAAE,oBAAW;IAClB,QAAQ,EAAE,iBAAc;IACxB,uBAAuB,EAAE,gCAA6B;CACvD,CAAC"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";;;AAEA,mCAIiB;AAEjB,qCAIkB;AAElB,uCAImB;AAEnB,6CAIsB;AAEtB,uCAAsE;AAEtE,yCAIoB;AAEpB,qCAIkB;AAClB,yEAAoE;AA2CvD,QAAA,KAAK,GAAU;IAC1B,KAAK,EAAE,kBAAU;IACjB,sBAAsB,EAAE,iDAAsB;IAC9C,QAAQ,EAAE,gBAAa;IACvB,uBAAuB,EAAE,+BAA4B;CACtD,CAAC;AACW,QAAA,MAAM,GAAW;IAC5B,KAAK,EAAE,oBAAW;IAClB,sBAAsB,EAAE,iDAAsB;IAC9C,QAAQ,EAAE,iBAAc;IACxB,uBAAuB,EAAE,gCAA6B;CACvD,CAAC;AACW,QAAA,OAAO,GAAY;IAC9B,KAAK,EAAE,sBAAY;IACnB,sBAAsB,EAAE,iDAAsB;IAC9C,QAAQ,EAAE,kBAAe;IACzB,uBAAuB,EAAE,iCAA8B;CACxD,CAAC;AACW,QAAA,UAAU,GAAe;IACpC,KAAK,EAAE,4BAAe;IACtB,sBAAsB,EAAE,iDAAsB;IAC9C,QAAQ,EAAE,qBAAkB;IAC5B,uBAAuB,EAAE,oCAAiC;CAC3D,CAAC;AACW,QAAA,OAAO,GAAY;IAC9B,KAAK,EAAE,sBAAY;IACnB,sBAAsB,EAAE,iDAAsB;IAC9C,QAAQ,EAAE,kBAAe;CAC1B,CAAC;AACW,QAAA,cAAc,GAAmB;IAC5C,KAAK,EAAE,4BAAe;IACtB,sBAAsB,EAAE,iDAAsB;IAC9C,QAAQ,EAAE,qBAAkB;IAC5B,uBAAuB,EAAE,oCAAiC;CAC3D,CAAC;AACW,QAAA,QAAQ,GAAa;IAChC,KAAK,EAAE,wBAAa;IACpB,sBAAsB,EAAE,iDAAsB;IAC9C,QAAQ,EAAE,mBAAgB;IAC1B,uBAAuB,EAAE,kCAA+B;CACzD,CAAC;AACW,QAAA,MAAM,GAAW;IAC5B,KAAK,EAAE,oBAAW;IAClB,sBAAsB,EAAE,iDAAsB;IAC9C,QAAQ,EAAE,iBAAc;IACxB,uBAAuB,EAAE,gCAA6B;CACvD,CAAC"}

package/dist/erc20.js

@@ -180,7 +180,7 @@ function addPremint(c, amount, premintChainId, crossChainBridging) {
  * 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, decimalPlace) {

package/dist/generate/account.js

@@ -9,7 +9,7 @@ const account = {
     signatureValidation: [false, 'ERC1271', 'ERC7739'],
     ERC721Holder: [false, true],
     ERC1155Holder: [false, true],
-    signer: ['ECDSA', 'EIP7702', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'],
+    signer: ['ECDSA', 'EIP7702', 'Multisig', 'MultisigWeighted', 'P256', 'RSA', 'WebAuthn'],
     batchedExecution: [false, true],
     ERC7579Modules: [false, 'AccountERC7579', 'AccountERC7579Hooked'],
     access: [false],

package/dist/generate/account.js.map

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"","sources":["../../src/generate/account.ts"],"names":[],"mappings":";;AAkBA,wDAEC;AAnBD,0CAA0C;AAC1C,wDAAwD;AACxD,iDAAsD;AAEtD,MAAM,OAAO,GAAG;IACd,IAAI,EAAE,CAAC,WAAW,CAAC;IACnB,mBAAmB,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAU;IAC3D,YAAY,EAAE,CAAC,KAAK,EAAE,IAAI,CAAU;IACpC,aAAa,EAAE,CAAC,KAAK,EAAE,IAAI,CAAU;IACrC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,kBAAkB,CAAU;IACpF,gBAAgB,EAAE,CAAC,KAAK,EAAE,IAAI,CAAU;IACxC,cAAc,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,CAAU;IAC1E,MAAM,EAAE,CAAC,KAAK,CAAU;IACxB,WAAW,EAAE,oCAAkB;IAC/B,IAAI,EAAE,sBAAW;CAClB,CAAC;AAEF,QAAe,CAAC,CAAC,sBAAsB;IACrC,KAAK,CAAC,CAAC,IAAA,mCAAoB,EAAC,OAAO,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"account.js","sourceRoot":"","sources":["../../src/generate/account.ts"],"names":[],"mappings":";;AAkBA,wDAEC;AAnBD,0CAA0C;AAC1C,wDAAwD;AACxD,iDAAsD;AAEtD,MAAM,OAAO,GAAG;IACd,IAAI,EAAE,CAAC,WAAW,CAAC;IACnB,mBAAmB,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAU;IAC3D,YAAY,EAAE,CAAC,KAAK,EAAE,IAAI,CAAU;IACpC,aAAa,EAAE,CAAC,KAAK,EAAE,IAAI,CAAU;IACrC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAU;IAChG,gBAAgB,EAAE,CAAC,KAAK,EAAE,IAAI,CAAU;IACxC,cAAc,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,sBAAsB,CAAU;IAC1E,MAAM,EAAE,CAAC,KAAK,CAAU;IACxB,WAAW,EAAE,oCAAkB;IAC/B,IAAI,EAAE,sBAAW;CAClB,CAAC;AAEF,QAAe,CAAC,CAAC,sBAAsB;IACrC,KAAK,CAAC,CAAC,IAAA,mCAAoB,EAAC,OAAO,CAAC,CAAC;AACvC,CAAC"}

package/dist/generate/stablecoin.js

@@ -42,7 +42,7 @@ const erc20Full = {
 };
 const stablecoinExtensions = {
     restrictions: [false, 'allowlist', 'blocklist'],
-    custodian: booleans,
+    freezable: booleans,
     upgradeable: [false],
 };
 function* generateStablecoinOptions() {

package/dist/get-versioned-remappings.d.ts

@@ -0,0 +1,3 @@
+import type { CommonOptions } from './common-options';
+export declare function getVersionedRemappings(opts?: CommonOptions): string[];
+//# sourceMappingURL=get-versioned-remappings.d.ts.map

package/dist/get-versioned-remappings.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-versioned-remappings.d.ts","sourceRoot":"","sources":["../src/get-versioned-remappings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGtD,wBAAgB,sBAAsB,CAAC,IAAI,CAAC,EAAE,aAAa,GAAG,MAAM,EAAE,CAQrE"}

package/dist/get-versioned-remappings.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVersionedRemappings = getVersionedRemappings;
+const openzeppelin_contracts_version_1 = __importDefault(require("../openzeppelin-contracts-version"));
+function getVersionedRemappings(opts) {
+    const remappings = [`@openzeppelin/contracts/=@openzeppelin/contracts@${openzeppelin_contracts_version_1.default.version}/`];
+    if (opts?.upgradeable) {
+        remappings.push(`@openzeppelin/contracts-upgradeable/=@openzeppelin/contracts-upgradeable@${openzeppelin_contracts_version_1.default.version}/`);
+    }
+    return remappings;
+}
+//# sourceMappingURL=get-versioned-remappings.js.map

package/dist/get-versioned-remappings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-versioned-remappings.js","sourceRoot":"","sources":["../src/get-versioned-remappings.ts"],"names":[],"mappings":";;;;;AAGA,wDAQC;AAVD,uGAAiE;AAEjE,SAAgB,sBAAsB,CAAC,IAAoB;IACzD,MAAM,UAAU,GAAG,CAAC,oDAAoD,wCAAgB,CAAC,OAAO,GAAG,CAAC,CAAC;IACrG,IAAI,IAAI,EAAE,WAAW,EAAE,CAAC;QACtB,UAAU,CAAC,IAAI,CACb,4EAA4E,wCAAgB,CAAC,OAAO,GAAG,CACxG,CAAC;IACJ,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/dist/scripts/prepare.js

@@ -43,6 +43,8 @@ async function main() {
         dependencies: (0, map_values_1.mapValues)((0, transitive_closure_1.transitiveClosure)(dependencies), d => Array.from(d)),
     };
     await fs_1.promises.writeFile('openzeppelin-contracts.json', JSON.stringify(contracts, null, 2));
+    // Generate a separate file with only the version field, to be included in the NPM package
+    await fs_1.promises.writeFile('openzeppelin-contracts-version.json', JSON.stringify({ version: package_json_1.version }, null, 2));
 }
 main().catch(e => {
     console.error(e);

package/dist/scripts/prepare.js.map

@@ -1 +1 @@
-{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/scripts/prepare.ts"],"names":[],"mappings":";;;;;AAAA,2BAAoC;AACpC,gDAAwB;AACxB,sDAA0B;AAE1B,8CAA6C;AAC7C,mCAAgC;AAChC,uEAA+D;AAG/D,iDAA4D;AAC5D,oDAAgD;AAChD,oEAAgE;AAEhE,KAAK,UAAU,IAAI;IACjB,MAAM,oBAAoB,GAAG,cAAI,CAAC,IAAI,CAAC,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9E,MAAM,IAAA,eAAM,EAAC,oBAAoB,CAAC,CAAC;IACnC,MAAM,IAAA,+BAAqB,EAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC;IACnE,MAAM,iBAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEzB,MAAM,YAAY,GAAgC,EAAE,CAAC;IACrD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAE3C,KAAK,MAAM,aAAa,IAAI,MAAM,iBAAG,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAE,CAAC;QACpE,MAAM,SAAS,GAAc,IAAI,CAAC,KAAK,CAAC,MAAM,aAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;QAElF,KAAK,MAAM,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7E,IACE,UAAU,CAAC,UAAU,CAAC,yBAAyB,CAAC;gBAChD,UAAU,CAAC,UAAU,CAAC,mCAAmC,CAAC,EAC1D,CAAC;gBACD,MAAM,kBAAkB,GAAG,CAAC,YAAY,CAAC,UAAU,MAAvB,YAAY,CAAC,UAAU,IAAM,IAAI,GAAG,EAAE,EAAC,CAAC;gBACpE,KAAK,MAAM,GAAG,IAAI,IAAA,eAAO,EAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC;oBAClD,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC;QACH,CAAC;QAED,KAAK,MAAM,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAChF,IACE,UAAU,CAAC,UAAU,CAAC,yBAAyB,CAAC;gBAChD,UAAU,CAAC,UAAU,CAAC,mCAAmC,CAAC,EAC1D,CAAC;gBACD,OAAO,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAA0B;QACvC,OAAO,EAAP,sBAAO;QACP,OAAO;QACP,YAAY,EAAE,IAAA,sBAAS,EAAC,IAAA,sCAAiB,EAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAC7E,CAAC;IAEF,MAAM,aAAE,CAAC,SAAS,CAAC,6BAA6B,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACxF,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACf,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../src/scripts/prepare.ts"],"names":[],"mappings":";;;;;AAAA,2BAAoC;AACpC,gDAAwB;AACxB,sDAA0B;AAE1B,8CAA6C;AAC7C,mCAAgC;AAChC,uEAA+D;AAG/D,iDAA4D;AAC5D,oDAAgD;AAChD,oEAAgE;AAEhE,KAAK,UAAU,IAAI;IACjB,MAAM,oBAAoB,GAAG,cAAI,CAAC,IAAI,CAAC,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9E,MAAM,IAAA,eAAM,EAAC,oBAAoB,CAAC,CAAC;IACnC,MAAM,IAAA,+BAAqB,EAAC,oBAAoB,EAAE,eAAe,CAAC,CAAC;IACnE,MAAM,iBAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAEzB,MAAM,YAAY,GAAgC,EAAE,CAAC;IACrD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAE3C,KAAK,MAAM,aAAa,IAAI,MAAM,iBAAG,CAAC,SAAS,CAAC,iBAAiB,EAAE,EAAE,CAAC;QACpE,MAAM,SAAS,GAAc,IAAI,CAAC,KAAK,CAAC,MAAM,aAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CAAC;QAElF,KAAK,MAAM,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7E,IACE,UAAU,CAAC,UAAU,CAAC,yBAAyB,CAAC;gBAChD,UAAU,CAAC,UAAU,CAAC,mCAAmC,CAAC,EAC1D,CAAC;gBACD,MAAM,kBAAkB,GAAG,CAAC,YAAY,CAAC,UAAU,MAAvB,YAAY,CAAC,UAAU,IAAM,IAAI,GAAG,EAAE,EAAC,CAAC;gBACpE,KAAK,MAAM,GAAG,IAAI,IAAA,eAAO,EAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC;oBAClD,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC;QACH,CAAC;QAED,KAAK,MAAM,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YAChF,IACE,UAAU,CAAC,UAAU,CAAC,yBAAyB,CAAC;gBAChD,UAAU,CAAC,UAAU,CAAC,mCAAmC,CAAC,EAC1D,CAAC;gBACD,OAAO,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC;YAChC,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAA0B;QACvC,OAAO,EAAP,sBAAO;QACP,OAAO;QACP,YAAY,EAAE,IAAA,sBAAS,EAAC,IAAA,sCAAiB,EAAC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KAC7E,CAAC;IAEF,MAAM,aAAE,CAAC,SAAS,CAAC,6BAA6B,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAEtF,0FAA0F;IAC1F,MAAM,aAAE,CAAC,SAAS,CAAC,qCAAqC,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAP,sBAAO,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAClG,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACf,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}

package/dist/signer.d.ts

@@ -1,6 +1,6 @@
 import type { ContractBuilder } from './contract';
 import type { Upgradeable } from './set-upgradeable';
-export declare const SignerOptions: readonly [false, "ECDSA", "EIP7702", "P256", "RSA", "Multisig", "MultisigWeighted"];
+export declare const SignerOptions: readonly [false, "ECDSA", "EIP7702", "Multisig", "MultisigWeighted", "P256", "RSA", "WebAuthn"];
 export type SignerOptions = (typeof SignerOptions)[number];
 export declare function addSigner(c: ContractBuilder, signer: SignerOptions, upgradeable: Upgradeable): void;
 export declare const signers: {
@@ -12,19 +12,23 @@ export declare const signers: {
         name: string;
         path: string;
     };
-    P256: {
+    Multisig: {
         name: string;
         path: string;
     };
-    RSA: {
+    MultisigWeighted: {
         name: string;
         path: string;
     };
-    Multisig: {
+    P256: {
         name: string;
         path: string;
     };
-    MultisigWeighted: {
+    RSA: {
+        name: string;
+        path: string;
+    };
+    WebAuthn: {
         name: string;
         path: string;
     };

package/dist/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,eAAO,MAAM,aAAa,qFAAsF,CAAC;AACjH,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE3D,wBAAgB,SAAS,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CA6BnG;AAED,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;CAyBnB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,GAAG,SAAS,CAAC,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAmB1G,CAAC;AAEF,eAAO,MAAM,eAAe,sEAU1B,CAAC"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGrD,eAAO,MAAM,aAAa,iGAShB,CAAC;AACX,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE3D,wBAAgB,SAAS,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,GAAG,IAAI,CAiDnG;AAED,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6BnB,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,KAAK,GAAG,SAAS,CAAC,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAoB1G,CAAC;AAEF,eAAO,MAAM,eAAe,sEAU1B,CAAC"}

package/dist/signer.js

@@ -4,7 +4,16 @@ exports.signerFunctions = exports.signerArgs = exports.signers = exports.SignerO
 exports.addSigner = addSigner;
 const error_1 = require("./error");
 const define_functions_1 = require("./utils/define-functions");
-exports.SignerOptions = [false, 'ECDSA', 'EIP7702', 'P256', 'RSA', 'Multisig', 'MultisigWeighted'];
+exports.SignerOptions = [
+    false,
+    'ECDSA',
+    'EIP7702',
+    'Multisig',
+    'MultisigWeighted',
+    'P256',
+    'RSA',
+    'WebAuthn',
+];
 function addSigner(c, signer, upgradeable) {
     if (!signer)
         return;
@@ -29,6 +38,23 @@ function addSigner(c, signer, upgradeable) {
             c.addParent(exports.signers[signer], exports.signerArgs[signer].map(arg => ({ lit: arg.name })));
             break;
         }
+        case 'WebAuthn': {
+            exports.signerArgs.P256.forEach(arg => c.addConstructorArgument(arg));
+            c.addParent(exports.signers.P256, exports.signerArgs.P256.map(arg => ({ lit: arg.name })));
+            c.addParent(exports.signers[signer]);
+            c.addImportOnly({
+                name: 'AbstractSigner',
+                path: '@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol',
+                transpiled: false,
+            });
+            c.addOverride({ name: 'AbstractSigner', transpiled: false }, exports.signerFunctions._rawSignatureValidation);
+            c.addOverride({ name: 'SignerP256' }, exports.signerFunctions._rawSignatureValidation);
+            break;
+        }
+        default: {
+            const _ = signer;
+            throw new Error('Unknown signer');
+        }
     }
 }
 exports.signers = {
@@ -40,6 +66,14 @@ exports.signers = {
         name: 'SignerEIP7702',
         path: '@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol',
     },
+    Multisig: {
+        name: 'MultiSignerERC7913',
+        path: '@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol',
+    },
+    MultisigWeighted: {
+        name: 'MultiSignerERC7913Weighted',
+        path: '@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol',
+    },
     P256: {
         name: 'SignerP256',
         path: '@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol',
@@ -48,13 +82,9 @@ exports.signers = {
         name: 'SignerRSA',
         path: '@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol',
     },
-    Multisig: {
-        name: 'MultiSignerERC7913',
-        path: '@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol',
-    },
-    MultisigWeighted: {
-        name: 'MultiSignerERC7913Weighted',
-        path: '@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol',
+    WebAuthn: {
+        name: 'SignerWebAuthn',
+        path: '@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol',
     },
 };
 exports.signerArgs = {
@@ -63,10 +93,6 @@ exports.signerArgs = {
         { 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' },
@@ -76,6 +102,11 @@ exports.signerArgs = {
         { name: 'weights', type: 'uint64[] memory' },
         { name: 'threshold', type: 'uint64' },
     ],
+    RSA: [
+        { name: 'e', type: 'bytes memory' },
+        { name: 'n', type: 'bytes memory' },
+    ],
+    WebAuthn: [],
 };
 exports.signerFunctions = (0, define_functions_1.defineFunctions)({
     _rawSignatureValidation: {

package/dist/signer.js.map

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

package/dist/stablecoin.d.ts

@@ -2,7 +2,7 @@ import type { Contract } from './contract';
 import type { ERC20Options } from './erc20';
 export interface StablecoinOptions extends ERC20Options {
     restrictions?: false | 'allowlist' | 'blocklist';
-    custodian?: boolean;
+    freezable?: boolean;
 }
 export declare const defaults: Required<StablecoinOptions>;
 export declare function printStablecoin(opts?: StablecoinOptions): string;

package/dist/stablecoin.js

@@ -13,7 +13,7 @@ exports.defaults = {
     name: 'MyStablecoin',
     symbol: 'MST',
     restrictions: false,
-    custodian: false,
+    freezable: false,
 };
 function withDefaults(opts) {
     return {
@@ -21,22 +21,22 @@ function withDefaults(opts) {
         name: opts.name ?? exports.defaults.name,
         symbol: opts.symbol ?? exports.defaults.symbol,
         restrictions: opts.restrictions ?? exports.defaults.restrictions,
-        custodian: opts.custodian ?? exports.defaults.custodian,
+        freezable: opts.freezable ?? exports.defaults.freezable,
     };
 }
 function printStablecoin(opts = exports.defaults) {
     return (0, print_1.printContract)(buildStablecoin(opts));
 }
 function isAccessControlRequired(opts) {
-    return opts.mintable || opts.restrictions !== false || opts.custodian || opts.pausable || opts.upgradeable === 'uups';
+    return opts.mintable || opts.restrictions !== false || opts.freezable || opts.pausable || opts.upgradeable === 'uups';
 }
 function buildStablecoin(opts) {
     const allOpts = withDefaults(opts);
     // Upgradeability is not yet available for the community contracts
     allOpts.upgradeable = false;
     const c = (0, erc20_1.buildERC20)(allOpts);
-    if (allOpts.custodian) {
-        addCustodian(c, allOpts.access);
+    if (allOpts.freezable) {
+        addFreezable(c, allOpts.access);
     }
     if (allOpts.restrictions) {
         addRestrictions(c, allOpts.access, allOpts.restrictions);
@@ -63,56 +63,29 @@ function addRestrictions(c, access, mode) {
     (0, set_access_control_1.requireAccessControl)(c, removeFn, access, 'LIMITER', 'limiter');
     c.addFunctionCode(`_resetUser(user);`, removeFn);
 }
-function addCustodian(c, access) {
-    const ERC20Custodian = {
-        name: 'ERC20Custodian',
-        path: '@openzeppelin/community-contracts/token/ERC20/extensions/ERC20Custodian.sol',
+function addFreezable(c, 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';
     }
-    (0, set_access_control_1.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;
+    (0, set_access_control_1.requireAccessControl)(c, freezeFn, access, 'FREEZER', 'freezer');
+    c.setFunctionBody([`_setFrozen(user, amount);`], freezeFn);
 }
 const functions = {
     ...erc20_1.functions,
     ...(0, define_functions_1.defineFunctions)({
-        _isCustodian: {
-            kind: 'internal',
-            args: [{ name: 'user', type: 'address' }],
-            returns: ['bool'],
-            mutability: 'view',
+        freeze: {
+            kind: 'public',
+            args: [
+                { name: 'user', type: 'address' },
+                { name: 'amount', type: 'uint256' },
+            ],
         },
         allowUser: {
             kind: 'public',

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/utils/convert-strings.d.ts

@@ -2,10 +2,10 @@ 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.
+ * @param value The string value to check and convert.
+ * @param field The field name to use in the error message 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.
+ * @returns The validated value as a bigint.
  */
 export declare function toUint256(value: string, field: string): bigint;
 //# sourceMappingURL=convert-strings.d.ts.map

package/dist/utils/convert-strings.js

@@ -7,10 +7,10 @@ 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.
+ * @param value The string value to check and convert.
+ * @param field The field name to use in the error message 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.
+ * @returns The validated value as a bigint.
  */
 function toUint256(value, field) {
     const isValidNumber = /^\d+$/.test(value);

package/openzeppelin-contracts-version.d.ts

@@ -0,0 +1,10 @@
+export interface OpenZeppelinContractsVersion {
+  /**
+   * Version of `@openzeppelin/contracts` and `@openzeppelin/contracts-upgradeable`
+   */
+  version: string;
+}
+
+declare const contractsVersion: OpenZeppelinContractsVersion;
+
+export default contractsVersion;

package/openzeppelin-contracts-version.json

@@ -0,0 +1,3 @@
+{
+  "version": "5.5.0"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard",
-  "version": "0.10.0",
+  "version": "0.10.3",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
@@ -11,6 +11,8 @@
     "NOTICE",
     "/dist",
     "/src",
+    "openzeppelin-contracts-version.json",
+    "openzeppelin-contracts-version.d.ts",
     "!**/*.test.*"
   ],
   "scripts": {
@@ -39,4 +41,4 @@
     "ts-node": "^10.4.0",
     "typescript": "^5.0.0"
   }
-}
+}

package/src/account.ts

@@ -244,18 +244,23 @@ function overrideRawSignatureValidation(c: ContractBuilder, opts: AccountOptions
   // Disambiguate between Signer and AccountERC7579
   if (opts.signer && opts.ERC7579Modules) {
     const accountName = opts.upgradeable ? upgradeableName('AccountERC7579') : 'AccountERC7579';
-    const signerName = opts.upgradeable ? upgradeableName(`Signer${opts.signer}`) : `Signer${opts.signer}`;
+    const signerBaseName = signers[opts.signer].name;
+    const signerName = opts.upgradeable ? upgradeableName(signerBaseName) : signerBaseName;
+
+    // WebAuthnSigner depends inherits from P256Signer, so the AbstractSigner override is handled by `addSigner`
+    if (opts.signer !== 'WebAuthn') {
+      c.addImportOnly({
+        name: 'AbstractSigner',
+        path: '@openzeppelin/contracts/utils/cryptography/signers/AbstractSigner.sol',
+        transpiled: false,
+      });
+      c.addOverride({ name: 'AbstractSigner', transpiled: false }, signerFunctions._rawSignatureValidation);
+    }
 
-    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: 'AccountERC7579' }, signerFunctions._rawSignatureValidation);
     c.setFunctionComments(
       [
-        `// IMPORTANT: Make sure ${signerName} is most derived than ${accountName}`,
+        `// IMPORTANT: Make sure ${signerName} is more derived than ${accountName}`,
         `// in the inheritance chain (i.e. contract ... is ${accountName}, ..., ${signerName})`,
         '// to ensure the correct order of function resolution.',
         `// ${accountName} returns false for _rawSignatureValidation`,

package/src/api.ts

@@ -37,6 +37,7 @@ import {
   defaults as customDefaults,
   isAccessControlRequired as customIsAccessControlRequired,
 } from './custom';
+import { getVersionedRemappings } from './get-versioned-remappings';
 
 export interface WizardContractAPI<Options extends CommonOptions> {
   /**
@@ -44,6 +45,18 @@ export interface WizardContractAPI<Options extends CommonOptions> {
    */
   print: (opts?: Options) => string;
 
+  /**
+   * Returns remappings that map unversioned import prefixes to versioned import prefixes.
+   * @example
+   * ```ts
+   * [
+   *   "@openzeppelin/contracts/=@openzeppelin/contracts@5.5.0/",
+   *   "@openzeppelin/contracts-upgradeable/=@openzeppelin/contracts-upgradeable@5.5.0/"
+   * ]
+   * ```
+   */
+  getVersionedRemappings: (opts?: Options) => string[];
+
   /**
    * The default options that are used for `print`.
    */
@@ -69,40 +82,48 @@ export type Custom = WizardContractAPI<CustomOptions> & AccessControlAPI<CustomO
 
 export const erc20: ERC20 = {
   print: printERC20,
+  getVersionedRemappings: getVersionedRemappings,
   defaults: erc20defaults,
   isAccessControlRequired: erc20IsAccessControlRequired,
 };
 export const erc721: ERC721 = {
   print: printERC721,
+  getVersionedRemappings: getVersionedRemappings,
   defaults: erc721defaults,
   isAccessControlRequired: erc721IsAccessControlRequired,
 };
 export const erc1155: ERC1155 = {
   print: printERC1155,
+  getVersionedRemappings: getVersionedRemappings,
   defaults: erc1155defaults,
   isAccessControlRequired: erc1155IsAccessControlRequired,
 };
 export const stablecoin: Stablecoin = {
   print: printStablecoin,
+  getVersionedRemappings: getVersionedRemappings,
   defaults: stablecoinDefaults,
   isAccessControlRequired: stablecoinIsAccessControlRequired,
 };
 export const account: Account = {
   print: printAccount,
+  getVersionedRemappings: getVersionedRemappings,
   defaults: accountDefaults,
 };
 export const realWorldAsset: RealWorldAsset = {
   print: printStablecoin,
+  getVersionedRemappings: getVersionedRemappings,
   defaults: stablecoinDefaults,
   isAccessControlRequired: stablecoinIsAccessControlRequired,
 };
 export const governor: Governor = {
   print: printGovernor,
+  getVersionedRemappings: getVersionedRemappings,
   defaults: governorDefaults,
   isAccessControlRequired: governorIsAccessControlRequired,
 };
 export const custom: Custom = {
   print: printCustom,
+  getVersionedRemappings: getVersionedRemappings,
   defaults: customDefaults,
   isAccessControlRequired: customIsAccessControlRequired,
 };

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: ['ECDSA', 'EIP7702', '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

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

package/src/get-versioned-remappings.ts

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

package/src/scripts/prepare.ts

@@ -52,6 +52,9 @@ async function main() {
   };
 
   await fs.writeFile('openzeppelin-contracts.json', JSON.stringify(contracts, null, 2));
+
+  // Generate a separate file with only the version field, to be included in the NPM package
+  await fs.writeFile('openzeppelin-contracts-version.json', JSON.stringify({ version }, null, 2));
 }
 
 main().catch(e => {

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, 'ECDSA', 'EIP7702', '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 {
@@ -34,6 +43,26 @@ 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');
+    }
   }
 }
 
@@ -46,6 +75,14 @@ export const signers = {
     name: 'SignerEIP7702',
     path: '@openzeppelin/contracts/utils/cryptography/signers/SignerEIP7702.sol',
   },
+  Multisig: {
+    name: 'MultiSignerERC7913',
+    path: '@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol',
+  },
+  MultisigWeighted: {
+    name: 'MultiSignerERC7913Weighted',
+    path: '@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol',
+  },
   P256: {
     name: 'SignerP256',
     path: '@openzeppelin/contracts/utils/cryptography/signers/SignerP256.sol',
@@ -54,13 +91,9 @@ export const signers = {
     name: 'SignerRSA',
     path: '@openzeppelin/contracts/utils/cryptography/signers/SignerRSA.sol',
   },
-  Multisig: {
-    name: 'MultiSignerERC7913',
-    path: '@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913.sol',
-  },
-  MultisigWeighted: {
-    name: 'MultiSignerERC7913Weighted',
-    path: '@openzeppelin/contracts/utils/cryptography/signers/MultiSignerERC7913Weighted.sol',
+  WebAuthn: {
+    name: 'SignerWebAuthn',
+    path: '@openzeppelin/contracts/utils/cryptography/signers/SignerWebAuthn.sol',
   },
 };
 
@@ -70,10 +103,6 @@ export const signerArgs: Record<Exclude<SignerOptions, false | 'EIP7702'>, { nam
     { 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 | 'EIP7702'>, { 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';
@@ -13,7 +13,7 @@ import {
 
 export interface StablecoinOptions extends ERC20Options {
   restrictions?: false | 'allowlist' | 'blocklist';
-  custodian?: boolean;
+  freezable?: boolean;
 }
 
 export const defaults: Required<StablecoinOptions> = {
@@ -21,7 +21,7 @@ export const defaults: Required<StablecoinOptions> = {
   name: 'MyStablecoin',
   symbol: 'MST',
   restrictions: false,
-  custodian: false,
+  freezable: false,
 } as const;
 
 function withDefaults(opts: StablecoinOptions): Required<StablecoinOptions> {
@@ -30,7 +30,7 @@ function withDefaults(opts: StablecoinOptions): Required<StablecoinOptions> {
     name: opts.name ?? defaults.name,
     symbol: opts.symbol ?? defaults.symbol,
     restrictions: opts.restrictions ?? defaults.restrictions,
-    custodian: opts.custodian ?? defaults.custodian,
+    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.restrictions !== 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,8 +50,8 @@ 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.restrictions) {
@@ -87,63 +87,33 @@ function addRestrictions(c: ContractBuilder, access: Access, mode: 'allowlist' |
   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: {

package/src/utils/convert-strings.ts

@@ -5,10 +5,10 @@ export const 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.
+ * @param value The string value to check and convert.
+ * @param field The field name to use in the error message 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.
+ * @returns The validated value as a bigint.
  */
 export function toUint256(value: string, field: string): bigint {
   const isValidNumber = /^\d+$/.test(value);