Cairo: Support ERC-6909 extensions (#793)

Author: immrsd

.changeset/deep-frogs-kneel.md

@@ -0,0 +1,6 @@
+---
+'@openzeppelin/wizard-common': patch
+---
+
+Cairo: Add ERC6909Metadata, ERC6909ContentURI, ERC6909TokenSupply extensions.
+Cairo: Default DAR delay fields in the `access` schema so callers don't need to supply them for non-`roles-dar` access types.

.github/workflows/compile-cairo-alpha-project.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
-          node-version: 20.x
+          node-version: 22
           cache: 'yarn'
 
       - name: Install dependencies
@@ -78,7 +78,7 @@ jobs:
                 done
               done
 
-            elif [[ "$kind" == "ERC20" || "$kind" == "Custom" ]]; then
+            elif [[ "$kind" == "ERC20" || "$kind" == "ERC6909" || "$kind" == "Custom" ]]; then
               for access_option in "${all_access_options[@]}"; do
                 proj_name="'$kind, macros: $macros_option, access: $access_option' test project"
                 echo "Generating $proj_name..."

.github/workflows/compile-cairo-project.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
-          node-version: 20.x
+          node-version: 22
           cache: 'yarn'
 
       - name: Install dependencies

packages/cli/src/cli-options.test.ts

@@ -368,6 +368,38 @@ test('cairo-erc20: access roles-dar', t => {
   t.is(output, cairoErc20.print(opts));
 });
 
+// DAR delays are only used for `roles-dar`; non-dar access types should work
+// without requiring them — they fall back to defaults matching `darDefaultOpts`.
+test('cairo-erc20: access roles without dar delays', t => {
+  const opts = {
+    name: 'TestToken',
+    symbol: 'TST',
+    access: {
+      type: 'roles' as const,
+      darInitialDelay: '1 day',
+      darDefaultDelayIncrease: '5 days',
+      darMaxTransferDelay: '30 days',
+    },
+  };
+  const output = run('cairo-erc20', '--name', opts.name, '--symbol', opts.symbol, '--access.type', 'roles');
+  t.is(output, cairoErc20.print(opts));
+});
+
+test('cairo-erc20: access ownable without dar delays', t => {
+  const opts = {
+    name: 'TestToken',
+    symbol: 'TST',
+    access: {
+      type: 'ownable' as const,
+      darInitialDelay: '1 day',
+      darDefaultDelayIncrease: '5 days',
+      darMaxTransferDelay: '30 days',
+    },
+  };
+  const output = run('cairo-erc20', '--name', opts.name, '--symbol', opts.symbol, '--access.type', 'ownable');
+  t.is(output, cairoErc20.print(opts));
+});
+
 test('cairo-erc721: most options', t => {
   const opts = {
     name: 'TestNFT',

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

@@ -75,7 +75,11 @@ export const cairoERC1155Descriptions = {
   uriStorage: 'Allows updating token URIs for individual token IDs.',
 };
 
-export const cairoERC6909Descriptions = {};
+export const cairoERC6909Descriptions = {
+  contentUri: 'Whether to include Content URI extension for contract-level and per-token URI metadata.',
+  tokenSupply: 'Whether to keep track of total supply per token ID.',
+  metadata: 'Whether to include per-token metadata extension providing name, symbol, and decimals per token ID.',
+};
 
 export const cairoGovernorDescriptions = {
   delay:

packages/common/src/ai/schemas/cairo.ts

@@ -9,6 +9,7 @@ import {
   cairoERC721Descriptions,
   cairoRoyaltyInfoDescriptions,
   cairoERC1155Descriptions,
+  cairoERC6909Descriptions,
   cairoAccountDescriptions,
   cairoGovernorDescriptions,
   cairoMultisigDescriptions,
@@ -24,9 +25,9 @@ export const cairoCommonSchema = {
         .or(z.literal('roles-dar'))
         .or(z.literal(false))
         .describe(cairoAccessDescriptions.accessType),
-      darInitialDelay: z.string().describe(cairoAccessDescriptions.darInitialDelay),
-      darDefaultDelayIncrease: z.string().describe(cairoAccessDescriptions.darDefaultDelayIncrease),
-      darMaxTransferDelay: z.string().describe(cairoAccessDescriptions.darMaxTransferDelay),
+      darInitialDelay: z.string().default('1 day').describe(cairoAccessDescriptions.darInitialDelay),
+      darDefaultDelayIncrease: z.string().default('5 days').describe(cairoAccessDescriptions.darDefaultDelayIncrease),
+      darMaxTransferDelay: z.string().default('30 days').describe(cairoAccessDescriptions.darMaxTransferDelay),
     })
     .optional(),
   upgradeable: z.boolean().optional().describe(cairoCommonDescriptions.upgradeable),
@@ -99,6 +100,17 @@ export const cairoERC1155Schema = {
   ...cairoCommonSchema,
 } as const satisfies z.ZodRawShape;
 
+export const cairoERC6909Schema = {
+  name: z.string().describe(commonDescriptions.name),
+  burnable: z.boolean().optional().describe(commonDescriptions.burnable),
+  pausable: z.boolean().optional().describe(commonDescriptions.pausable),
+  mintable: z.boolean().optional().describe(commonDescriptions.mintable),
+  contentUri: z.boolean().optional().describe(cairoERC6909Descriptions.contentUri),
+  tokenSupply: z.boolean().optional().describe(cairoERC6909Descriptions.tokenSupply),
+  metadata: z.boolean().optional().describe(cairoERC6909Descriptions.metadata),
+  ...cairoCommonSchema,
+} as const satisfies z.ZodRawShape;
+
 export const cairoAccountSchema = {
   name: z.string().describe(commonDescriptions.name),
   type: z.enum(['stark', 'eth']).describe(cairoAccountDescriptions.type),

packages/common/src/ai/schemas/index.ts

@@ -15,6 +15,7 @@ export {
   cairoERC20Schema,
   cairoERC721Schema,
   cairoERC1155Schema,
+  cairoERC6909Schema,
   cairoAccountSchema,
   cairoMultisigSchema,
   cairoGovernorSchema,

packages/common/src/ai/schemas/schemas.test.ts

@@ -20,6 +20,7 @@ import {
   cairoERC20Schema,
   cairoERC721Schema,
   cairoERC1155Schema,
+  cairoERC6909Schema,
   cairoAccountSchema,
   cairoMultisigSchema,
   cairoGovernorSchema,
@@ -86,6 +87,7 @@ const allSchemas: [string, z.ZodRawShape][] = [
   ['cairoERC20', cairoERC20Schema],
   ['cairoERC721', cairoERC721Schema],
   ['cairoERC1155', cairoERC1155Schema],
+  ['cairoERC6909', cairoERC6909Schema],
   ['cairoAccount', cairoAccountSchema],
   ['cairoMultisig', cairoMultisigSchema],
   ['cairoGovernor', cairoGovernorSchema],

packages/core/cairo_alpha/CHANGELOG.md

@@ -3,6 +3,9 @@
 ## Unreleased
 
 - Add ERC6909 contract kind ([#771](https://github.com/OpenZeppelin/contracts-wizard/pull/771))
+- Add ERC6909Metadata extension ([#793](https://github.com/OpenZeppelin/contracts-wizard/pull/793))
+- Add ERC6909ContentURI extension ([#793](https://github.com/OpenZeppelin/contracts-wizard/pull/793))
+- Add ERC6909TokenSupply extension ([#793](https://github.com/OpenZeppelin/contracts-wizard/pull/793))
 - Add ERC1155URIStorage extension ([#772](https://github.com/OpenZeppelin/contracts-wizard/pull/772))
 - Add ERC1155Supply extension ([#765](https://github.com/OpenZeppelin/contracts-wizard/pull/765))
 - Add ERC721URIStorage extension ([#772](https://github.com/OpenZeppelin/contracts-wizard/pull/772))