From 1345f3ba375ca1d03924090ca312dd8b55a9c559 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:06:07 +0300
Subject: [PATCH 01/22] Support customizing decimals for cairo-alpha

---
 packages/core/cairo_alpha/src/erc20.ts        | 24 +++++++++++++++----
 .../core/cairo_alpha/src/generate/erc20.ts    |  1 +
 .../ui/src/cairo_alpha/ERC20Controls.svelte   |  8 +++++++
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/packages/core/cairo_alpha/src/erc20.ts b/packages/core/cairo_alpha/src/erc20.ts
index 667fe11ba..431d2a347 100644
--- a/packages/core/cairo_alpha/src/erc20.ts
+++ b/packages/core/cairo_alpha/src/erc20.ts
@@ -1,4 +1,4 @@
-import type { Contract } from './contract';
+import type { BaseImplementedTrait, Contract } from './contract';
 import { ContractBuilder } from './contract';
 import type { Access } from './set-access-control';
 import { requireAccessControl, setAccessControl } from './set-access-control';
@@ -19,6 +19,7 @@ import { addVotesComponent } from './common-components';
 export const defaults: Required<ERC20Options> = {
   name: 'MyToken',
   symbol: 'MTK',
+  decimals: '18',
   burnable: false,
   pausable: false,
   premint: '0',
@@ -38,6 +39,7 @@ export function printERC20(opts: ERC20Options = defaults): string {
 export interface ERC20Options extends CommonContractOptions {
   name: string;
   symbol: string;
+  decimals: string;
   burnable?: boolean;
   pausable?: boolean;
   premint?: string;
@@ -70,7 +72,8 @@ export function buildERC20(opts: ERC20Options): Contract {
 
   const allOpts = withDefaults(opts);
 
-  addBase(c, toByteArray(allOpts.name), toByteArray(allOpts.symbol));
+  const decimals = toUint(opts.decimals, 'decimals', 'u8');
+  addBase(c, toByteArray(allOpts.name), toByteArray(allOpts.symbol), decimals);
   addERC20Mixin(c);
 
   if (allOpts.premint) {
@@ -183,9 +186,22 @@ function addERC20Mixin(c: ContractBuilder) {
   });
 }
 
-function addBase(c: ContractBuilder, name: string, symbol: string) {
-  c.addUseClause('openzeppelin::token::erc20', 'DefaultConfig');
+function addBase(c: ContractBuilder, name: string, symbol: string, decimals: bigint) {
+  // Add ERC20 component
   c.addComponent(components.ERC20Component, [name, symbol], true);
+
+  // Add immutable config with decimals
+  const trait: BaseImplementedTrait = {
+    name: 'ERC20ImmutableConfig',
+    of: 'ERC20Component::ImmutableConfig',
+    tags: [],
+  };
+  c.addImplementedTrait(trait);
+  c.addSuperVariableToTrait(trait, {
+    name: 'DECIMALS',
+    type: 'u8',
+    value: decimals.toString(),
+  });
 }
 
 function addBurnable(c: ContractBuilder) {
diff --git a/packages/core/cairo_alpha/src/generate/erc20.ts b/packages/core/cairo_alpha/src/generate/erc20.ts
index 51659af86..b30d3c9e7 100644
--- a/packages/core/cairo_alpha/src/generate/erc20.ts
+++ b/packages/core/cairo_alpha/src/generate/erc20.ts
@@ -9,6 +9,7 @@ const booleans = [true, false];
 const blueprint = {
   name: ['MyToken'],
   symbol: ['MTK'],
+  decimals: ['18'],
   burnable: booleans,
   pausable: booleans,
   mintable: booleans,
diff --git a/packages/ui/src/cairo_alpha/ERC20Controls.svelte b/packages/ui/src/cairo_alpha/ERC20Controls.svelte
index 5fe326325..c656317a7 100644
--- a/packages/ui/src/cairo_alpha/ERC20Controls.svelte
+++ b/packages/ui/src/cairo_alpha/ERC20Controls.svelte
@@ -37,6 +37,14 @@
     </label>
   </div>
 
+  <label class="labeled-input">
+    <span class="flex justify-between pr-2">
+      Decimals
+      <HelpTooltip>The number of decimals the token uses.</HelpTooltip>
+    </span>
+    <input bind:value={opts.decimals} use:error={errors?.decimals} />
+  </label>
+
   <label class="labeled-input">
     <span class="flex justify-between pr-2">
       Premint

From 73727c72dfd92ac4aaacd4113c51ace8cc1b4dd6 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:07:09 +0300
Subject: [PATCH 02/22] Update cairo-alpha tests

---
 packages/core/cairo_alpha/src/erc20.test.ts   |  22 ++-
 .../core/cairo_alpha/src/erc20.test.ts.md     | 171 ++++++++++++++++--
 .../core/cairo_alpha/src/erc20.test.ts.snap   | Bin 2849 -> 2953 bytes
 3 files changed, 176 insertions(+), 17 deletions(-)

diff --git a/packages/core/cairo_alpha/src/erc20.test.ts b/packages/core/cairo_alpha/src/erc20.test.ts
index 45fb5bf87..29f267809 100644
--- a/packages/core/cairo_alpha/src/erc20.test.ts
+++ b/packages/core/cairo_alpha/src/erc20.test.ts
@@ -12,6 +12,7 @@ function testERC20(title: string, opts: Partial<ERC20Options>) {
     const c = buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
+      decimals: '18',
       ...opts,
     });
     t.snapshot(printContract(c));
@@ -29,6 +30,7 @@ function testAPIEquivalence(title: string, opts?: ERC20Options) {
         buildERC20({
           name: 'MyToken',
           symbol: 'MTK',
+          decimals: '18',
           ...opts,
         }),
       ),
@@ -69,6 +71,21 @@ testERC20('erc20 premint of 0', {
   premint: '0',
 });
 
+testERC20('erc20 votes, custom decimals', {
+  decimals: '6',
+});
+
+test('erc20 votes, decimals too high', async t => {
+  const error = t.throws(() =>
+    buildERC20({
+      name: 'MyToken',
+      symbol: 'MTK',
+      decimals: '256',
+    }),
+  );
+  t.is((error as OptionsError).messages.decimals, 'Value is greater than u8 max value');
+});
+
 testERC20('erc20 mintable', {
   mintable: true,
   access: 'ownable',
@@ -95,6 +112,7 @@ test('erc20 votes, no name', async t => {
     buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
+      decimals: '18',
       votes: true,
     }),
   );
@@ -106,6 +124,7 @@ test('erc20 votes, empty version', async t => {
     buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
+      decimals: '18',
       votes: true,
       appName: 'MY_DAPP_NAME',
       appVersion: '', // avoids default value of v1
@@ -158,11 +177,12 @@ testERC20('erc20 full upgradeable with roles', {
 
 testAPIEquivalence('erc20 API default');
 
-testAPIEquivalence('erc20 API basic', { name: 'CustomToken', symbol: 'CTK' });
+testAPIEquivalence('erc20 API basic', { name: 'CustomToken', symbol: 'CTK', decimals: '6' });
 
 testAPIEquivalence('erc20 API full upgradeable', {
   name: 'CustomToken',
   symbol: 'CTK',
+  decimals: '6',
   premint: '2000',
   access: 'roles',
   burnable: true,
diff --git a/packages/core/cairo_alpha/src/erc20.test.ts.md b/packages/core/cairo_alpha/src/erc20.test.ts.md
index fcba39f5b..605db2e93 100644
--- a/packages/core/cairo_alpha/src/erc20.test.ts.md
+++ b/packages/core/cairo_alpha/src/erc20.test.ts.md
@@ -13,7 +13,7 @@ Generated by [AVA](https://avajs.dev).
     ␊
     #[starknet::contract]␊
     mod MyToken {␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
     ␊
         component!(path: ERC20Component, storage: erc20, event: ERC20Event);␊
     ␊
@@ -41,6 +41,10 @@ Generated by [AVA](https://avajs.dev).
         fn constructor(ref self: ContractState) {␊
             self.erc20.initializer("MyToken", "MTK");␊
         }␊
+    ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     }␊
     `
 
@@ -55,7 +59,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
     ␊
@@ -100,6 +104,10 @@ Generated by [AVA](https://avajs.dev).
             self.erc20.initializer("MyToken", "MTK");␊
             self.ownable.initializer(owner);␊
         }␊
+    ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -126,7 +134,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress, get_caller_address};␊
     ␊
@@ -172,6 +180,10 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -207,7 +219,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
     ␊
@@ -273,6 +285,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -319,7 +335,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
         use super::{PAUSER_ROLE, UPGRADER_ROLE};␊
@@ -400,6 +416,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -442,7 +462,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress, get_caller_address};␊
     ␊
@@ -508,6 +528,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -554,7 +578,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
     ␊
@@ -601,6 +625,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
             self.erc20.mint(recipient, 1000000000000000000000);␊
         }␊
+    ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -627,7 +655,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
     ␊
@@ -672,6 +700,85 @@ Generated by [AVA](https://avajs.dev).
             self.erc20.initializer("MyToken", "MTK");␊
             self.ownable.initializer(owner);␊
         }␊
+    ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+    ␊
+        //␊
+        // Upgradeable␊
+        //␊
+        ␊
+        #[abi(embed_v0)]␊
+        impl UpgradeableImpl of IUpgradeable<ContractState> {␊
+            fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
+                self.ownable.assert_only_owner();␊
+                self.upgradeable.upgrade(new_class_hash);␊
+            }␊
+        }␊
+    }␊
+    `
+
+## erc20 votes, custom decimals
+
+> Snapshot 1
+
+    `// SPDX-License-Identifier: MIT␊
+    // Compatible with OpenZeppelin Contracts for Cairo 3.0.0-alpha.1␊
+    ␊
+    #[starknet::contract]␊
+    mod MyToken {␊
+        use openzeppelin::access::ownable::OwnableComponent;␊
+        use openzeppelin::interfaces::upgrades::IUpgradeable;␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::upgrades::UpgradeableComponent;␊
+        use starknet::{ClassHash, ContractAddress};␊
+    ␊
+        component!(path: ERC20Component, storage: erc20, event: ERC20Event);␊
+        component!(path: UpgradeableComponent, storage: upgradeable, event: UpgradeableEvent);␊
+        component!(path: OwnableComponent, storage: ownable, event: OwnableEvent);␊
+    ␊
+        // External␊
+        #[abi(embed_v0)]␊
+        impl ERC20MixinImpl = ERC20Component::ERC20MixinImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OwnableMixinImpl = OwnableComponent::OwnableMixinImpl<ContractState>;␊
+    ␊
+        // Internal␊
+        impl ERC20InternalImpl = ERC20Component::InternalImpl<ContractState>;␊
+        impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
+        impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;␊
+    ␊
+        #[storage]␊
+        struct Storage {␊
+            #[substorage(v0)]␊
+            erc20: ERC20Component::Storage,␊
+            #[substorage(v0)]␊
+            upgradeable: UpgradeableComponent::Storage,␊
+            #[substorage(v0)]␊
+            ownable: OwnableComponent::Storage,␊
+        }␊
+    ␊
+        #[event]␊
+        #[derive(Drop, starknet::Event)]␊
+        enum Event {␊
+            #[flat]␊
+            ERC20Event: ERC20Component::Event,␊
+            #[flat]␊
+            UpgradeableEvent: UpgradeableComponent::Event,␊
+            #[flat]␊
+            OwnableEvent: OwnableComponent::Event,␊
+        }␊
+    ␊
+        #[constructor]␊
+        fn constructor(ref self: ContractState, owner: ContractAddress) {␊
+            self.erc20.initializer("MyToken", "MTK");␊
+            self.ownable.initializer(owner);␊
+        }␊
+    ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 6;␊
+        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -698,7 +805,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
     ␊
@@ -744,6 +851,10 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -783,7 +894,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
         use super::{MINTER_ROLE, UPGRADER_ROLE};␊
@@ -844,6 +955,10 @@ Generated by [AVA](https://avajs.dev).
             self.accesscontrol._grant_role(UPGRADER_ROLE, upgrader);␊
         }␊
     ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -880,7 +995,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -955,6 +1070,10 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
+        ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -996,7 +1115,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1071,6 +1190,10 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
+        ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -1110,7 +1233,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::governance::votes::VotesComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
         use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊
@@ -1169,6 +1292,10 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
+        ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -1198,7 +1325,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
         use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊
@@ -1287,6 +1414,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -1343,7 +1474,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1439,6 +1570,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -1512,7 +1647,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1625,6 +1760,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
diff --git a/packages/core/cairo_alpha/src/erc20.test.ts.snap b/packages/core/cairo_alpha/src/erc20.test.ts.snap
index 0d07d10ca899a72a743951eb990612d253371d97..4ba87ba6d6a8b5e9b3e3899f452e1f2723cc9661 100644
GIT binary patch
literal 2953
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

literal 2849
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


From 7149d9cc8c3314b505baf53851cef4441ec43e9a Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:07:38 +0300
Subject: [PATCH 03/22] Support customizing decimals in cairo

---
 packages/core/cairo/src/erc20.ts           | 25 ++++++++++++++++++----
 packages/core/cairo/src/generate/erc20.ts  |  1 +
 packages/ui/src/cairo/ERC20Controls.svelte |  8 +++++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/packages/core/cairo/src/erc20.ts b/packages/core/cairo/src/erc20.ts
index 667fe11ba..f58c6a8f6 100644
--- a/packages/core/cairo/src/erc20.ts
+++ b/packages/core/cairo/src/erc20.ts
@@ -1,4 +1,4 @@
-import type { Contract } from './contract';
+import type { BaseImplementedTrait, Contract } from './contract';
 import { ContractBuilder } from './contract';
 import type { Access } from './set-access-control';
 import { requireAccessControl, setAccessControl } from './set-access-control';
@@ -19,6 +19,7 @@ import { addVotesComponent } from './common-components';
 export const defaults: Required<ERC20Options> = {
   name: 'MyToken',
   symbol: 'MTK',
+  decimals: '18',
   burnable: false,
   pausable: false,
   premint: '0',
@@ -38,6 +39,7 @@ export function printERC20(opts: ERC20Options = defaults): string {
 export interface ERC20Options extends CommonContractOptions {
   name: string;
   symbol: string;
+  decimals: string;
   burnable?: boolean;
   pausable?: boolean;
   premint?: string;
@@ -70,7 +72,9 @@ export function buildERC20(opts: ERC20Options): Contract {
 
   const allOpts = withDefaults(opts);
 
-  addBase(c, toByteArray(allOpts.name), toByteArray(allOpts.symbol));
+  const decimals = toUint(opts.decimals, 'decimals', 'u8');
+  addBase(c, toByteArray(allOpts.name), toByteArray(allOpts.symbol), decimals);
+
   addERC20Mixin(c);
 
   if (allOpts.premint) {
@@ -183,9 +187,22 @@ function addERC20Mixin(c: ContractBuilder) {
   });
 }
 
-function addBase(c: ContractBuilder, name: string, symbol: string) {
-  c.addUseClause('openzeppelin::token::erc20', 'DefaultConfig');
+function addBase(c: ContractBuilder, name: string, symbol: string, decimals: bigint) {
+  // Add ERC20 component
   c.addComponent(components.ERC20Component, [name, symbol], true);
+
+  // Add immutable config with decimals
+  const trait: BaseImplementedTrait = {
+    name: 'ERC20ImmutableConfig',
+    of: 'ERC20Component::ImmutableConfig',
+    tags: [],
+  };
+  c.addImplementedTrait(trait);
+  c.addSuperVariableToTrait(trait, {
+    name: 'DECIMALS',
+    type: 'u8',
+    value: decimals.toString(),
+  });
 }
 
 function addBurnable(c: ContractBuilder) {
diff --git a/packages/core/cairo/src/generate/erc20.ts b/packages/core/cairo/src/generate/erc20.ts
index 51659af86..b30d3c9e7 100644
--- a/packages/core/cairo/src/generate/erc20.ts
+++ b/packages/core/cairo/src/generate/erc20.ts
@@ -9,6 +9,7 @@ const booleans = [true, false];
 const blueprint = {
   name: ['MyToken'],
   symbol: ['MTK'],
+  decimals: ['18'],
   burnable: booleans,
   pausable: booleans,
   mintable: booleans,
diff --git a/packages/ui/src/cairo/ERC20Controls.svelte b/packages/ui/src/cairo/ERC20Controls.svelte
index 8c657e1e2..d89776abc 100644
--- a/packages/ui/src/cairo/ERC20Controls.svelte
+++ b/packages/ui/src/cairo/ERC20Controls.svelte
@@ -37,6 +37,14 @@
     </label>
   </div>
 
+  <label class="labeled-input">
+    <span class="flex justify-between pr-2">
+      Decimals
+      <HelpTooltip>The number of decimals the token uses.</HelpTooltip>
+    </span>
+    <input bind:value={opts.decimals} use:error={errors?.decimals} />
+  </label>
+
   <label class="labeled-input">
     <span class="flex justify-between pr-2">
       Premint

From c30efb31d30be08e358d94cf19df664b721f9266 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:07:58 +0300
Subject: [PATCH 04/22] Update cairo-stable ERC20 tests

---
 packages/core/cairo/src/erc20.test.ts      |  22 ++-
 packages/core/cairo/src/erc20.test.ts.md   | 171 +++++++++++++++++++--
 packages/core/cairo/src/erc20.test.ts.snap | Bin 2784 -> 2891 bytes
 3 files changed, 176 insertions(+), 17 deletions(-)

diff --git a/packages/core/cairo/src/erc20.test.ts b/packages/core/cairo/src/erc20.test.ts
index 45fb5bf87..29f267809 100644
--- a/packages/core/cairo/src/erc20.test.ts
+++ b/packages/core/cairo/src/erc20.test.ts
@@ -12,6 +12,7 @@ function testERC20(title: string, opts: Partial<ERC20Options>) {
     const c = buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
+      decimals: '18',
       ...opts,
     });
     t.snapshot(printContract(c));
@@ -29,6 +30,7 @@ function testAPIEquivalence(title: string, opts?: ERC20Options) {
         buildERC20({
           name: 'MyToken',
           symbol: 'MTK',
+          decimals: '18',
           ...opts,
         }),
       ),
@@ -69,6 +71,21 @@ testERC20('erc20 premint of 0', {
   premint: '0',
 });
 
+testERC20('erc20 votes, custom decimals', {
+  decimals: '6',
+});
+
+test('erc20 votes, decimals too high', async t => {
+  const error = t.throws(() =>
+    buildERC20({
+      name: 'MyToken',
+      symbol: 'MTK',
+      decimals: '256',
+    }),
+  );
+  t.is((error as OptionsError).messages.decimals, 'Value is greater than u8 max value');
+});
+
 testERC20('erc20 mintable', {
   mintable: true,
   access: 'ownable',
@@ -95,6 +112,7 @@ test('erc20 votes, no name', async t => {
     buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
+      decimals: '18',
       votes: true,
     }),
   );
@@ -106,6 +124,7 @@ test('erc20 votes, empty version', async t => {
     buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
+      decimals: '18',
       votes: true,
       appName: 'MY_DAPP_NAME',
       appVersion: '', // avoids default value of v1
@@ -158,11 +177,12 @@ testERC20('erc20 full upgradeable with roles', {
 
 testAPIEquivalence('erc20 API default');
 
-testAPIEquivalence('erc20 API basic', { name: 'CustomToken', symbol: 'CTK' });
+testAPIEquivalence('erc20 API basic', { name: 'CustomToken', symbol: 'CTK', decimals: '6' });
 
 testAPIEquivalence('erc20 API full upgradeable', {
   name: 'CustomToken',
   symbol: 'CTK',
+  decimals: '6',
   premint: '2000',
   access: 'roles',
   burnable: true,
diff --git a/packages/core/cairo/src/erc20.test.ts.md b/packages/core/cairo/src/erc20.test.ts.md
index 1c95de502..46fceae14 100644
--- a/packages/core/cairo/src/erc20.test.ts.md
+++ b/packages/core/cairo/src/erc20.test.ts.md
@@ -13,7 +13,7 @@ Generated by [AVA](https://avajs.dev).
     ␊
     #[starknet::contract]␊
     mod MyToken {␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
     ␊
         component!(path: ERC20Component, storage: erc20, event: ERC20Event);␊
     ␊
@@ -41,6 +41,10 @@ Generated by [AVA](https://avajs.dev).
         fn constructor(ref self: ContractState) {␊
             self.erc20.initializer("MyToken", "MTK");␊
         }␊
+    ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     }␊
     `
 
@@ -54,7 +58,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -100,6 +104,10 @@ Generated by [AVA](https://avajs.dev).
             self.erc20.initializer("MyToken", "MTK");␊
             self.ownable.initializer(owner);␊
         }␊
+    ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -125,7 +133,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress, get_caller_address};␊
@@ -172,6 +180,10 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -206,7 +218,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -273,6 +285,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -318,7 +334,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -400,6 +416,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -441,7 +461,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress, get_caller_address};␊
@@ -508,6 +528,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -553,7 +577,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -601,6 +625,10 @@ Generated by [AVA](https://avajs.dev).
     ␊
             self.erc20.mint(recipient, 1000000000000000000000);␊
         }␊
+    ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -626,7 +654,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -672,6 +700,85 @@ Generated by [AVA](https://avajs.dev).
             self.erc20.initializer("MyToken", "MTK");␊
             self.ownable.initializer(owner);␊
         }␊
+    ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+    ␊
+        //␊
+        // Upgradeable␊
+        //␊
+        ␊
+        #[abi(embed_v0)]␊
+        impl UpgradeableImpl of IUpgradeable<ContractState> {␊
+            fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
+                self.ownable.assert_only_owner();␊
+                self.upgradeable.upgrade(new_class_hash);␊
+            }␊
+        }␊
+    }␊
+    `
+
+## erc20 votes, custom decimals
+
+> Snapshot 1
+
+    `// SPDX-License-Identifier: MIT␊
+    // Compatible with OpenZeppelin Contracts for Cairo ^2.0.0␊
+    ␊
+    #[starknet::contract]␊
+    mod MyToken {␊
+        use openzeppelin::access::ownable::OwnableComponent;␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::upgrades::interface::IUpgradeable;␊
+        use openzeppelin::upgrades::UpgradeableComponent;␊
+        use starknet::{ClassHash, ContractAddress};␊
+    ␊
+        component!(path: ERC20Component, storage: erc20, event: ERC20Event);␊
+        component!(path: UpgradeableComponent, storage: upgradeable, event: UpgradeableEvent);␊
+        component!(path: OwnableComponent, storage: ownable, event: OwnableEvent);␊
+    ␊
+        // External␊
+        #[abi(embed_v0)]␊
+        impl ERC20MixinImpl = ERC20Component::ERC20MixinImpl<ContractState>;␊
+        #[abi(embed_v0)]␊
+        impl OwnableMixinImpl = OwnableComponent::OwnableMixinImpl<ContractState>;␊
+    ␊
+        // Internal␊
+        impl ERC20InternalImpl = ERC20Component::InternalImpl<ContractState>;␊
+        impl UpgradeableInternalImpl = UpgradeableComponent::InternalImpl<ContractState>;␊
+        impl OwnableInternalImpl = OwnableComponent::InternalImpl<ContractState>;␊
+    ␊
+        #[storage]␊
+        struct Storage {␊
+            #[substorage(v0)]␊
+            erc20: ERC20Component::Storage,␊
+            #[substorage(v0)]␊
+            upgradeable: UpgradeableComponent::Storage,␊
+            #[substorage(v0)]␊
+            ownable: OwnableComponent::Storage,␊
+        }␊
+    ␊
+        #[event]␊
+        #[derive(Drop, starknet::Event)]␊
+        enum Event {␊
+            #[flat]␊
+            ERC20Event: ERC20Component::Event,␊
+            #[flat]␊
+            UpgradeableEvent: UpgradeableComponent::Event,␊
+            #[flat]␊
+            OwnableEvent: OwnableComponent::Event,␊
+        }␊
+    ␊
+        #[constructor]␊
+        fn constructor(ref self: ContractState, owner: ContractAddress) {␊
+            self.erc20.initializer("MyToken", "MTK");␊
+            self.ownable.initializer(owner);␊
+        }␊
+    ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 6;␊
+        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -697,7 +804,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -744,6 +851,10 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -782,7 +893,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊
         use openzeppelin::introspection::src5::SRC5Component;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -844,6 +955,10 @@ Generated by [AVA](https://avajs.dev).
             self.accesscontrol._grant_role(UPGRADER_ROLE, upgrader);␊
         }␊
     ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -879,7 +994,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -954,6 +1069,10 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
+        ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -994,7 +1113,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1069,6 +1188,10 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
+        ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -1108,7 +1231,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::governance::votes::VotesComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
         use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊
         use starknet::ContractAddress;␊
@@ -1166,6 +1289,10 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
+        ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -1195,7 +1322,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
         use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊
         use starknet::{ContractAddress, get_caller_address};␊
@@ -1283,6 +1410,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -1338,7 +1469,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1434,6 +1565,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -1506,7 +1641,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::{DefaultConfig, ERC20Component};␊
+        use openzeppelin::token::erc20::ERC20Component;␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1619,6 +1754,10 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
+        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
+            const DECIMALS: u8 = 18;␊
+        }␊
+        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
diff --git a/packages/core/cairo/src/erc20.test.ts.snap b/packages/core/cairo/src/erc20.test.ts.snap
index 8e553dc5430af22ca9ddb7fa85ef5b24ed6edbf7..3252f8e9ba35c8ec44cedbfb865f2b947928f0e2 100644
GIT binary patch
literal 2891
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

literal 2784
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


From 0a422817337f7945b822450aedb01af92ec8bb42 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:29:28 +0300
Subject: [PATCH 05/22] Add changelog entries

---
 packages/common/CHANGELOG.md           | 3 +++
 packages/core/cairo/CHANGELOG.md       | 3 +++
 packages/core/cairo_alpha/CHANGELOG.md | 2 ++
 packages/mcp/CHANGELOG.md              | 2 ++
 4 files changed, 10 insertions(+)

diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
index 2513e5364..0ff09c214 100644
--- a/packages/common/CHANGELOG.md
+++ b/packages/common/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
 
+## 0.1.1 (2025-09-02)
+- Cairo: Add decimals to ERC20 scheme ([#654](https://github.com/OpenZeppelin/contracts-wizard/pull/654))
+
 ## 0.1.0 (2025-08-15)
 
 - Bump minor version for semantic versioning stability ([#631](https://github.com/OpenZeppelin/contracts-wizard/pull/631))
diff --git a/packages/core/cairo/CHANGELOG.md b/packages/core/cairo/CHANGELOG.md
index 1e064fd58..9cfc58ae5 100644
--- a/packages/core/cairo/CHANGELOG.md
+++ b/packages/core/cairo/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.1.0 (2025-09-02)
+
+- Support ERC20 decimals customization ([#654](https://github.com/OpenZeppelin/contracts-wizard/pull/654))
 
 ## 2.0.1 (2025-08-20)
 
diff --git a/packages/core/cairo_alpha/CHANGELOG.md b/packages/core/cairo_alpha/CHANGELOG.md
index 1c46b74cd..0a28f4492 100644
--- a/packages/core/cairo_alpha/CHANGELOG.md
+++ b/packages/core/cairo_alpha/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Support ERC20 decimals customization ([#654](https://github.com/OpenZeppelin/contracts-wizard/pull/654))
+
 - **Breaking changes**:
   - Use OpenZeppelin Contracts for Cairo v3.0.0-alpha.1. ([#638](https://github.com/OpenZeppelin/contracts-wizard/pull/638))
   - Use OpenZeppelin Contracts for Cairo v3.0.0-alpha.0. ([#623](https://github.com/OpenZeppelin/contracts-wizard/pull/623))
diff --git a/packages/mcp/CHANGELOG.md b/packages/mcp/CHANGELOG.md
index 1c61ece15..1e2690550 100644
--- a/packages/mcp/CHANGELOG.md
+++ b/packages/mcp/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## 0.1.1 (2025-09-02)
+- Cairo: Support decimals value added to ERC-20 scheme ([#654](https://github.com/OpenZeppelin/contracts-wizard/pull/654))
 
 ## 0.1.0 (2025-08-15)
 

From 48205ae6429aa6c1304965c5cae21e75af474801 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:29:59 +0300
Subject: [PATCH 06/22] Update versions of packages

---
 packages/common/package.json     | 2 +-
 packages/core/cairo/package.json | 2 +-
 packages/mcp/package.json        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/common/package.json b/packages/common/package.json
index 15de223ac..ae906be5c 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-common",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Common library for OpenZeppelin Contracts Wizard components. Used internally.",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
diff --git a/packages/core/cairo/package.json b/packages/core/cairo/package.json
index 928e3e971..a98ef8890 100644
--- a/packages/core/cairo/package.json
+++ b/packages/core/cairo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-cairo",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts for Cairo",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
diff --git a/packages/mcp/package.json b/packages/mcp/package.json
index 3e3dff2ce..35af353a8 100644
--- a/packages/mcp/package.json
+++ b/packages/mcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/contracts-mcp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "OpenZeppelin Contracts MCP Server",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",

From 86527d8c02c629e81a284f6d456242f070956180 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:30:36 +0300
Subject: [PATCH 07/22] Add decimals value to Cairo ERC20 scheme and support it
 in MCP

---
 packages/common/src/ai/descriptions/cairo.ts | 1 +
 packages/mcp/src/cairo/schemas.ts            | 1 +
 packages/mcp/src/cairo/tools/erc20.test.ts   | 2 ++
 packages/mcp/src/cairo/tools/erc20.ts        | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/packages/common/src/ai/descriptions/cairo.ts b/packages/common/src/ai/descriptions/cairo.ts
index ba36bbe6f..8b8acddbe 100644
--- a/packages/common/src/ai/descriptions/cairo.ts
+++ b/packages/common/src/ai/descriptions/cairo.ts
@@ -36,6 +36,7 @@ export const cairoRoyaltyInfoDescriptions = {
 
 export const cairoERC20Descriptions = {
   premint: 'The number of tokens to premint for the deployer.',
+  decimals: 'The number of decimals to use for the contract.',
   votes:
     "Whether to keep track of historical balances for voting in on-chain governance, with a way to delegate one's voting power to a trusted account.",
 };
diff --git a/packages/mcp/src/cairo/schemas.ts b/packages/mcp/src/cairo/schemas.ts
index 849bb22ab..b6e351f64 100644
--- a/packages/mcp/src/cairo/schemas.ts
+++ b/packages/mcp/src/cairo/schemas.ts
@@ -47,6 +47,7 @@ export const commonSchema = {
 export const erc20Schema = {
   name: z.string().describe(commonDescriptions.name),
   symbol: z.string().describe(commonDescriptions.symbol),
+  decimals: z.string().describe(cairoERC20Descriptions.decimals),
   burnable: z.boolean().optional().describe(commonDescriptions.burnable),
   pausable: z.boolean().optional().describe(commonDescriptions.pausable),
   premint: z.string().optional().describe(cairoERC20Descriptions.premint),
diff --git a/packages/mcp/src/cairo/tools/erc20.test.ts b/packages/mcp/src/cairo/tools/erc20.test.ts
index 012520b94..c00a3a5c5 100644
--- a/packages/mcp/src/cairo/tools/erc20.test.ts
+++ b/packages/mcp/src/cairo/tools/erc20.test.ts
@@ -34,6 +34,7 @@ test('basic', async t => {
   const params: z.infer<typeof t.context.schema> = {
     name: 'MyToken',
     symbol: 'MTK',
+    decimals: '18',
   };
   await assertAPIEquivalence(t, params, erc20.print);
 });
@@ -42,6 +43,7 @@ test('all', async t => {
   const params: DeepRequired<z.infer<typeof t.context.schema>> = {
     name: 'MyToken',
     symbol: 'MTK',
+    decimals: '18',
     burnable: true,
     pausable: true,
     premint: '1000000',
diff --git a/packages/mcp/src/cairo/tools/erc20.ts b/packages/mcp/src/cairo/tools/erc20.ts
index 5d1cc6569..b55bb95c0 100644
--- a/packages/mcp/src/cairo/tools/erc20.ts
+++ b/packages/mcp/src/cairo/tools/erc20.ts
@@ -13,6 +13,7 @@ export function registerCairoERC20(server: McpServer): RegisteredTool {
     async ({
       name,
       symbol,
+      decimals,
       burnable,
       pausable,
       premint,
@@ -27,6 +28,7 @@ export function registerCairoERC20(server: McpServer): RegisteredTool {
       const opts: ERC20Options = {
         name,
         symbol,
+        decimals,
         burnable,
         pausable,
         premint,

From 334ac120cc6975bbed6c7ecdd416d4ae29e865d2 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:31:00 +0300
Subject: [PATCH 08/22] Improve tooltip message for ERC20 decimals

---
 packages/ui/src/cairo/ERC20Controls.svelte       | 2 +-
 packages/ui/src/cairo_alpha/ERC20Controls.svelte | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ui/src/cairo/ERC20Controls.svelte b/packages/ui/src/cairo/ERC20Controls.svelte
index d89776abc..58548f156 100644
--- a/packages/ui/src/cairo/ERC20Controls.svelte
+++ b/packages/ui/src/cairo/ERC20Controls.svelte
@@ -40,7 +40,7 @@
   <label class="labeled-input">
     <span class="flex justify-between pr-2">
       Decimals
-      <HelpTooltip>The number of decimals the token uses.</HelpTooltip>
+      <HelpTooltip>The number of decimals to use for the contract.</HelpTooltip>
     </span>
     <input bind:value={opts.decimals} use:error={errors?.decimals} />
   </label>
diff --git a/packages/ui/src/cairo_alpha/ERC20Controls.svelte b/packages/ui/src/cairo_alpha/ERC20Controls.svelte
index c656317a7..56c0afb97 100644
--- a/packages/ui/src/cairo_alpha/ERC20Controls.svelte
+++ b/packages/ui/src/cairo_alpha/ERC20Controls.svelte
@@ -40,7 +40,7 @@
   <label class="labeled-input">
     <span class="flex justify-between pr-2">
       Decimals
-      <HelpTooltip>The number of decimals the token uses.</HelpTooltip>
+      <HelpTooltip>The number of decimals to use for the contract.</HelpTooltip>
     </span>
     <input bind:value={opts.decimals} use:error={errors?.decimals} />
   </label>

From f45744b2c4e01a63d7bc88d2c25acc3bb0b05763 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:32:31 +0300
Subject: [PATCH 09/22] Fix source of decimals value: allOpts (that include
 defaults) instead of opts

---
 packages/core/cairo/src/erc20.ts       | 2 +-
 packages/core/cairo_alpha/src/erc20.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/cairo/src/erc20.ts b/packages/core/cairo/src/erc20.ts
index f58c6a8f6..726393a34 100644
--- a/packages/core/cairo/src/erc20.ts
+++ b/packages/core/cairo/src/erc20.ts
@@ -72,7 +72,7 @@ export function buildERC20(opts: ERC20Options): Contract {
 
   const allOpts = withDefaults(opts);
 
-  const decimals = toUint(opts.decimals, 'decimals', 'u8');
+  const decimals = toUint(allOpts.decimals, 'decimals', 'u8');
   addBase(c, toByteArray(allOpts.name), toByteArray(allOpts.symbol), decimals);
 
   addERC20Mixin(c);
diff --git a/packages/core/cairo_alpha/src/erc20.ts b/packages/core/cairo_alpha/src/erc20.ts
index 431d2a347..cc30884bc 100644
--- a/packages/core/cairo_alpha/src/erc20.ts
+++ b/packages/core/cairo_alpha/src/erc20.ts
@@ -72,7 +72,7 @@ export function buildERC20(opts: ERC20Options): Contract {
 
   const allOpts = withDefaults(opts);
 
-  const decimals = toUint(opts.decimals, 'decimals', 'u8');
+  const decimals = toUint(allOpts.decimals, 'decimals', 'u8');
   addBase(c, toByteArray(allOpts.name), toByteArray(allOpts.symbol), decimals);
   addERC20Mixin(c);
 

From 21a041aa7acc18073703e11e45bb2188c540c872 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:36:36 +0300
Subject: [PATCH 10/22] Fix issue of premint using hardcoded decimals of 18

---
 packages/core/cairo/src/erc20.ts       | 6 +++---
 packages/core/cairo_alpha/src/erc20.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/core/cairo/src/erc20.ts b/packages/core/cairo/src/erc20.ts
index 726393a34..078d3b9cb 100644
--- a/packages/core/cairo/src/erc20.ts
+++ b/packages/core/cairo/src/erc20.ts
@@ -78,7 +78,7 @@ export function buildERC20(opts: ERC20Options): Contract {
   addERC20Mixin(c);
 
   if (allOpts.premint) {
-    addPremint(c, allOpts.premint);
+    addPremint(c, allOpts.premint, decimals);
   }
 
   if (allOpts.pausable) {
@@ -212,7 +212,7 @@ function addBurnable(c: ContractBuilder) {
 
 export const premintPattern = /^(\d*\.?\d*)$/;
 
-function addPremint(c: ContractBuilder, amount: string) {
+function addPremint(c: ContractBuilder, amount: string, decimals: bigint) {
   if (amount !== undefined && amount !== '0') {
     if (!premintPattern.test(amount)) {
       throw new OptionsError({
@@ -220,7 +220,7 @@ function addPremint(c: ContractBuilder, amount: string) {
       });
     }
 
-    const premintAbsolute = toUint(getInitialSupply(amount, 18), 'premint', 'u256');
+    const premintAbsolute = toUint(getInitialSupply(amount, Number(decimals)), 'premint', 'u256');
 
     c.addUseClause('starknet', 'ContractAddress');
     c.addConstructorArgument({ name: 'recipient', type: 'ContractAddress' });
diff --git a/packages/core/cairo_alpha/src/erc20.ts b/packages/core/cairo_alpha/src/erc20.ts
index cc30884bc..b13eb8725 100644
--- a/packages/core/cairo_alpha/src/erc20.ts
+++ b/packages/core/cairo_alpha/src/erc20.ts
@@ -77,7 +77,7 @@ export function buildERC20(opts: ERC20Options): Contract {
   addERC20Mixin(c);
 
   if (allOpts.premint) {
-    addPremint(c, allOpts.premint);
+    addPremint(c, allOpts.premint, decimals);
   }
 
   if (allOpts.pausable) {
@@ -211,7 +211,7 @@ function addBurnable(c: ContractBuilder) {
 
 export const premintPattern = /^(\d*\.?\d*)$/;
 
-function addPremint(c: ContractBuilder, amount: string) {
+function addPremint(c: ContractBuilder, amount: string, decimals: bigint) {
   if (amount !== undefined && amount !== '0') {
     if (!premintPattern.test(amount)) {
       throw new OptionsError({
@@ -219,7 +219,7 @@ function addPremint(c: ContractBuilder, amount: string) {
       });
     }
 
-    const premintAbsolute = toUint(getInitialSupply(amount, 18), 'premint', 'u256');
+    const premintAbsolute = toUint(getInitialSupply(amount, Number(decimals)), 'premint', 'u256');
 
     c.addUseClause('starknet', 'ContractAddress');
     c.addConstructorArgument({ name: 'recipient', type: 'ContractAddress' });

From 9de183cdf04a2a781a6c7f75a9b354ebf88500d1 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:50:38 +0300
Subject: [PATCH 11/22] Add changeset

---
 .changeset/swift-eels-repair.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/swift-eels-repair.md

diff --git a/.changeset/swift-eels-repair.md b/.changeset/swift-eels-repair.md
new file mode 100644
index 000000000..4510fc17a
--- /dev/null
+++ b/.changeset/swift-eels-repair.md
@@ -0,0 +1,7 @@
+---
+'@openzeppelin/wizard-cairo': minor
+'@openzeppelin/wizard-common': patch
+'@openzeppelin/contracts-mcp': patch
+---
+
+Support decimals customization for ERC20 Cairo contracts

From 363fbd2f32d8c55d4d977c79136df6bb0dfa4827 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Tue, 2 Sep 2025 14:58:22 +0300
Subject: [PATCH 12/22] Fix AI assistant functions definitions

---
 .../ui/api/ai-assistant/function-definitions/cairo-alpha.ts | 6 +++++-
 packages/ui/api/ai-assistant/function-definitions/cairo.ts  | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/ui/api/ai-assistant/function-definitions/cairo-alpha.ts b/packages/ui/api/ai-assistant/function-definitions/cairo-alpha.ts
index 5432aed38..36de75c2c 100644
--- a/packages/ui/api/ai-assistant/function-definitions/cairo-alpha.ts
+++ b/packages/ui/api/ai-assistant/function-definitions/cairo-alpha.ts
@@ -30,6 +30,10 @@ export const cairoAlphaERC20AIFunctionDefinition = {
         'appName',
         'appVersion',
       ]),
+      decimals: {
+        type: 'string',
+        description: cairoERC20Descriptions.decimals,
+      },
       premint: {
         type: 'string',
         description: cairoERC20Descriptions.premint,
@@ -39,7 +43,7 @@ export const cairoAlphaERC20AIFunctionDefinition = {
         description: cairoERC20Descriptions.votes,
       },
     },
-    required: ['name', 'symbol'],
+    required: ['name', 'symbol', 'decimals'],
     additionalProperties: false,
   },
 } as const satisfies AiFunctionDefinition<'cairoAlpha', 'ERC20'>;
diff --git a/packages/ui/api/ai-assistant/function-definitions/cairo.ts b/packages/ui/api/ai-assistant/function-definitions/cairo.ts
index 270d8fa3f..78d36381f 100644
--- a/packages/ui/api/ai-assistant/function-definitions/cairo.ts
+++ b/packages/ui/api/ai-assistant/function-definitions/cairo.ts
@@ -29,6 +29,10 @@ export const cairoERC20AIFunctionDefinition = {
         'appName',
         'appVersion',
       ]),
+      decimals: {
+        type: 'string',
+        description: cairoERC20Descriptions.decimals,
+      },
       premint: {
         type: 'string',
         description: cairoERC20Descriptions.premint,
@@ -38,7 +42,7 @@ export const cairoERC20AIFunctionDefinition = {
         description: cairoERC20Descriptions.votes,
       },
     },
-    required: ['name', 'symbol'],
+    required: ['name', 'symbol', 'decimals'],
     additionalProperties: false,
   },
 } as const satisfies AiFunctionDefinition<'cairo', 'ERC20'>;

From afee833802cbbe915958d87e10729922bb301d24 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Mon, 8 Sep 2025 11:41:41 +0300
Subject: [PATCH 13/22] Make decimals optional for ERC20 Cairo and Cairo-Alpha
 builders

---
 packages/common/src/ai/descriptions/cairo.ts               | 2 +-
 packages/core/cairo/src/erc20.test.ts                      | 2 --
 packages/core/cairo/src/erc20.ts                           | 7 +++----
 packages/core/cairo_alpha/src/erc20.test.ts                | 2 --
 packages/core/cairo_alpha/src/erc20.ts                     | 6 +++---
 .../api/ai-assistant/function-definitions/cairo-alpha.ts   | 2 +-
 packages/ui/api/ai-assistant/function-definitions/cairo.ts | 2 +-
 packages/ui/src/cairo/ERC20Controls.svelte                 | 2 +-
 packages/ui/src/cairo_alpha/ERC20Controls.svelte           | 2 +-
 9 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/common/src/ai/descriptions/cairo.ts b/packages/common/src/ai/descriptions/cairo.ts
index 8b8acddbe..f26b91c8b 100644
--- a/packages/common/src/ai/descriptions/cairo.ts
+++ b/packages/common/src/ai/descriptions/cairo.ts
@@ -36,7 +36,7 @@ export const cairoRoyaltyInfoDescriptions = {
 
 export const cairoERC20Descriptions = {
   premint: 'The number of tokens to premint for the deployer.',
-  decimals: 'The number of decimals to use for the contract.',
+  decimals: 'The number of decimals to use for the contract. Defaults to 18.',
   votes:
     "Whether to keep track of historical balances for voting in on-chain governance, with a way to delegate one's voting power to a trusted account.",
 };
diff --git a/packages/core/cairo/src/erc20.test.ts b/packages/core/cairo/src/erc20.test.ts
index 29f267809..a63e90a26 100644
--- a/packages/core/cairo/src/erc20.test.ts
+++ b/packages/core/cairo/src/erc20.test.ts
@@ -12,7 +12,6 @@ function testERC20(title: string, opts: Partial<ERC20Options>) {
     const c = buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
-      decimals: '18',
       ...opts,
     });
     t.snapshot(printContract(c));
@@ -30,7 +29,6 @@ function testAPIEquivalence(title: string, opts?: ERC20Options) {
         buildERC20({
           name: 'MyToken',
           symbol: 'MTK',
-          decimals: '18',
           ...opts,
         }),
       ),
diff --git a/packages/core/cairo/src/erc20.ts b/packages/core/cairo/src/erc20.ts
index 078d3b9cb..bdb248cd2 100644
--- a/packages/core/cairo/src/erc20.ts
+++ b/packages/core/cairo/src/erc20.ts
@@ -39,7 +39,7 @@ export function printERC20(opts: ERC20Options = defaults): string {
 export interface ERC20Options extends CommonContractOptions {
   name: string;
   symbol: string;
-  decimals: string;
+  decimals?: string;
   burnable?: boolean;
   pausable?: boolean;
   premint?: string;
@@ -53,6 +53,7 @@ function withDefaults(opts: ERC20Options): Required<ERC20Options> {
   return {
     ...opts,
     ...withCommonContractDefaults(opts),
+    decimals: opts.decimals ?? defaults.decimals,
     burnable: opts.burnable ?? defaults.burnable,
     pausable: opts.pausable ?? defaults.pausable,
     premint: opts.premint || defaults.premint,
@@ -69,12 +70,10 @@ export function isAccessControlRequired(opts: Partial<ERC20Options>): boolean {
 
 export function buildERC20(opts: ERC20Options): Contract {
   const c = new ContractBuilder(opts.name);
-
   const allOpts = withDefaults(opts);
-
   const decimals = toUint(allOpts.decimals, 'decimals', 'u8');
-  addBase(c, toByteArray(allOpts.name), toByteArray(allOpts.symbol), decimals);
 
+  addBase(c, toByteArray(allOpts.name), toByteArray(allOpts.symbol), decimals);
   addERC20Mixin(c);
 
   if (allOpts.premint) {
diff --git a/packages/core/cairo_alpha/src/erc20.test.ts b/packages/core/cairo_alpha/src/erc20.test.ts
index 29f267809..a63e90a26 100644
--- a/packages/core/cairo_alpha/src/erc20.test.ts
+++ b/packages/core/cairo_alpha/src/erc20.test.ts
@@ -12,7 +12,6 @@ function testERC20(title: string, opts: Partial<ERC20Options>) {
     const c = buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
-      decimals: '18',
       ...opts,
     });
     t.snapshot(printContract(c));
@@ -30,7 +29,6 @@ function testAPIEquivalence(title: string, opts?: ERC20Options) {
         buildERC20({
           name: 'MyToken',
           symbol: 'MTK',
-          decimals: '18',
           ...opts,
         }),
       ),
diff --git a/packages/core/cairo_alpha/src/erc20.ts b/packages/core/cairo_alpha/src/erc20.ts
index b13eb8725..da7886f0a 100644
--- a/packages/core/cairo_alpha/src/erc20.ts
+++ b/packages/core/cairo_alpha/src/erc20.ts
@@ -39,7 +39,7 @@ export function printERC20(opts: ERC20Options = defaults): string {
 export interface ERC20Options extends CommonContractOptions {
   name: string;
   symbol: string;
-  decimals: string;
+  decimals?: string;
   burnable?: boolean;
   pausable?: boolean;
   premint?: string;
@@ -53,6 +53,7 @@ function withDefaults(opts: ERC20Options): Required<ERC20Options> {
   return {
     ...opts,
     ...withCommonContractDefaults(opts),
+    decimals: opts.decimals ?? defaults.decimals,
     burnable: opts.burnable ?? defaults.burnable,
     pausable: opts.pausable ?? defaults.pausable,
     premint: opts.premint || defaults.premint,
@@ -69,10 +70,9 @@ export function isAccessControlRequired(opts: Partial<ERC20Options>): boolean {
 
 export function buildERC20(opts: ERC20Options): Contract {
   const c = new ContractBuilder(opts.name);
-
   const allOpts = withDefaults(opts);
-
   const decimals = toUint(allOpts.decimals, 'decimals', 'u8');
+  
   addBase(c, toByteArray(allOpts.name), toByteArray(allOpts.symbol), decimals);
   addERC20Mixin(c);
 
diff --git a/packages/ui/api/ai-assistant/function-definitions/cairo-alpha.ts b/packages/ui/api/ai-assistant/function-definitions/cairo-alpha.ts
index 36de75c2c..0940c1a01 100644
--- a/packages/ui/api/ai-assistant/function-definitions/cairo-alpha.ts
+++ b/packages/ui/api/ai-assistant/function-definitions/cairo-alpha.ts
@@ -43,7 +43,7 @@ export const cairoAlphaERC20AIFunctionDefinition = {
         description: cairoERC20Descriptions.votes,
       },
     },
-    required: ['name', 'symbol', 'decimals'],
+    required: ['name', 'symbol'],
     additionalProperties: false,
   },
 } as const satisfies AiFunctionDefinition<'cairoAlpha', 'ERC20'>;
diff --git a/packages/ui/api/ai-assistant/function-definitions/cairo.ts b/packages/ui/api/ai-assistant/function-definitions/cairo.ts
index 78d36381f..4a0dddbcd 100644
--- a/packages/ui/api/ai-assistant/function-definitions/cairo.ts
+++ b/packages/ui/api/ai-assistant/function-definitions/cairo.ts
@@ -42,7 +42,7 @@ export const cairoERC20AIFunctionDefinition = {
         description: cairoERC20Descriptions.votes,
       },
     },
-    required: ['name', 'symbol', 'decimals'],
+    required: ['name', 'symbol'],
     additionalProperties: false,
   },
 } as const satisfies AiFunctionDefinition<'cairo', 'ERC20'>;
diff --git a/packages/ui/src/cairo/ERC20Controls.svelte b/packages/ui/src/cairo/ERC20Controls.svelte
index 58548f156..c03e7eb20 100644
--- a/packages/ui/src/cairo/ERC20Controls.svelte
+++ b/packages/ui/src/cairo/ERC20Controls.svelte
@@ -40,7 +40,7 @@
   <label class="labeled-input">
     <span class="flex justify-between pr-2">
       Decimals
-      <HelpTooltip>The number of decimals to use for the contract.</HelpTooltip>
+      <HelpTooltip>The number of decimals to use for the contract. Defaults to 18.</HelpTooltip>
     </span>
     <input bind:value={opts.decimals} use:error={errors?.decimals} />
   </label>
diff --git a/packages/ui/src/cairo_alpha/ERC20Controls.svelte b/packages/ui/src/cairo_alpha/ERC20Controls.svelte
index 56c0afb97..00ef0d5d5 100644
--- a/packages/ui/src/cairo_alpha/ERC20Controls.svelte
+++ b/packages/ui/src/cairo_alpha/ERC20Controls.svelte
@@ -40,7 +40,7 @@
   <label class="labeled-input">
     <span class="flex justify-between pr-2">
       Decimals
-      <HelpTooltip>The number of decimals to use for the contract.</HelpTooltip>
+      <HelpTooltip>The number of decimals to use for the contract. Defaults to 18.</HelpTooltip>
     </span>
     <input bind:value={opts.decimals} use:error={errors?.decimals} />
   </label>

From 37e415351ff43571271a23eea3b15cb2ee170d09 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Mon, 8 Sep 2025 12:01:21 +0300
Subject: [PATCH 14/22] Use ERC20 default config if decimals value of 18 is
 used

---
 packages/core/cairo/src/erc20.ts       | 32 +++++++++++++++-----------
 packages/core/cairo_alpha/src/erc20.ts | 32 +++++++++++++++-----------
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/packages/core/cairo/src/erc20.ts b/packages/core/cairo/src/erc20.ts
index bdb248cd2..187ff56b9 100644
--- a/packages/core/cairo/src/erc20.ts
+++ b/packages/core/cairo/src/erc20.ts
@@ -16,10 +16,12 @@ import { externalTrait } from './external-trait';
 import { toByteArray, toFelt252, toUint } from './utils/convert-strings';
 import { addVotesComponent } from './common-components';
 
+const DEFAULT_DECIMALS = BigInt(18);
+
 export const defaults: Required<ERC20Options> = {
   name: 'MyToken',
   symbol: 'MTK',
-  decimals: '18',
+  decimals: DEFAULT_DECIMALS.toString(),
   burnable: false,
   pausable: false,
   premint: '0',
@@ -190,18 +192,22 @@ function addBase(c: ContractBuilder, name: string, symbol: string, decimals: big
   // Add ERC20 component
   c.addComponent(components.ERC20Component, [name, symbol], true);
 
-  // Add immutable config with decimals
-  const trait: BaseImplementedTrait = {
-    name: 'ERC20ImmutableConfig',
-    of: 'ERC20Component::ImmutableConfig',
-    tags: [],
-  };
-  c.addImplementedTrait(trait);
-  c.addSuperVariableToTrait(trait, {
-    name: 'DECIMALS',
-    type: 'u8',
-    value: decimals.toString(),
-  });
+  // Add config with decimals
+  if (decimals === DEFAULT_DECIMALS) {
+    c.addUseClause('openzeppelin::token::erc20', 'DefaultConfig', { alias: 'ERC20DefaultConfig' });
+  } else {
+    const trait: BaseImplementedTrait = {
+      name: 'ERC20ImmutableConfig',
+      of: 'ERC20Component::ImmutableConfig',
+      tags: [],
+    };
+    c.addImplementedTrait(trait);
+    c.addSuperVariableToTrait(trait, {
+      name: 'DECIMALS',
+      type: 'u8',
+      value: decimals.toString(),
+    });
+  }
 }
 
 function addBurnable(c: ContractBuilder) {
diff --git a/packages/core/cairo_alpha/src/erc20.ts b/packages/core/cairo_alpha/src/erc20.ts
index da7886f0a..c210ff214 100644
--- a/packages/core/cairo_alpha/src/erc20.ts
+++ b/packages/core/cairo_alpha/src/erc20.ts
@@ -16,10 +16,12 @@ import { externalTrait } from './external-trait';
 import { toByteArray, toFelt252, toUint } from './utils/convert-strings';
 import { addVotesComponent } from './common-components';
 
+const DEFAULT_DECIMALS = BigInt(18);
+
 export const defaults: Required<ERC20Options> = {
   name: 'MyToken',
   symbol: 'MTK',
-  decimals: '18',
+  decimals: DEFAULT_DECIMALS.toString(),
   burnable: false,
   pausable: false,
   premint: '0',
@@ -190,18 +192,22 @@ function addBase(c: ContractBuilder, name: string, symbol: string, decimals: big
   // Add ERC20 component
   c.addComponent(components.ERC20Component, [name, symbol], true);
 
-  // Add immutable config with decimals
-  const trait: BaseImplementedTrait = {
-    name: 'ERC20ImmutableConfig',
-    of: 'ERC20Component::ImmutableConfig',
-    tags: [],
-  };
-  c.addImplementedTrait(trait);
-  c.addSuperVariableToTrait(trait, {
-    name: 'DECIMALS',
-    type: 'u8',
-    value: decimals.toString(),
-  });
+  // Add config with decimals
+  if (decimals === DEFAULT_DECIMALS) {
+    c.addUseClause('openzeppelin::token::erc20', 'DefaultConfig', { alias: 'ERC20DefaultConfig' });
+  } else {
+    const trait: BaseImplementedTrait = {
+      name: 'ERC20ImmutableConfig',
+      of: 'ERC20Component::ImmutableConfig',
+      tags: [],
+    };
+    c.addImplementedTrait(trait);
+    c.addSuperVariableToTrait(trait, {
+      name: 'DECIMALS',
+      type: 'u8',
+      value: decimals.toString(),
+    });
+  }
 }
 
 function addBurnable(c: ContractBuilder) {

From f1f59d8cf002c94b0a05fa4e7e3d208014b3c77e Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Mon, 8 Sep 2025 12:05:14 +0300
Subject: [PATCH 15/22] Update Cairo ERC20 snapshots

---
 packages/core/cairo/src/erc20.test.ts.md      | 110 +++++-------------
 packages/core/cairo/src/erc20.test.ts.snap    | Bin 2891 -> 2883 bytes
 .../core/cairo_alpha/src/erc20.test.ts.md     | 110 +++++-------------
 .../core/cairo_alpha/src/erc20.test.ts.snap   | Bin 2953 -> 2948 bytes
 4 files changed, 60 insertions(+), 160 deletions(-)

diff --git a/packages/core/cairo/src/erc20.test.ts.md b/packages/core/cairo/src/erc20.test.ts.md
index 46fceae14..312775239 100644
--- a/packages/core/cairo/src/erc20.test.ts.md
+++ b/packages/core/cairo/src/erc20.test.ts.md
@@ -13,7 +13,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     #[starknet::contract]␊
     mod MyToken {␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
     ␊
         component!(path: ERC20Component, storage: erc20, event: ERC20Event);␊
     ␊
@@ -41,10 +43,6 @@ Generated by [AVA](https://avajs.dev).
         fn constructor(ref self: ContractState) {␊
             self.erc20.initializer("MyToken", "MTK");␊
         }␊
-    ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     }␊
     `
 
@@ -58,7 +56,9 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -104,10 +104,6 @@ Generated by [AVA](https://avajs.dev).
             self.erc20.initializer("MyToken", "MTK");␊
             self.ownable.initializer(owner);␊
         }␊
-    ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -133,7 +129,9 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress, get_caller_address};␊
@@ -180,10 +178,6 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -218,7 +212,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -285,10 +279,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -334,7 +324,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -416,10 +406,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -461,7 +447,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress, get_caller_address};␊
@@ -528,10 +514,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -577,7 +559,9 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -625,10 +609,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
             self.erc20.mint(recipient, 1000000000000000000000);␊
         }␊
-    ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -654,7 +634,9 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -700,10 +682,6 @@ Generated by [AVA](https://avajs.dev).
             self.erc20.initializer("MyToken", "MTK");␊
             self.ownable.initializer(owner);␊
         }␊
-    ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -804,7 +782,9 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -851,10 +831,6 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -893,7 +869,9 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊
         use openzeppelin::introspection::src5::SRC5Component;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
@@ -955,10 +933,6 @@ Generated by [AVA](https://avajs.dev).
             self.accesscontrol._grant_role(UPGRADER_ROLE, upgrader);␊
         }␊
     ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -994,7 +968,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1069,10 +1043,6 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
-        ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -1113,7 +1083,7 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1188,10 +1158,6 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
-        ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -1231,7 +1197,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::governance::votes::VotesComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
         use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊
         use starknet::ContractAddress;␊
@@ -1289,10 +1255,6 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
-        ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -1322,7 +1284,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
         use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊
         use starknet::{ContractAddress, get_caller_address};␊
@@ -1410,10 +1372,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -1469,7 +1427,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1565,10 +1523,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -1641,7 +1595,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::interface::IUpgradeable;␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1754,10 +1708,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
diff --git a/packages/core/cairo/src/erc20.test.ts.snap b/packages/core/cairo/src/erc20.test.ts.snap
index 3252f8e9ba35c8ec44cedbfb865f2b947928f0e2..dd48a416fe6afd9989435bf4d034d43ee0f63545 100644
GIT binary patch
literal 2883
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

literal 2891
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

diff --git a/packages/core/cairo_alpha/src/erc20.test.ts.md b/packages/core/cairo_alpha/src/erc20.test.ts.md
index 605db2e93..6165f60d9 100644
--- a/packages/core/cairo_alpha/src/erc20.test.ts.md
+++ b/packages/core/cairo_alpha/src/erc20.test.ts.md
@@ -13,7 +13,9 @@ Generated by [AVA](https://avajs.dev).
     ␊
     #[starknet::contract]␊
     mod MyToken {␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
     ␊
         component!(path: ERC20Component, storage: erc20, event: ERC20Event);␊
     ␊
@@ -41,10 +43,6 @@ Generated by [AVA](https://avajs.dev).
         fn constructor(ref self: ContractState) {␊
             self.erc20.initializer("MyToken", "MTK");␊
         }␊
-    ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     }␊
     `
 
@@ -59,7 +57,9 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
     ␊
@@ -104,10 +104,6 @@ Generated by [AVA](https://avajs.dev).
             self.erc20.initializer("MyToken", "MTK");␊
             self.ownable.initializer(owner);␊
         }␊
-    ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -134,7 +130,9 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress, get_caller_address};␊
     ␊
@@ -180,10 +178,6 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -219,7 +213,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
     ␊
@@ -285,10 +279,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -335,7 +325,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
         use super::{PAUSER_ROLE, UPGRADER_ROLE};␊
@@ -416,10 +406,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -462,7 +448,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress, get_caller_address};␊
     ␊
@@ -528,10 +514,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -578,7 +560,9 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
     ␊
@@ -625,10 +609,6 @@ Generated by [AVA](https://avajs.dev).
     ␊
             self.erc20.mint(recipient, 1000000000000000000000);␊
         }␊
-    ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -655,7 +635,9 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
     ␊
@@ -700,10 +682,6 @@ Generated by [AVA](https://avajs.dev).
             self.erc20.initializer("MyToken", "MTK");␊
             self.ownable.initializer(owner);␊
         }␊
-    ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // Upgradeable␊
@@ -805,7 +783,9 @@ Generated by [AVA](https://avajs.dev).
     mod MyToken {␊
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
     ␊
@@ -851,10 +831,6 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -894,7 +870,9 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::accesscontrol::{AccessControlComponent, DEFAULT_ADMIN_ROLE};␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
-        use openzeppelin::token::erc20::{ERC20Component, ERC20HooksEmptyImpl};␊
+        use openzeppelin::token::erc20::{␊
+        	DefaultConfig as ERC20DefaultConfig, ERC20Component, ERC20HooksEmptyImpl␊
+        };␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use starknet::{ClassHash, ContractAddress};␊
         use super::{MINTER_ROLE, UPGRADER_ROLE};␊
@@ -955,10 +933,6 @@ Generated by [AVA](https://avajs.dev).
             self.accesscontrol._grant_role(UPGRADER_ROLE, upgrader);␊
         }␊
     ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -995,7 +969,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1070,10 +1044,6 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
-        ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -1115,7 +1085,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1190,10 +1160,6 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
-        ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -1233,7 +1199,7 @@ Generated by [AVA](https://avajs.dev).
     #[starknet::contract]␊
     mod MyToken {␊
         use openzeppelin::governance::votes::VotesComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
         use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊
@@ -1292,10 +1258,6 @@ Generated by [AVA](https://avajs.dev).
                 contract_state.votes.transfer_voting_units(from, recipient, amount);␊
             }␊
         }␊
-        ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
     ␊
         //␊
         // SNIP12 Metadata␊
@@ -1325,7 +1287,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::access::ownable::OwnableComponent;␊
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
         use openzeppelin::utils::cryptography::snip12::SNIP12Metadata;␊
@@ -1414,10 +1376,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -1474,7 +1432,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::governance::votes::VotesComponent;␊
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1570,10 +1528,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
@@ -1647,7 +1601,7 @@ Generated by [AVA](https://avajs.dev).
         use openzeppelin::interfaces::upgrades::IUpgradeable;␊
         use openzeppelin::introspection::src5::SRC5Component;␊
         use openzeppelin::security::pausable::PausableComponent;␊
-        use openzeppelin::token::erc20::ERC20Component;␊
+        use openzeppelin::token::erc20::{DefaultConfig as ERC20DefaultConfig, ERC20Component};␊
         use openzeppelin::upgrades::UpgradeableComponent;␊
         use openzeppelin::utils::contract_clock::ERC6372TimestampClock;␊
         use openzeppelin::utils::cryptography::nonces::NoncesComponent;␊
@@ -1760,10 +1714,6 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
         ␊
-        impl ERC20ImmutableConfig of ERC20Component::ImmutableConfig {␊
-            const DECIMALS: u8 = 18;␊
-        }␊
-        ␊
         #[generate_trait]␊
         #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
diff --git a/packages/core/cairo_alpha/src/erc20.test.ts.snap b/packages/core/cairo_alpha/src/erc20.test.ts.snap
index 4ba87ba6d6a8b5e9b3e3899f452e1f2723cc9661..0c3dcf1ad89b5426f51169d26ec0f5e5569fd032 100644
GIT binary patch
literal 2948
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

literal 2953
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


From d38c6e42d25e664595d12b74271b555189de10f9 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Mon, 8 Sep 2025 12:08:19 +0300
Subject: [PATCH 16/22] Remove decimals param in tests when default value is
 used

---
 packages/core/cairo/src/erc20.test.ts       | 2 --
 packages/core/cairo_alpha/src/erc20.test.ts | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/core/cairo/src/erc20.test.ts b/packages/core/cairo/src/erc20.test.ts
index a63e90a26..760cc8b53 100644
--- a/packages/core/cairo/src/erc20.test.ts
+++ b/packages/core/cairo/src/erc20.test.ts
@@ -110,7 +110,6 @@ test('erc20 votes, no name', async t => {
     buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
-      decimals: '18',
       votes: true,
     }),
   );
@@ -122,7 +121,6 @@ test('erc20 votes, empty version', async t => {
     buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
-      decimals: '18',
       votes: true,
       appName: 'MY_DAPP_NAME',
       appVersion: '', // avoids default value of v1
diff --git a/packages/core/cairo_alpha/src/erc20.test.ts b/packages/core/cairo_alpha/src/erc20.test.ts
index a63e90a26..760cc8b53 100644
--- a/packages/core/cairo_alpha/src/erc20.test.ts
+++ b/packages/core/cairo_alpha/src/erc20.test.ts
@@ -110,7 +110,6 @@ test('erc20 votes, no name', async t => {
     buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
-      decimals: '18',
       votes: true,
     }),
   );
@@ -122,7 +121,6 @@ test('erc20 votes, empty version', async t => {
     buildERC20({
       name: 'MyToken',
       symbol: 'MTK',
-      decimals: '18',
       votes: true,
       appName: 'MY_DAPP_NAME',
       appVersion: '', // avoids default value of v1

From b22d3bcf3b235d498b5bc0dc59e445a897dbab6f Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Mon, 8 Sep 2025 12:33:59 +0300
Subject: [PATCH 17/22] Add custom decimals to ERC20 generator

---
 packages/core/cairo/src/generate/erc20.ts       | 2 +-
 packages/core/cairo_alpha/src/generate/erc20.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/cairo/src/generate/erc20.ts b/packages/core/cairo/src/generate/erc20.ts
index b30d3c9e7..6d73a7e9d 100644
--- a/packages/core/cairo/src/generate/erc20.ts
+++ b/packages/core/cairo/src/generate/erc20.ts
@@ -9,7 +9,7 @@ const booleans = [true, false];
 const blueprint = {
   name: ['MyToken'],
   symbol: ['MTK'],
-  decimals: ['18'],
+  decimals: ['6', '18'],
   burnable: booleans,
   pausable: booleans,
   mintable: booleans,
diff --git a/packages/core/cairo_alpha/src/generate/erc20.ts b/packages/core/cairo_alpha/src/generate/erc20.ts
index b30d3c9e7..6d73a7e9d 100644
--- a/packages/core/cairo_alpha/src/generate/erc20.ts
+++ b/packages/core/cairo_alpha/src/generate/erc20.ts
@@ -9,7 +9,7 @@ const booleans = [true, false];
 const blueprint = {
   name: ['MyToken'],
   symbol: ['MTK'],
-  decimals: ['18'],
+  decimals: ['6', '18'],
   burnable: booleans,
   pausable: booleans,
   mintable: booleans,

From 26bbdcd6b83a08bab9a9e997ba866638f63aeea0 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Mon, 8 Sep 2025 12:36:59 +0300
Subject: [PATCH 18/22] Lint ts files

---
 packages/core/cairo_alpha/src/erc20.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/cairo_alpha/src/erc20.ts b/packages/core/cairo_alpha/src/erc20.ts
index c210ff214..187ff56b9 100644
--- a/packages/core/cairo_alpha/src/erc20.ts
+++ b/packages/core/cairo_alpha/src/erc20.ts
@@ -74,7 +74,7 @@ export function buildERC20(opts: ERC20Options): Contract {
   const c = new ContractBuilder(opts.name);
   const allOpts = withDefaults(opts);
   const decimals = toUint(allOpts.decimals, 'decimals', 'u8');
-  
+
   addBase(c, toByteArray(allOpts.name), toByteArray(allOpts.symbol), decimals);
   addERC20Mixin(c);
 

From f07c29aec8df057f2014a4ade0daaba6e78d1139 Mon Sep 17 00:00:00 2001
From: immrsd <immrsd.eth@gmail.com>
Date: Mon, 8 Sep 2025 13:23:06 +0300
Subject: [PATCH 19/22] Remove custom decimals from Cairo ERC20 generator

---
 packages/core/cairo/src/generate/erc20.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/cairo/src/generate/erc20.ts b/packages/core/cairo/src/generate/erc20.ts
index 6d73a7e9d..b30d3c9e7 100644
--- a/packages/core/cairo/src/generate/erc20.ts
+++ b/packages/core/cairo/src/generate/erc20.ts
@@ -9,7 +9,7 @@ const booleans = [true, false];
 const blueprint = {
   name: ['MyToken'],
   symbol: ['MTK'],
-  decimals: ['6', '18'],
+  decimals: ['18'],
   burnable: booleans,
   pausable: booleans,
   mintable: booleans,

From 21238f9e3a79f1136285a03826f95773433a1510 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 8 Sep 2025 23:01:31 -0400
Subject: [PATCH 20/22] Revert changelog entries in favor of changeset

---
 packages/common/CHANGELOG.md           | 3 ---
 packages/core/cairo/CHANGELOG.md       | 3 ---
 packages/core/cairo_alpha/CHANGELOG.md | 2 --
 3 files changed, 8 deletions(-)

diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
index 0ff09c214..2513e5364 100644
--- a/packages/common/CHANGELOG.md
+++ b/packages/common/CHANGELOG.md
@@ -1,9 +1,6 @@
 # Changelog
 
 
-## 0.1.1 (2025-09-02)
-- Cairo: Add decimals to ERC20 scheme ([#654](https://github.com/OpenZeppelin/contracts-wizard/pull/654))
-
 ## 0.1.0 (2025-08-15)
 
 - Bump minor version for semantic versioning stability ([#631](https://github.com/OpenZeppelin/contracts-wizard/pull/631))
diff --git a/packages/core/cairo/CHANGELOG.md b/packages/core/cairo/CHANGELOG.md
index 9cfc58ae5..1e064fd58 100644
--- a/packages/core/cairo/CHANGELOG.md
+++ b/packages/core/cairo/CHANGELOG.md
@@ -1,8 +1,5 @@
 # Changelog
 
-## 2.1.0 (2025-09-02)
-
-- Support ERC20 decimals customization ([#654](https://github.com/OpenZeppelin/contracts-wizard/pull/654))
 
 ## 2.0.1 (2025-08-20)
 
diff --git a/packages/core/cairo_alpha/CHANGELOG.md b/packages/core/cairo_alpha/CHANGELOG.md
index 0a28f4492..1c46b74cd 100644
--- a/packages/core/cairo_alpha/CHANGELOG.md
+++ b/packages/core/cairo_alpha/CHANGELOG.md
@@ -2,8 +2,6 @@
 
 ## Unreleased
 
-- Support ERC20 decimals customization ([#654](https://github.com/OpenZeppelin/contracts-wizard/pull/654))
-
 - **Breaking changes**:
   - Use OpenZeppelin Contracts for Cairo v3.0.0-alpha.1. ([#638](https://github.com/OpenZeppelin/contracts-wizard/pull/638))
   - Use OpenZeppelin Contracts for Cairo v3.0.0-alpha.0. ([#623](https://github.com/OpenZeppelin/contracts-wizard/pull/623))

From d6e9c83bc714fec90ae4e2b5208a62265f98697f Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 8 Sep 2025 23:03:23 -0400
Subject: [PATCH 21/22] Revert package.json updates in favor of changeset

---
 packages/common/package.json     | 4 ++--
 packages/core/cairo/package.json | 2 +-
 packages/mcp/package.json        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/common/package.json b/packages/common/package.json
index ae906be5c..eac6580dc 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-common",
-  "version": "0.1.1",
+  "version": "0.1.0",
   "description": "Common library for OpenZeppelin Contracts Wizard components. Used internally.",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
@@ -21,4 +21,4 @@
     "@types/node": "^20.0.0",
     "typescript": "^5.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/core/cairo/package.json b/packages/core/cairo/package.json
index a98ef8890..928e3e971 100644
--- a/packages/core/cairo/package.json
+++ b/packages/core/cairo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-cairo",
-  "version": "2.1.0",
+  "version": "2.0.1",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts for Cairo",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",
diff --git a/packages/mcp/package.json b/packages/mcp/package.json
index 35af353a8..3e3dff2ce 100644
--- a/packages/mcp/package.json
+++ b/packages/mcp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/contracts-mcp",
-  "version": "0.1.1",
+  "version": "0.1.0",
   "description": "OpenZeppelin Contracts MCP Server",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",

From 732d5858166741ef4574fd1289dac5ae6aa20dbd Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 8 Sep 2025 23:04:16 -0400
Subject: [PATCH 22/22] Make decimals optional for MCP

---
 packages/mcp/src/cairo/schemas.ts          | 2 +-
 packages/mcp/src/cairo/tools/erc20.test.ts | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/mcp/src/cairo/schemas.ts b/packages/mcp/src/cairo/schemas.ts
index b6e351f64..075558331 100644
--- a/packages/mcp/src/cairo/schemas.ts
+++ b/packages/mcp/src/cairo/schemas.ts
@@ -47,7 +47,7 @@ export const commonSchema = {
 export const erc20Schema = {
   name: z.string().describe(commonDescriptions.name),
   symbol: z.string().describe(commonDescriptions.symbol),
-  decimals: z.string().describe(cairoERC20Descriptions.decimals),
+  decimals: z.string().optional().describe(cairoERC20Descriptions.decimals),
   burnable: z.boolean().optional().describe(commonDescriptions.burnable),
   pausable: z.boolean().optional().describe(commonDescriptions.pausable),
   premint: z.string().optional().describe(cairoERC20Descriptions.premint),
diff --git a/packages/mcp/src/cairo/tools/erc20.test.ts b/packages/mcp/src/cairo/tools/erc20.test.ts
index c00a3a5c5..0f3deb7e7 100644
--- a/packages/mcp/src/cairo/tools/erc20.test.ts
+++ b/packages/mcp/src/cairo/tools/erc20.test.ts
@@ -34,7 +34,6 @@ test('basic', async t => {
   const params: z.infer<typeof t.context.schema> = {
     name: 'MyToken',
     symbol: 'MTK',
-    decimals: '18',
   };
   await assertAPIEquivalence(t, params, erc20.print);
 });