From 53e9b57346ac201f36e7fc40a9217ad38172551a Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 12 Feb 2024 10:46:37 -0500
Subject: [PATCH 1/7] Remove non-standard increase_allowance and
 decrease_allowance from ERC20

---
 packages/core-cairo/CHANGELOG.md           |   5 ++
 packages/core-cairo/src/erc20.test.ts      |   7 --
 packages/core-cairo/src/erc20.test.ts.md   |  97 ---------------------
 packages/core-cairo/src/erc20.test.ts.snap | Bin 2408 -> 2233 bytes
 packages/core-cairo/src/erc20.ts           |  46 ----------
 packages/core-cairo/src/utils/version.ts   |   2 +-
 packages/ui/src/cairo/ERC20Controls.svelte |   8 --
 7 files changed, 6 insertions(+), 159 deletions(-)

diff --git a/packages/core-cairo/CHANGELOG.md b/packages/core-cairo/CHANGELOG.md
index 8f1f01474..b3ce27d6a 100644
--- a/packages/core-cairo/CHANGELOG.md
+++ b/packages/core-cairo/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+
+- **Breaking changes**:
+  - Remove non-standard `safeAllowance` option from ERC20.
+
 ## 0.8.0 (2023-12-11)
 
 - **Breaking changes**:
diff --git a/packages/core-cairo/src/erc20.test.ts b/packages/core-cairo/src/erc20.test.ts
index 27404f99a..87e9776ea 100644
--- a/packages/core-cairo/src/erc20.test.ts
+++ b/packages/core-cairo/src/erc20.test.ts
@@ -68,17 +68,12 @@ testERC20('erc20 mintable with roles', {
   access: 'roles',
 });
 
-testERC20('erc20 safe allowance', {
-  safeAllowance: true,
-});
-
 testERC20('erc20 full upgradeable', {
   premint: '2000',
   access: 'ownable',
   burnable: true,
   mintable: true,
   pausable: true,
-  safeAllowance: true,
   upgradeable: true,
 });
 
@@ -88,7 +83,6 @@ testERC20('erc20 full upgradeable with roles', {
   burnable: true,
   mintable: true,
   pausable: true,
-  safeAllowance: true,
   upgradeable: true,
 });
 
@@ -104,7 +98,6 @@ testAPIEquivalence('erc20 API full upgradeable', {
   burnable: true,
   mintable: true,
   pausable: true,
-  safeAllowance: true,
   upgradeable: true,
 });
 
diff --git a/packages/core-cairo/src/erc20.test.ts.md b/packages/core-cairo/src/erc20.test.ts.md
index f9ce8e885..a21e92fc3 100644
--- a/packages/core-cairo/src/erc20.test.ts.md
+++ b/packages/core-cairo/src/erc20.test.ts.md
@@ -734,51 +734,6 @@ Generated by [AVA](https://avajs.dev).
     }␊
     `
 
-## erc20 safe allowance
-
-> Snapshot 1
-
-    `// SPDX-License-Identifier: MIT␊
-    ␊
-    #[starknet::contract]␊
-    mod MyToken {␊
-        use openzeppelin::token::erc20::ERC20Component;␊
-    ␊
-        component!(path: ERC20Component, storage: erc20, event: ERC20Event);␊
-    ␊
-        #[abi(embed_v0)]␊
-        impl ERC20MetadataImpl = ERC20Component::ERC20MetadataImpl<ContractState>;␊
-        #[abi(embed_v0)]␊
-        impl ERC20Impl = ERC20Component::ERC20Impl<ContractState>;␊
-        #[abi(embed_v0)]␊
-        impl ERC20CamelOnlyImpl = ERC20Component::ERC20CamelOnlyImpl<ContractState>;␊
-        #[abi(embed_v0)]␊
-        impl SafeAllowanceImpl = ERC20Component::SafeAllowanceImpl<ContractState>;␊
-        #[abi(embed_v0)]␊
-        impl SafeAllowanceCamelImpl = ERC20Component::SafeAllowanceCamelImpl<ContractState>;␊
-    ␊
-        impl ERC20InternalImpl = ERC20Component::InternalImpl<ContractState>;␊
-    ␊
-        #[storage]␊
-        struct Storage {␊
-            #[substorage(v0)]␊
-            erc20: ERC20Component::Storage,␊
-        }␊
-    ␊
-        #[event]␊
-        #[derive(Drop, starknet::Event)]␊
-        enum Event {␊
-            #[flat]␊
-            ERC20Event: ERC20Component::Event,␊
-        }␊
-    ␊
-        #[constructor]␊
-        fn constructor(ref self: ContractState) {␊
-            self.erc20.initializer('MyToken', 'MTK');␊
-        }␊
-    }␊
-    `
-
 ## erc20 full upgradeable
 
 > Snapshot 1
@@ -904,32 +859,6 @@ Generated by [AVA](https://avajs.dev).
                 self.transfer_from(sender, recipient, amount)␊
             }␊
         }␊
-    ␊
-        #[external(v0)]␊
-        impl SafeAllowanceImpl of interface::ISafeAllowance<ContractState> {␊
-            fn increase_allowance(ref self: ContractState, spender: ContractAddress, added_value: u256) -> bool {␊
-                self.pausable.assert_not_paused();␊
-                self.erc20.increase_allowance(spender, added_value)␊
-            }␊
-    ␊
-            fn decrease_allowance(ref self: ContractState, spender: ContractAddress, subtracted_value: u256) -> bool {␊
-                self.pausable.assert_not_paused();␊
-                self.erc20.decrease_allowance(spender, subtracted_value)␊
-            }␊
-        }␊
-    ␊
-        #[external(v0)]␊
-        impl SafeAllowanceCamelImpl of interface::ISafeAllowanceCamel<ContractState> {␊
-            fn increaseAllowance(ref self: ContractState, spender: ContractAddress, addedValue: u256) -> bool {␊
-                self.pausable.assert_not_paused();␊
-                self.increase_allowance(spender, addedValue)␊
-            }␊
-    ␊
-            fn decreaseAllowance(ref self: ContractState, spender: ContractAddress, subtractedValue: u256) -> bool {␊
-                self.pausable.assert_not_paused();␊
-                self.decrease_allowance(spender, subtractedValue)␊
-            }␊
-        }␊
     ␊
         #[generate_trait]␊
         #[external(v0)]␊
@@ -1117,32 +1046,6 @@ Generated by [AVA](https://avajs.dev).
                 self.transfer_from(sender, recipient, amount)␊
             }␊
         }␊
-    ␊
-        #[external(v0)]␊
-        impl SafeAllowanceImpl of interface::ISafeAllowance<ContractState> {␊
-            fn increase_allowance(ref self: ContractState, spender: ContractAddress, added_value: u256) -> bool {␊
-                self.pausable.assert_not_paused();␊
-                self.erc20.increase_allowance(spender, added_value)␊
-            }␊
-    ␊
-            fn decrease_allowance(ref self: ContractState, spender: ContractAddress, subtracted_value: u256) -> bool {␊
-                self.pausable.assert_not_paused();␊
-                self.erc20.decrease_allowance(spender, subtracted_value)␊
-            }␊
-        }␊
-    ␊
-        #[external(v0)]␊
-        impl SafeAllowanceCamelImpl of interface::ISafeAllowanceCamel<ContractState> {␊
-            fn increaseAllowance(ref self: ContractState, spender: ContractAddress, addedValue: u256) -> bool {␊
-                self.pausable.assert_not_paused();␊
-                self.increase_allowance(spender, addedValue)␊
-            }␊
-    ␊
-            fn decreaseAllowance(ref self: ContractState, spender: ContractAddress, subtractedValue: u256) -> bool {␊
-                self.pausable.assert_not_paused();␊
-                self.decrease_allowance(spender, subtractedValue)␊
-            }␊
-        }␊
     ␊
         #[generate_trait]␊
         #[external(v0)]␊
diff --git a/packages/core-cairo/src/erc20.test.ts.snap b/packages/core-cairo/src/erc20.test.ts.snap
index becbd01c4f07977fd6b56be5ca21e26870bb9066..acdb41474a6b2acad2fc925519d66790a6a1dfd1 100644
GIT binary patch
literal 2233
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
HnT7xWX{I{w

literal 2408
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
a)3>syTuO@EWBoYG%>M(kps=_plmGyf4U>of

diff --git a/packages/core-cairo/src/erc20.ts b/packages/core-cairo/src/erc20.ts
index 81f609ba2..8d046ad58 100644
--- a/packages/core-cairo/src/erc20.ts
+++ b/packages/core-cairo/src/erc20.ts
@@ -19,7 +19,6 @@ export const defaults: Required<ERC20Options> = {
   pausable: false,
   premint: '0',
   mintable: false,
-  safeAllowance: false,
   access: commonDefaults.access,
   upgradeable: commonDefaults.upgradeable,
   info: commonDefaults.info
@@ -36,7 +35,6 @@ export interface ERC20Options extends CommonOptions {
   pausable?: boolean;
   premint?: string;
   mintable?: boolean;
-  safeAllowance?: boolean;
 }
 
 function withDefaults(opts: ERC20Options): Required<ERC20Options> {
@@ -47,7 +45,6 @@ function withDefaults(opts: ERC20Options): Required<ERC20Options> {
     pausable: opts.pausable ?? defaults.pausable,
     premint: opts.premint || defaults.premint,
     mintable: opts.mintable ?? defaults.mintable,
-    safeAllowance: opts.safeAllowance ?? defaults.safeAllowance,
   };
 }
 
@@ -63,10 +60,6 @@ export function buildERC20(opts: ERC20Options): Contract {
   addBase(c, toShortString(allOpts.name, 'name'), toShortString(allOpts.symbol, 'symbol'));
   addERC20ImplAndCamelOnlyImpl(c, allOpts.pausable);
 
-  if (allOpts.safeAllowance) {
-    addSafeAllowance(c, allOpts.pausable);
-  }
-
   if (allOpts.premint) {
     addPremint(c, allOpts.premint);
   }
@@ -150,45 +143,6 @@ function addBase(c: ContractBuilder, name: string, symbol: string) {
   );
 }
 
-function addSafeAllowance(c: ContractBuilder, pausable: boolean) {
-  if (pausable) {
-    addERC20Interface(c);
-
-    const SafeAllowanceImpl: BaseImplementedTrait = {
-      name: 'SafeAllowanceImpl',
-      of: 'interface::ISafeAllowance<ContractState>',
-      tags: [
-        '#[external(v0)]'
-      ],
-    }
-    setPausable(c, SafeAllowanceImpl, functions.increase_allowance);
-    setPausable(c, SafeAllowanceImpl, functions.decrease_allowance);
-
-    const SafeAllowanceCamelImpl: BaseImplementedTrait = {
-      name: 'SafeAllowanceCamelImpl',
-      of: 'interface::ISafeAllowanceCamel<ContractState>',
-      tags: [
-        '#[external(v0)]'
-      ],
-    }
-    setPausable(c, SafeAllowanceCamelImpl, functions.increaseAllowance);
-    setPausable(c, SafeAllowanceCamelImpl, functions.decreaseAllowance);
-  } else {
-    c.addImplToComponent(components.ERC20Component, 
-      {
-        name: 'SafeAllowanceImpl',
-        value: 'ERC20Component::SafeAllowanceImpl<ContractState>',
-      },
-    );
-    c.addImplToComponent(components.ERC20Component,
-      {
-        name: 'SafeAllowanceCamelImpl',
-        value: 'ERC20Component::SafeAllowanceCamelImpl<ContractState>',
-      },
-    );  
-  }
-}
-
 function addBurnable(c: ContractBuilder) {
   c.addStandaloneImport('starknet::get_caller_address');
   c.addFunction(externalTrait, functions.burn);
diff --git a/packages/core-cairo/src/utils/version.ts b/packages/core-cairo/src/utils/version.ts
index d4e0b24bb..372aaa760 100644
--- a/packages/core-cairo/src/utils/version.ts
+++ b/packages/core-cairo/src/utils/version.ts
@@ -1,2 +1,2 @@
-export const contractsVersion = '0.8.0';
+export const contractsVersion = '0.9.0';
 export const contractsVersionTag = `v${contractsVersion}`;
diff --git a/packages/ui/src/cairo/ERC20Controls.svelte b/packages/ui/src/cairo/ERC20Controls.svelte
index a6e3e0eb2..15742d044 100644
--- a/packages/ui/src/cairo/ERC20Controls.svelte
+++ b/packages/ui/src/cairo/ERC20Controls.svelte
@@ -74,14 +74,6 @@
       </HelpTooltip>
     </label>
 
-    <label class:checked={opts.safeAllowance}>
-      <input type="checkbox" bind:checked={opts.safeAllowance}>
-      Safe Allowance
-      <HelpTooltip link="https://docs.openzeppelin.com/contracts-cairo/api/erc20#ERC20Component-increase_allowance">
-        Enables non-standard increase/decrease allowance methods.
-      </HelpTooltip>
-    </label>
-
     <UpgradeabilityField bind:upgradeable={opts.upgradeable} />
   </div>
 </section>

From 9b4413fd31b831eb3226e450a9782e0741ccba64 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 12 Feb 2024 10:50:45 -0500
Subject: [PATCH 2/7] Update changelog

---
 packages/core-cairo/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core-cairo/CHANGELOG.md b/packages/core-cairo/CHANGELOG.md
index b3ce27d6a..29ad60074 100644
--- a/packages/core-cairo/CHANGELOG.md
+++ b/packages/core-cairo/CHANGELOG.md
@@ -3,7 +3,7 @@
 ## Unreleased
 
 - **Breaking changes**:
-  - Remove non-standard `safeAllowance` option from ERC20.
+  - Remove non-standard `safeAllowance` option from ERC20. ([#324](https://github.com/OpenZeppelin/contracts-wizard/pull/324))
 
 ## 0.8.0 (2023-12-11)
 

From cab93843350b36074bfdd3183a6586239bd0ce11 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 12 Feb 2024 13:42:40 -0500
Subject: [PATCH 3/7] Remove remaining safeAllowance code

---
 packages/core-cairo/src/erc20.ts          | 48 -----------------------
 packages/core-cairo/src/generate/erc20.ts |  1 -
 2 files changed, 49 deletions(-)

diff --git a/packages/core-cairo/src/erc20.ts b/packages/core-cairo/src/erc20.ts
index 8d046ad58..5bc1698c8 100644
--- a/packages/core-cairo/src/erc20.ts
+++ b/packages/core-cairo/src/erc20.ts
@@ -356,52 +356,4 @@ const functions = defineFunctions({
     ],
     returns : 'bool',
   },
-
-  // Re-implements SafeAllowanceImpl
-  increase_allowance: {
-    args: [
-      getSelfArg(),
-      { name: 'spender', type: 'ContractAddress' },
-      { name: 'added_value', type: 'u256' },
-    ],
-    code: [
-      'self.erc20.increase_allowance(spender, added_value)'
-    ],
-    returns : 'bool',
-  },
-  decrease_allowance: {
-    args: [
-      getSelfArg(),
-      { name: 'spender', type: 'ContractAddress' },
-      { name: 'subtracted_value', type: 'u256' },
-    ],
-    code: [
-      'self.erc20.decrease_allowance(spender, subtracted_value)'
-    ],
-    returns : 'bool',
-  },
-
-  // Re-implements SafeAllowanceCamelImpl
-  increaseAllowance: {
-    args: [
-      getSelfArg(),
-      { name: 'spender', type: 'ContractAddress' },
-      { name: 'addedValue', type: 'u256' },
-    ],
-    code: [
-      'self.increase_allowance(spender, addedValue)'
-    ],
-    returns : 'bool',
-  },
-  decreaseAllowance: {
-    args: [
-      getSelfArg(),
-      { name: 'spender', type: 'ContractAddress' },
-      { name: 'subtractedValue', type: 'u256' },
-    ],
-    code: [
-      'self.decrease_allowance(spender, subtractedValue)'
-    ],
-    returns : 'bool',
-  },
 });
diff --git a/packages/core-cairo/src/generate/erc20.ts b/packages/core-cairo/src/generate/erc20.ts
index 5621199e7..e70c4d599 100644
--- a/packages/core-cairo/src/generate/erc20.ts
+++ b/packages/core-cairo/src/generate/erc20.ts
@@ -12,7 +12,6 @@ const blueprint = {
   burnable: booleans,
   pausable: booleans,
   mintable: booleans,
-  safeAllowance: booleans,
   premint: ['1'],
   access: accessOptions,
   upgradeable: upgradeableOptions,

From a35f2c8b137540466aecbd8ae45b171ac04a8172 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 12 Feb 2024 13:46:07 -0500
Subject: [PATCH 4/7] Update copyright year

---
 LICENSE                       | 2 +-
 packages/ui/public/cairo.html | 2 +-
 packages/ui/public/index.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/LICENSE b/LICENSE
index 0fcfda821..00501370f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021-2023 zOS Global Limited and contributors
+Copyright (c) 2021-2024 zOS Global Limited and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/packages/ui/public/cairo.html b/packages/ui/public/cairo.html
index e45a5c280..f70741172 100644
--- a/packages/ui/public/cairo.html
+++ b/packages/ui/public/cairo.html
@@ -58,7 +58,7 @@
   </div>
 
   <footer>
-    <p>© <a href="https://openzeppelin.com" target="_blank" rel="noopener noreferrer">OpenZeppelin</a> 2022-2023 |&nbsp;<a href="https://openzeppelin.com/privacy" target="_blank" rel="noopener noreferrer">Privacy</a> |&nbsp;<a href="https://openzeppelin.com/tos" target="_blank" rel="noopener noreferrer">Terms of Service</a></p>
+    <p>© <a href="https://openzeppelin.com" target="_blank" rel="noopener noreferrer">OpenZeppelin</a> 2022-2024 |&nbsp;<a href="https://openzeppelin.com/privacy" target="_blank" rel="noopener noreferrer">Privacy</a> |&nbsp;<a href="https://openzeppelin.com/tos" target="_blank" rel="noopener noreferrer">Terms of Service</a></p>
   </footer>
 
 <!-- Start of HubSpot Embed Code -->
diff --git a/packages/ui/public/index.html b/packages/ui/public/index.html
index 1e2d89b63..e33a0c43f 100644
--- a/packages/ui/public/index.html
+++ b/packages/ui/public/index.html
@@ -90,7 +90,7 @@
   </div>
 
   <footer>
-    <p>© <a href="https://openzeppelin.com" target="_blank" rel="noopener noreferrer">OpenZeppelin</a> 2017-2023 |&nbsp;<a href="https://openzeppelin.com/privacy" target="_blank" rel="noopener noreferrer">Privacy</a> |&nbsp;<a href="https://openzeppelin.com/tos" target="_blank" rel="noopener noreferrer">Terms of Service</a></p>
+    <p>© <a href="https://openzeppelin.com" target="_blank" rel="noopener noreferrer">OpenZeppelin</a> 2017-2024 |&nbsp;<a href="https://openzeppelin.com/privacy" target="_blank" rel="noopener noreferrer">Privacy</a> |&nbsp;<a href="https://openzeppelin.com/tos" target="_blank" rel="noopener noreferrer">Terms of Service</a></p>
   </footer>
 
 <!-- Start of HubSpot Embed Code -->

From 461d6b070b09a22bed0e2fb4bf6e2c017fca9791 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 12 Feb 2024 13:47:57 -0500
Subject: [PATCH 5/7] Bump package version

---
 packages/core-cairo/CHANGELOG.md | 2 +-
 packages/core-cairo/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core-cairo/CHANGELOG.md b/packages/core-cairo/CHANGELOG.md
index 29ad60074..5ca223939 100644
--- a/packages/core-cairo/CHANGELOG.md
+++ b/packages/core-cairo/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 0.9.0 (2024-02-12)
 
 - **Breaking changes**:
   - Remove non-standard `safeAllowance` option from ERC20. ([#324](https://github.com/OpenZeppelin/contracts-wizard/pull/324))
diff --git a/packages/core-cairo/package.json b/packages/core-cairo/package.json
index b395a2518..4a83d5bb4 100644
--- a/packages/core-cairo/package.json
+++ b/packages/core-cairo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-cairo",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "A boilerplate generator to get started with OpenZeppelin Contracts for Cairo",
   "license": "MIT",
   "repository": "github:OpenZeppelin/contracts-wizard",

From 5a3d2d7fe7f43c80694eab039a7572b2be73a2ae Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 12 Feb 2024 15:23:18 -0500
Subject: [PATCH 6/7] Use abi(per_item) for generated trait impls

---
 packages/core-cairo/CHANGELOG.md              |   1 +
 packages/core-cairo/src/contract.test.ts      |  10 +++---
 packages/core-cairo/src/contract.test.ts.md   |   6 ++--
 packages/core-cairo/src/contract.test.ts.snap | Bin 663 -> 673 bytes
 packages/core-cairo/src/contract.ts           |   3 ++
 packages/core-cairo/src/custom.test.ts.md     |   8 +++--
 packages/core-cairo/src/custom.test.ts.snap   | Bin 1132 -> 1147 bytes
 packages/core-cairo/src/erc20.test.ts.md      |  34 +++++++++++++-----
 packages/core-cairo/src/erc20.test.ts.snap    | Bin 2233 -> 2234 bytes
 packages/core-cairo/src/erc20.ts              |   4 +--
 packages/core-cairo/src/erc721.test.ts.md     |  22 +++++++++---
 packages/core-cairo/src/erc721.test.ts.snap   | Bin 2017 -> 2029 bytes
 packages/core-cairo/src/erc721.ts             |   4 +--
 packages/core-cairo/src/external-trait.ts     |   5 +--
 packages/core-cairo/src/print.ts              |   4 +--
 packages/core-cairo/src/set-upgradeable.ts    |   2 +-
 16 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/packages/core-cairo/CHANGELOG.md b/packages/core-cairo/CHANGELOG.md
index 5ca223939..f438d56a0 100644
--- a/packages/core-cairo/CHANGELOG.md
+++ b/packages/core-cairo/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - **Breaking changes**:
   - Remove non-standard `safeAllowance` option from ERC20. ([#324](https://github.com/OpenZeppelin/contracts-wizard/pull/324))
+  - Use `abi(per_item)` attribute instead of `external` for generated trait impls.
 
 ## 0.8.0 (2023-12-11)
 
diff --git a/packages/core-cairo/src/contract.test.ts b/packages/core-cairo/src/contract.test.ts
index ef3c0757f..1cc88ba8d 100644
--- a/packages/core-cairo/src/contract.test.ts
+++ b/packages/core-cairo/src/contract.test.ts
@@ -49,9 +49,10 @@ test('contract with function code before', t => {
     name: 'External',
     of: 'ExternalTrait',
     tags: [
-      '#[generate_trait]',
-      '#[external(v0)]'
+      'generate_trait',
+      'abi(per_item)',
     ],
+    perItemTag: 'external(v0)',
   };
   Foo.addImplementedTrait(trait);
   const fn: BaseFunction = {
@@ -72,9 +73,10 @@ test('contract with function code before with semicolons', t => {
     name: 'External',
     of: 'ExternalTrait',
     tags: [
-      '#[generate_trait]',
-      '#[external(v0)]'
+      'generate_trait',
+      'abi(per_item)',
     ],
+    perItemTag: 'external(v0)',
   };
   Foo.addImplementedTrait(trait);
   const fn: BaseFunction = {
diff --git a/packages/core-cairo/src/contract.test.ts.md b/packages/core-cairo/src/contract.test.ts.md
index d33d3b486..e0cf8fc3c 100644
--- a/packages/core-cairo/src/contract.test.ts.md
+++ b/packages/core-cairo/src/contract.test.ts.md
@@ -69,8 +69,9 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl External of ExternalTrait {␊
+            #[external(v0)]␊
             fn someFunction() {␊
                 before();␊
                 someFunction();␊
@@ -92,8 +93,9 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl External of ExternalTrait {␊
+            #[external(v0)]␊
             fn someFunction() {␊
                 before();␊
                 someFunction();␊
diff --git a/packages/core-cairo/src/contract.test.ts.snap b/packages/core-cairo/src/contract.test.ts.snap
index 1a82b9125c57cfd1373c44b66e0bea07ee82d7f5..d377c7346d6dfbfc165ddb0bebc1f05ff3d1bb20 100644
GIT binary patch
literal 673
zcmV;S0$%+=RzV<BZeeh9Xm4~Nb~6eC0KsH898O8j96^gof1S?Y(^`dYOHa6_>-y}O
z*IeIR>K}^;00000000B+R6%dkFcfZ!5K?aZ0Wj>aRBAUsoKoP@ZBnI8Lh24fqpF<b
zWwn<0MYdZ8QxBZ@4IIabKf^!Z$Kb?niPLIusCt0;68rgk&!4~V#WzWqVst6Ld;`T)
z3K$_*f<}sjRI*4i$!RVpsO0CHIHro8UEgawXcVJ)zwxk{?eCM}+k><2F^hmp=ni7w
ziX{w0Ku!jyp0{%@6&05pR1hqRkGu?Ha)d~(J)%c}K|wEIR4%0wQ_Wy#Viq&^=AI>a
z^=QfR15*>CS0)98p2x6C`e&7N>qldYtSz*{(ZCa4<?Rbdh=eo=NZ%eeR8&FR)+rCb
z434HeQVhA@?yacOy<HU(m5{LrQ{?}tNKajn5(_m7g^-|FZJ&3|z9Y@c=Jutz01iUm
zb*xJ<HL_6}GCv0~W(u;l39>9t$>Eg(!D&h`S<X+3#EMco=U{jI*)yALHFrg<<P^h*
zw9xi8-OUB+4!roY1GQFNeTD8E*`y=Hb%b%I7){wH5G1F9W^43seRuT#+S-WzQwb&Q
zAjqkj1cBb^W0oV=wR%SPXt93cml#sTbcppYAPHiJz)S~A$YC*S_q>WrkcAMBmqM2=
zY2={zzIMu%M2h$;=h=B<%PljxF>h^!>gM_~f75&xHw`Vc)+dNT?O2=Maa*_4Wzn%Q
z2sQ)%Kww_zxA4d)W<bEF87Tt}k0hn)_vs6j>lDghjld=zdcD1;Z@gD&SAVzc*XO%y
z9{$H}lk1D}nCiy`3ja{3H9h{`>G6|o^tg*iStzLZsBP5CW3#yX5B`P!VD9|_KrvqL
HdJ6ymrsGM0

literal 663
zcmV;I0%-j~RzV<BZeeh9Xm4~Nb~6eC0QJD|;9LOxmA<rVTow#}!+!VX^5yP00M8nE
zX7!K-bRUZd00000000B+l+SO|FcinzB7~G1XCyFiSc=*WIHtg5Kcq^Vgw!2|pqiZI
zWwn<0MYh`wrXD!)H*g#${u%xQ{urFt>EbpT2u(e}d`bNL_47BM_u|VWOffo@U%r82
zDg}&?D?uYgLMmA#ndCH=6IAl^WgJsQk1p=C?zM{1zT3Lr&bGG5=<Uu?f1gFbCG>|e
zaK#b^A|MCDL(hBqUMeb1IjA70l8?O%W3q=xE<B<~p+P}UU|de65>xG9WMWn`_vW58
zdH!(W@{Fko(KE9Jg?^7=)%4H0>CTVV8eLmy&7+Ygyzbi<kPr!J5|C|s+(=OcU7M#o
z05jN|@<=h{es{1!rGGsY6P1v$2vg+$DWoSZq{K=Mp%4-jtL^iy{meo0puK)HC%{4I
zZ#~wjm>SzCoGTEVrvB`C*Th(sr)1ZL2_}p8!(v|zlt$~as;w2nu&5AThu8RA2L1B)
zpqDyw^|HAI{}<qi3!ZVN7){wH5G1F9W(}A--yO_fJ2!%PDxtI;1UXfcAkZt@nB~ZI
zu7SZDRrAMwsUdYukJvH=Bth&EnCW0C*)86>gQ`R{WIkje#K&$mv~pNHUpr|_BSrj`
zbBVmM=@vV=DPLoT`eJjMKj|^6n}$|;)l6ldAO=gv+U-5JLrX4IW5yuZ4E!B|dBLx$
zks)S8z^5501CEa*rRwVRit@6BGPq>mCa!J0ys5u<v(~QuM%k|~HX5$+M{bkr59Kk{
xcL)^qL!laa{Dafu2kYo@SCO(%Q1MZhQBU{H<n}-K7yg5}_X}+tbAw0=006ZgL)8EP

diff --git a/packages/core-cairo/src/contract.ts b/packages/core-cairo/src/contract.ts
index a61cf35e4..8eba5d333 100644
--- a/packages/core-cairo/src/contract.ts
+++ b/packages/core-cairo/src/contract.ts
@@ -47,6 +47,7 @@ export interface BaseImplementedTrait {
   name: string;
   of: string;
   tags: string[];
+  perItemTag?: string;
 }
 
 export interface ImplementedTrait extends BaseImplementedTrait {
@@ -62,6 +63,7 @@ export interface BaseFunction {
 
 export interface ContractFunction extends BaseFunction {
   codeBefore?: string[];
+  tag?: string;
 }
 
 export interface Variable {
@@ -178,6 +180,7 @@ export class ContractBuilder implements Contract {
     const contractFn: ContractFunction = {
       ...fn,
       codeBefore: [],
+      tag: baseTrait.perItemTag,
     };
     t.functions.push(contractFn);
     return contractFn;
diff --git a/packages/core-cairo/src/custom.test.ts.md b/packages/core-cairo/src/custom.test.ts.md
index 47234ec1d..bd4a1bd91 100644
--- a/packages/core-cairo/src/custom.test.ts.md
+++ b/packages/core-cairo/src/custom.test.ts.md
@@ -66,13 +66,15 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._pause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._unpause();␊
@@ -291,13 +293,15 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._pause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._unpause();␊
diff --git a/packages/core-cairo/src/custom.test.ts.snap b/packages/core-cairo/src/custom.test.ts.snap
index bd8639bca8cb61a82b2e80a8e1ef269c4597063c..18da2f98567a92e75a11bca873a3b9e5e1fda2d7 100644
GIT binary patch
literal 1147
zcmV->1cduRRzV<BZeeh9Xm4~Nb~6eC0DqKN<~|G`3`Uw*E=6z+A;ARkWrJv}T+(s2
zeE@iL(I1Nl00000000B+S=~<CNEC)ev{LT&4W?RE3Q`Ka>5b`DLV;By!BQ2FT2;uJ
z*vDjqJ+@}XP`cuxz1hosgO%F%=^N~0>;rVh9y>GsA%Ox-szich?DO-TGv}Od5`PYc
zVeFmqzrTPWB80$8xrigeDNgt(7X0I9-^T*K`Lwe1a7n$ESC@WW78@Jr;MMk<C%eQ0
z%Hhet2P#NFfH`PyaM<bm_Kpk8PALe-@nR|%_QY`~ihZ<q(bsGAR|m<L5{(%?f#Yn+
z1xw|<gZ!G7x$InaG{jMYQ;vrr)Ih#{xMHIG<^Kn_2{Yw@;sodiND>GMbsP>}%80md
zoC1>Lywacgag@YVdfRMK#-0b9J5GE~bItwyLxbWNVgYH(_nFk*>|`=tq4KDkU@>w~
z4MY#=6g#MZ+Cy+A?~H|a)N*aJ*<ux(VNeH9+S8(iIlaYrNV*UW!FSJ|uH_p|q9iQ6
z57grKI`VNwmBjNR0S5vLc(FObxQ3!_S7Rtsesjxx96`8G!;48SEWw(uhICK?jN-68
zEv7^xcq;?8xjM`%txesfS}q-G(QcVE^(vdBDI9I6H-(*|V;aJ+tXvkrv%);q3m+Ic
zgYGtqlb+F8dAa67K+_0i7p%B~5Q{Mit8E%X%I@@94VZn>6pNu=Mj}U4p7@yMh60L=
zYh4Bb;t&Q7vi7j2a;9cpWqzy~@hP=+o!WImi6A&6AAof;RXrC<ASWO%O3SV^N6Or)
zZb^W-L_lPA%g%eF{NkWoA1Y-l$Dr@nJ1(PC#RF~enQ_!&!JGpVZY-P6&0^{5U@YmP
zIM?0WlOdyno&YeV_Xn}?Wr589mo#~rCMOL0(9Dz%E-j{{cg&O;i=?}wF{<07$ToLG
z&9wk~Qh8vwZsgWbZo^B=N8drbP0<-tX>3VJmxjuZVc_{ANh4(yVr$C(JW{1mD9uGR
zhlE)z^tQl$X4<T?N3EbWMViy9Qe}pB#XGrNdkhrLT~Ez6cO-|Kyj{$>Tc9MPP9-a8
zB(}q=IO;r~@F?SxI7B|l2+p77ub*cX%sOFpie35FqS${{?v`Tj^84h1duoVhfhA^R
zuFvN{F8f(j`dR(~uXpq6e^xhtUA>=f&fhgQ$Jxr3{d_s`7)+EHPrwr-RzFuU@0qNO
z*ZpTxpS&yXw|D;7I@&#Sx3>2Nf4Z;tcXz&Hs5Hl7j26pzIbbZcD^JW;q=sFUhtix9
znsQiKo^|6l2T|Fm8;md8u9{8Paabx`)2m8`_G2Y4ubK&y(GJ<3k8P;$V@ldJ+zRCy
z=jp7GY8kq}iCb@h_OK?LrpxlL#dE7;+lK(Bp>VMu$?-CAd|O*)4e_E&TSQ%X0;R%L
zGrU_LRuvp|E_naA_>Bdf6EQ;59#0n!9u^NC=KNf{c<?aU&TO2w7Y`m54<4)^fM(^v
N!#7g23Ajuk002lHE`0z1

literal 1132
zcmV-y1e5zgRzV<BZeeh9Xm4~Nb~6eC0B2)(K^kY)1NQ=frnCjX;CcfbBO<~0!P;F>
z)8BXl2Oo<F00000000B+S<P<KKoBle1t~Y)U=c!crBJx^;sR2Y77?kXh_(_4Ro2EH
zH>)~p%e(Fms0X-k<PDJERXB6u%)_v2ubo~0G-;cb1|?E|HlCgNW<2wKoA|rm3qtpR
zefa^L@Bn-_VLTiVMsdXYA!nbydmiTa?dSQqyL0k&Yhmu*E&lj1+J3$E_R$7$fiig1
z^?-8X6NqiJ+1+Wi9=vB9#|IR+ZMz}mF?RW0YY=*9^Q5EJ=wl0smoyDyybpWnlJPhZ
z*S53wl+9`Dw51^SBb+eY3!nn>-JRb$%G*EhOcG|o0EH3I4-iEV5Ng{D+$1La#I|!t
zw*6ZD*9iwvNJX@jhRxV@fic?-k7%}YEBmKr;}BvFY1Q*$v3sSJ+PL|a`&NW`-$oS>
zZKO(Uqa11*!J)V^G+vj>#g%%GWpJ89l|bQ7nda`)Eyg`!!Jr48bNFO2yU}D21x56(
zTs*5HA68UaJk1NR%`u1PD<hmMD9U#^hoa;c_uRn)2)1Z&GAe{&Scz3r4$2{>IA|`5
zZcz)~sDSCN3iC{FV^68FOM1%GDvBmw#gNpcqa3xz@RLtWO&W%m(;Rr(n0spBK}-(8
zT8qP|txZ<eu9*?gWPs8)jJ*5+^C1djY-&?Vue2K-=yOt+i?+SUL{L;#_%O~K`4nmI
zSuyyCLEziSxQA_7Gs$@+{#exVliQY5X_p8koZx_bfY?g6Dqbjn?1Okycy@$4Qq&fX
zvo5mCVOc-cx-ayL^^V-DK@iEv9)YGbbhs7Bm@$aC6N(vgQplFVY*^<#xa4G!G#izh
z0+P_{gObNGz+}G*)jLR{{TO@DAbh8W@X;$4K7~c7*X|J2Bo(hI9Fa8TV^?hMYN2bT
zG7z`nC1(9g=xAMbn(}G4q)<O?%fAuS>C-%|WF?)dtN%1ApVlb#O*Mu3S8nvC#QtX$
zY|uNsp_Sz6Y*p$qQvg+~H0MC!$Z;jNIekHH;&RS&6ObgWPlYNeBxb;~H0mg0c$Df%
z7$A?N0_WZ2Pm_lw%&K5jiJkvuNbJ}7tCiTR{CGIio(kfdpb|HO*Qb+^i+Sdyc@{sw
zs?)si$C&0{3)eHv*<XdtwpY_-CtHp@1`}z<B5*kg<+o3<yDU26O=o%RlXofn+WL#t
z-Hjb*b#1fz%6YT3v3?0ssn12D79)5;FvhksPs~Q9nqOIm!ksi4ldO!$YVhlmDBY+F
z(3j~~a?^PN78}kPRTe|VF^ZRU%?M^RQ#Sdr3H5cbq}jubP|k6lP6w${q3dJZ>IgKa
zHR3c~w0|X^iPE+QK28GeU~eGkWh8wYx6B~%d`cTk9dQDs+>sn^RmrM^qpAhR5A*L>
y&=KK%H16?q_8ejM9AV1OwX^34qy5~B^Y-jH!t6Q1grJ=H9N{mGPL?6+9{>R6b~Vrd

diff --git a/packages/core-cairo/src/erc20.test.ts.md b/packages/core-cairo/src/erc20.test.ts.md
index a21e92fc3..0ed0a48ad 100644
--- a/packages/core-cairo/src/erc20.test.ts.md
+++ b/packages/core-cairo/src/erc20.test.ts.md
@@ -86,8 +86,9 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn burn(ref self: ContractState, value: u256) {␊
                 let caller = get_caller_address();␊
                 self.erc20._burn(caller, value);␊
@@ -211,13 +212,15 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._pause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._unpause();␊
@@ -356,13 +359,15 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.accesscontrol.assert_only_role(PAUSER_ROLE);␊
                 self.pausable._pause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.accesscontrol.assert_only_role(PAUSER_ROLE);␊
                 self.pausable._unpause();␊
@@ -487,18 +492,21 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._pause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._unpause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn burn(ref self: ContractState, value: u256) {␊
                 self.pausable.assert_not_paused();␊
                 let caller = get_caller_address();␊
@@ -646,8 +654,9 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn mint(ref self: ContractState, recipient: ContractAddress, amount: u256) {␊
                 self.ownable.assert_only_owner();␊
                 self.erc20._mint(recipient, amount);␊
@@ -724,8 +733,9 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn mint(ref self: ContractState, recipient: ContractAddress, amount: u256) {␊
                 self.accesscontrol.assert_only_role(MINTER_ROLE);␊
                 self.erc20._mint(recipient, amount);␊
@@ -861,24 +871,28 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._pause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._unpause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn burn(ref self: ContractState, value: u256) {␊
                 self.pausable.assert_not_paused();␊
                 let caller = get_caller_address();␊
                 self.erc20._burn(caller, value);␊
             }␊
     ␊
+            #[external(v0)]␊
             fn mint(ref self: ContractState, recipient: ContractAddress, amount: u256) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable.assert_not_paused();␊
@@ -1048,24 +1062,28 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.accesscontrol.assert_only_role(PAUSER_ROLE);␊
                 self.pausable._pause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.accesscontrol.assert_only_role(PAUSER_ROLE);␊
                 self.pausable._unpause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn burn(ref self: ContractState, value: u256) {␊
                 self.pausable.assert_not_paused();␊
                 let caller = get_caller_address();␊
                 self.erc20._burn(caller, value);␊
             }␊
     ␊
+            #[external(v0)]␊
             fn mint(ref self: ContractState, recipient: ContractAddress, amount: u256) {␊
                 self.accesscontrol.assert_only_role(MINTER_ROLE);␊
                 self.pausable.assert_not_paused();␊
diff --git a/packages/core-cairo/src/erc20.test.ts.snap b/packages/core-cairo/src/erc20.test.ts.snap
index acdb41474a6b2acad2fc925519d66790a6a1dfd1..eb20d61d678897d42e4f35a7b7165866eb6639dd 100644
GIT binary patch
literal 2234
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
I;ZcYH04rWLO8@`>

literal 2233
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
HnT7xWX{I{w

diff --git a/packages/core-cairo/src/erc20.ts b/packages/core-cairo/src/erc20.ts
index 5bc1698c8..7af449f92 100644
--- a/packages/core-cairo/src/erc20.ts
+++ b/packages/core-cairo/src/erc20.ts
@@ -101,7 +101,7 @@ function addERC20ImplAndCamelOnlyImpl(c: ContractBuilder, pausable: boolean) {
       name: 'ERC20Impl',
       of: 'interface::IERC20<ContractState>',
       tags: [
-        '#[external(v0)]'
+        'external(v0)'
       ],
     }
     c.addFunction(ERC20Impl, functions.total_supply);
@@ -115,7 +115,7 @@ function addERC20ImplAndCamelOnlyImpl(c: ContractBuilder, pausable: boolean) {
       name: 'ERC20CamelOnlyImpl',
       of: 'interface::IERC20CamelOnly<ContractState>',
       tags: [
-        '#[external(v0)]'
+        'external(v0)'
       ],
     }
     c.addFunction(ERC20CamelOnlyImpl, functions.totalSupply);
diff --git a/packages/core-cairo/src/erc721.test.ts.md b/packages/core-cairo/src/erc721.test.ts.md
index dccc4c347..bb469d8a1 100644
--- a/packages/core-cairo/src/erc721.test.ts.md
+++ b/packages/core-cairo/src/erc721.test.ts.md
@@ -106,8 +106,9 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn burn(ref self: ContractState, token_id: u256) {␊
                 let caller = get_caller_address();␊
                 assert(self.erc721._is_approved_or_owner(caller, token_id), ERC721Component::Errors::UNAUTHORIZED);␊
@@ -281,13 +282,15 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._pause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._unpause();␊
@@ -359,8 +362,9 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn safe_mint(␊
                 ref self: ContractState,␊
                 recipient: ContractAddress,␊
@@ -373,6 +377,7 @@ Generated by [AVA](https://avajs.dev).
                 self.erc721._set_token_uri(token_id, token_uri);␊
             }␊
     ␊
+            #[external(v0)]␊
             fn safeMint(␊
                 ref self: ContractState,␊
                 recipient: ContractAddress,␊
@@ -456,8 +461,9 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn safe_mint(␊
                 ref self: ContractState,␊
                 recipient: ContractAddress,␊
@@ -470,6 +476,7 @@ Generated by [AVA](https://avajs.dev).
                 self.erc721._set_token_uri(token_id, token_uri);␊
             }␊
     ␊
+            #[external(v0)]␊
             fn safeMint(␊
                 ref self: ContractState,␊
                 recipient: ContractAddress,␊
@@ -657,18 +664,21 @@ Generated by [AVA](https://avajs.dev).
         }␊
     ␊
         #[generate_trait]␊
-        #[external(v0)]␊
+        #[abi(per_item)]␊
         impl ExternalImpl of ExternalTrait {␊
+            #[external(v0)]␊
             fn pause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._pause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn unpause(ref self: ContractState) {␊
                 self.ownable.assert_only_owner();␊
                 self.pausable._unpause();␊
             }␊
     ␊
+            #[external(v0)]␊
             fn burn(ref self: ContractState, token_id: u256) {␊
                 self.pausable.assert_not_paused();␊
                 let caller = get_caller_address();␊
@@ -676,6 +686,7 @@ Generated by [AVA](https://avajs.dev).
                 self.erc721._burn(token_id);␊
             }␊
     ␊
+            #[external(v0)]␊
             fn safe_mint(␊
                 ref self: ContractState,␊
                 recipient: ContractAddress,␊
@@ -689,6 +700,7 @@ Generated by [AVA](https://avajs.dev).
                 self.erc721._set_token_uri(token_id, token_uri);␊
             }␊
     ␊
+            #[external(v0)]␊
             fn safeMint(␊
                 ref self: ContractState,␊
                 recipient: ContractAddress,␊
diff --git a/packages/core-cairo/src/erc721.test.ts.snap b/packages/core-cairo/src/erc721.test.ts.snap
index 549562d886df78dc69b5cba7592a62441ca553a2..9f54491f02442ac31197af718b9e609bc8d1825e 100644
GIT binary patch
literal 2029
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
LBf)fra9aQX)_&>@

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

diff --git a/packages/core-cairo/src/erc721.ts b/packages/core-cairo/src/erc721.ts
index 8e25e0de1..93622efee 100644
--- a/packages/core-cairo/src/erc721.ts
+++ b/packages/core-cairo/src/erc721.ts
@@ -94,7 +94,7 @@ function addERC721ImplAndCamelOnlyImpl(c: ContractBuilder, pausable: boolean) {
       name: 'ERC721Impl',
       of: 'interface::IERC721<ContractState>',
       tags: [
-        '#[external(v0)]'
+        'external(v0)'
       ],
     }
     c.addFunction(ERC721Impl, functions.balance_of);
@@ -110,7 +110,7 @@ function addERC721ImplAndCamelOnlyImpl(c: ContractBuilder, pausable: boolean) {
       name: 'ERC721CamelOnlyImpl',
       of: 'interface::IERC721CamelOnly<ContractState>',
       tags: [
-        '#[external(v0)]'
+        'external(v0)'
       ],
     }
     c.addFunction(ERC721CamelOnlyImpl, functions.balanceOf);
diff --git a/packages/core-cairo/src/external-trait.ts b/packages/core-cairo/src/external-trait.ts
index 4645d78ee..ed7e99e45 100644
--- a/packages/core-cairo/src/external-trait.ts
+++ b/packages/core-cairo/src/external-trait.ts
@@ -4,7 +4,8 @@ export const externalTrait: BaseImplementedTrait = {
   name: 'ExternalImpl',
   of: 'ExternalTrait',
   tags: [
-    '#[generate_trait]',
-    '#[external(v0)]'
+    'generate_trait',
+    'abi(per_item)',
   ],
+  perItemTag: 'external(v0)',
 }
diff --git a/packages/core-cairo/src/print.ts b/packages/core-cairo/src/print.ts
index 37e370b78..386937d4a 100644
--- a/packages/core-cairo/src/print.ts
+++ b/packages/core-cairo/src/print.ts
@@ -132,7 +132,7 @@ function printImplementedTraits(contract: Contract) {
   const impls = [];
   for (const trait of contract.implementedTraits) {
     const implLines = [];
-    implLines.push(...trait.tags.map(t => `${t}`));
+    implLines.push(...trait.tags.map(t => `#[${t}]`));
     implLines.push(`impl ${trait.name} of ${trait.of} {`);
     const fns = trait.functions.map(fn => printFunction(fn));
     implLines.push(spaceBetween(...fns));
@@ -159,7 +159,7 @@ function printFunction(fn: ContractFunction) {
     }
   }
 
-  return printFunction2(head, args, undefined, fn.returns, undefined, codeLines);
+  return printFunction2(head, args, fn.tag, fn.returns, undefined, codeLines);
 }
 
 function printConstructor(contract: Contract): Lines[] {
diff --git a/packages/core-cairo/src/set-upgradeable.ts b/packages/core-cairo/src/set-upgradeable.ts
index a77cd53f5..23003e83b 100644
--- a/packages/core-cairo/src/set-upgradeable.ts
+++ b/packages/core-cairo/src/set-upgradeable.ts
@@ -24,7 +24,7 @@ export function setUpgradeable(c: ContractBuilder, upgradeable: Upgradeable, acc
     name: 'UpgradeableImpl',
     of: 'IUpgradeable<ContractState>',
     tags: [
-      '#[external(v0)]'
+      'external(v0)'
     ],
   };
   c.addImplementedTrait(t);

From 95d184fc382a726dcf0e8da08b5010557a1f46d6 Mon Sep 17 00:00:00 2001
From: Eric Lau <ericglau@outlook.com>
Date: Mon, 12 Feb 2024 15:46:06 -0500
Subject: [PATCH 7/7] Use abi(embed_v0) for interface impls

---
 packages/core-cairo/CHANGELOG.md            |   3 ++-
 packages/core-cairo/src/custom.test.ts.md   |   2 +-
 packages/core-cairo/src/custom.test.ts.snap | Bin 1147 -> 1148 bytes
 packages/core-cairo/src/erc20.test.ts.md    |  24 ++++++++++----------
 packages/core-cairo/src/erc20.test.ts.snap  | Bin 2234 -> 2230 bytes
 packages/core-cairo/src/erc20.ts            |   4 ++--
 packages/core-cairo/src/erc721.test.ts.md   |  10 ++++----
 packages/core-cairo/src/erc721.test.ts.snap | Bin 2029 -> 2026 bytes
 packages/core-cairo/src/erc721.ts           |   4 ++--
 packages/core-cairo/src/set-upgradeable.ts  |   2 +-
 10 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/packages/core-cairo/CHANGELOG.md b/packages/core-cairo/CHANGELOG.md
index f438d56a0..e4238029d 100644
--- a/packages/core-cairo/CHANGELOG.md
+++ b/packages/core-cairo/CHANGELOG.md
@@ -4,7 +4,8 @@
 
 - **Breaking changes**:
   - Remove non-standard `safeAllowance` option from ERC20. ([#324](https://github.com/OpenZeppelin/contracts-wizard/pull/324))
-  - Use `abi(per_item)` attribute instead of `external` for generated trait impls.
+  - Use `abi(embed_v0)` attribute instead of `external` for impls derived from interfaces.
+  - Use `abi(per_item)` attribute instead of `external` for impls with generated traits.
 
 ## 0.8.0 (2023-12-11)
 
diff --git a/packages/core-cairo/src/custom.test.ts.md b/packages/core-cairo/src/custom.test.ts.md
index bd4a1bd91..3b28db391 100644
--- a/packages/core-cairo/src/custom.test.ts.md
+++ b/packages/core-cairo/src/custom.test.ts.md
@@ -130,7 +130,7 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl UpgradeableImpl of IUpgradeable<ContractState> {␊
             fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
                 self.ownable.assert_only_owner();␊
diff --git a/packages/core-cairo/src/custom.test.ts.snap b/packages/core-cairo/src/custom.test.ts.snap
index 18da2f98567a92e75a11bca873a3b9e5e1fda2d7..d4c8e6484c133ae1ea4cbc9567a64914392d255e 100644
GIT binary patch
literal 1148
zcmV-?1cUoQRzV<BZeeh9Xm4~Nb~6eC06XxwKHON8z*9NxPPk2Nx6Set{HB*-z=mde
z-w!>V{vV4700000000B+S>0~iHWW@5qy>DpH{dV~Z~!;mO>dNKK;UGUfn+I~6lhTd
z0xccIL?lumsif(U0ozS4`vwEL_t_ilG5P={B}yjs6FY5^*@F!vHl_3Pox^j^M_V7F
zam<1<@$PSsM8*&WnUE|Yg5p$6m=u3}2tzFK%RkrG9<AxugN?PXAIK+9(9yHqmyh>J
z093%^Q3zC$hyeG{!RWZx`}Vbvn4eLQo)<7GIS%AWFJU1%xEz`_`mKl5ON%m&PvInA
z3du8d@2I$DWUhKwJp*x);!NOi3=NR49<AFbzxw#_HeqH05KDo+g*1hjP|p((WSq!L
z&nqE$-ZS%Q$dZ&%<!!q|83zFf;d$(W7Mh2}hZe;t#1hg@7;>e(-OFWyQstX|isi&Z
z4G;rlQtY7;>HxvHx-%8t)6326c8hgzmO&FhWzUF~=FAr3G3i4xhR{F%ezVwUlB99v
zeWVvZHjz&=swI9X6L2K4grBx&7&lOi?RpGV%0J)o5GN2H()e<g3rDcwt0f&&0;f3c
zPKzzk3f{?pYpx0NT5EH6sgcXZMzmigO~0xpX$!{~8q8s*?3k7?94l8P@Vqcj%pwF%
z&Y{1{Svs&ft0>n(2xyj|{DKo#6k|C>;j~R_Nco*XrvbZ9+G4TPt4P#{DiY6lVJM==
zy4L3qApvpZA!iQ<I%j(3)#k^h6`xkyGO67nlt_YO@)meMS2c5?0&)uKqO$BObEL|x
z?v@m|Pb4IEx9q*K%8y0W`dBMFIR<mb-EkGAE*|KL&yJ%J3l;*n^qFctKaZtvf^nqF
z;@t8JPnL`cdIrFZ-XFx$mjkl+U(w`QmY#APLOWAF{M}(ncE?O<uqe8FF-3Ko6xrpD
z=(!f*Kq-$b*R9+dt8MrNi^&%dZ(DR0Ra#q8(WRyG-!Sm<k))Nf8nLzIe;KLLDwOu3
zT0+9C7kXD<|7Y6l>J+=84M*DJs#a!}drdrrTz3!@F8n|bH-Dn0o4Q>Nx?A8Rt56j!
z86>X5>qzRN81X146c(e9<O~-s^7qg48fKHQCdaP-<#6o#^}FTRyZl1ABA*80MWBhr
z80^bAk*j`|wSHEAAe!C0@vqa(|7_e(Hy7^)o9FH1%VDvcc@8F8Or#J<!u0P|Jb0=q
z<N5IE+(+-4``x{tcV6rt`#ZY_qhI~!hx>b9FjU%Ou||vIyc#f$+O<b!CsNC<&O>ER
z3(YyK9M7il+k>cW)Mtz@*RGyTH*r`g+|a8|hVkPhuc(?ClhF;?osV6p?_)~3HQWj1
z1_$cAks2Agzlqyyf$p$o9H*=DZ^Uz}V>^ThXR-8gn5gkGb9_5n<_z(&OFKk;bpoZ*
z*E77|99A_PO)hxzUHKymx*&3b<~^RSo;<9cJS_RScJ<_8ww=W|Z?B#_te!kLKL9Pt
OlZQ_uH`r-SAOHZ|3Nw5F

literal 1147
zcmV->1cduRRzV<BZeeh9Xm4~Nb~6eC0DqKN<~|G`3`Uw*E=6z+A;ARkWrJv}T+(s2
zeE@iL(I1Nl00000000B+S=~<CNEC)ev{LT&4W?RE3Q`Ka>5b`DLV;By!BQ2FT2;uJ
z*vDjqJ+@}XP`cuxz1hosgO%F%=^N~0>;rVh9y>GsA%Ox-szich?DO-TGv}Od5`PYc
zVeFmqzrTPWB80$8xrigeDNgt(7X0I9-^T*K`Lwe1a7n$ESC@WW78@Jr;MMk<C%eQ0
z%Hhet2P#NFfH`PyaM<bm_Kpk8PALe-@nR|%_QY`~ihZ<q(bsGAR|m<L5{(%?f#Yn+
z1xw|<gZ!G7x$InaG{jMYQ;vrr)Ih#{xMHIG<^Kn_2{Yw@;sodiND>GMbsP>}%80md
zoC1>Lywacgag@YVdfRMK#-0b9J5GE~bItwyLxbWNVgYH(_nFk*>|`=tq4KDkU@>w~
z4MY#=6g#MZ+Cy+A?~H|a)N*aJ*<ux(VNeH9+S8(iIlaYrNV*UW!FSJ|uH_p|q9iQ6
z57grKI`VNwmBjNR0S5vLc(FObxQ3!_S7Rtsesjxx96`8G!;48SEWw(uhICK?jN-68
zEv7^xcq;?8xjM`%txesfS}q-G(QcVE^(vdBDI9I6H-(*|V;aJ+tXvkrv%);q3m+Ic
zgYGtqlb+F8dAa67K+_0i7p%B~5Q{Mit8E%X%I@@94VZn>6pNu=Mj}U4p7@yMh60L=
zYh4Bb;t&Q7vi7j2a;9cpWqzy~@hP=+o!WImi6A&6AAof;RXrC<ASWO%O3SV^N6Or)
zZb^W-L_lPA%g%eF{NkWoA1Y-l$Dr@nJ1(PC#RF~enQ_!&!JGpVZY-P6&0^{5U@YmP
zIM?0WlOdyno&YeV_Xn}?Wr589mo#~rCMOL0(9Dz%E-j{{cg&O;i=?}wF{<07$ToLG
z&9wk~Qh8vwZsgWbZo^B=N8drbP0<-tX>3VJmxjuZVc_{ANh4(yVr$C(JW{1mD9uGR
zhlE)z^tQl$X4<T?N3EbWMViy9Qe}pB#XGrNdkhrLT~Ez6cO-|Kyj{$>Tc9MPP9-a8
zB(}q=IO;r~@F?SxI7B|l2+p77ub*cX%sOFpie35FqS${{?v`Tj^84h1duoVhfhA^R
zuFvN{F8f(j`dR(~uXpq6e^xhtUA>=f&fhgQ$Jxr3{d_s`7)+EHPrwr-RzFuU@0qNO
z*ZpTxpS&yXw|D;7I@&#Sx3>2Nf4Z;tcXz&Hs5Hl7j26pzIbbZcD^JW;q=sFUhtix9
znsQiKo^|6l2T|Fm8;md8u9{8Paabx`)2m8`_G2Y4ubK&y(GJ<3k8P;$V@ldJ+zRCy
z=jp7GY8kq}iCb@h_OK?LrpxlL#dE7;+lK(Bp>VMu$?-CAd|O*)4e_E&TSQ%X0;R%L
zGrU_LRuvp|E_naA_>Bdf6EQ;59#0n!9u^NC=KNf{c<?aU&TO2w7Y`m54<4)^fM(^v
N!#7g23Ajuk002lHE`0z1

diff --git a/packages/core-cairo/src/erc20.test.ts.md b/packages/core-cairo/src/erc20.test.ts.md
index 0ed0a48ad..176874472 100644
--- a/packages/core-cairo/src/erc20.test.ts.md
+++ b/packages/core-cairo/src/erc20.test.ts.md
@@ -155,7 +155,7 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC20Impl of interface::IERC20<ContractState> {␊
             fn total_supply(self: @ContractState) -> u256 {␊
                 self.erc20.total_supply()␊
@@ -190,7 +190,7 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC20CamelOnlyImpl of interface::IERC20CamelOnly<ContractState> {␊
             fn totalSupply(self: @ContractState) -> u256 {␊
                 self.total_supply()␊
@@ -302,7 +302,7 @@ Generated by [AVA](https://avajs.dev).
             self.accesscontrol._grant_role(PAUSER_ROLE, pauser);␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC20Impl of interface::IERC20<ContractState> {␊
             fn total_supply(self: @ContractState) -> u256 {␊
                 self.erc20.total_supply()␊
@@ -337,7 +337,7 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC20CamelOnlyImpl of interface::IERC20CamelOnly<ContractState> {␊
             fn totalSupply(self: @ContractState) -> u256 {␊
                 self.total_supply()␊
@@ -435,7 +435,7 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC20Impl of interface::IERC20<ContractState> {␊
             fn total_supply(self: @ContractState) -> u256 {␊
                 self.erc20.total_supply()␊
@@ -470,7 +470,7 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC20CamelOnlyImpl of interface::IERC20CamelOnly<ContractState> {␊
             fn totalSupply(self: @ContractState) -> u256 {␊
                 self.total_supply()␊
@@ -814,7 +814,7 @@ Generated by [AVA](https://avajs.dev).
             self.erc20._mint(recipient, 2000000000000000000000);␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC20Impl of interface::IERC20<ContractState> {␊
             fn total_supply(self: @ContractState) -> u256 {␊
                 self.erc20.total_supply()␊
@@ -849,7 +849,7 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC20CamelOnlyImpl of interface::IERC20CamelOnly<ContractState> {␊
             fn totalSupply(self: @ContractState) -> u256 {␊
                 self.total_supply()␊
@@ -900,7 +900,7 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl UpgradeableImpl of IUpgradeable<ContractState> {␊
             fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
                 self.ownable.assert_only_owner();␊
@@ -1005,7 +1005,7 @@ Generated by [AVA](https://avajs.dev).
             self.accesscontrol._grant_role(UPGRADER_ROLE, upgrader);␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC20Impl of interface::IERC20<ContractState> {␊
             fn total_supply(self: @ContractState) -> u256 {␊
                 self.erc20.total_supply()␊
@@ -1040,7 +1040,7 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC20CamelOnlyImpl of interface::IERC20CamelOnly<ContractState> {␊
             fn totalSupply(self: @ContractState) -> u256 {␊
                 self.total_supply()␊
@@ -1091,7 +1091,7 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl UpgradeableImpl of IUpgradeable<ContractState> {␊
             fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
                 self.accesscontrol.assert_only_role(UPGRADER_ROLE);␊
diff --git a/packages/core-cairo/src/erc20.test.ts.snap b/packages/core-cairo/src/erc20.test.ts.snap
index eb20d61d678897d42e4f35a7b7165866eb6639dd..f460aae849a003fa105f4c791cca4793a138db22 100644
GIT binary patch
literal 2230
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
E0B|!tLjV8(

literal 2234
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
I;ZcYH04rWLO8@`>

diff --git a/packages/core-cairo/src/erc20.ts b/packages/core-cairo/src/erc20.ts
index 7af449f92..a1665d917 100644
--- a/packages/core-cairo/src/erc20.ts
+++ b/packages/core-cairo/src/erc20.ts
@@ -101,7 +101,7 @@ function addERC20ImplAndCamelOnlyImpl(c: ContractBuilder, pausable: boolean) {
       name: 'ERC20Impl',
       of: 'interface::IERC20<ContractState>',
       tags: [
-        'external(v0)'
+        'abi(embed_v0)'
       ],
     }
     c.addFunction(ERC20Impl, functions.total_supply);
@@ -115,7 +115,7 @@ function addERC20ImplAndCamelOnlyImpl(c: ContractBuilder, pausable: boolean) {
       name: 'ERC20CamelOnlyImpl',
       of: 'interface::IERC20CamelOnly<ContractState>',
       tags: [
-        'external(v0)'
+        'abi(embed_v0)'
       ],
     }
     c.addFunction(ERC20CamelOnlyImpl, functions.totalSupply);
diff --git a/packages/core-cairo/src/erc721.test.ts.md b/packages/core-cairo/src/erc721.test.ts.md
index bb469d8a1..891145193 100644
--- a/packages/core-cairo/src/erc721.test.ts.md
+++ b/packages/core-cairo/src/erc721.test.ts.md
@@ -186,7 +186,7 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC721Impl of interface::IERC721<ContractState> {␊
             fn balance_of(self: @ContractState, account: ContractAddress) -> u256 {␊
                 self.erc721.balance_of(account)␊
@@ -236,7 +236,7 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC721CamelOnlyImpl of interface::IERC721CamelOnly<ContractState> {␊
             fn balanceOf(self: @ContractState, account: ContractAddress) -> u256 {␊
                 self.balance_of(account)␊
@@ -568,7 +568,7 @@ Generated by [AVA](https://avajs.dev).
             self.ownable.initializer(owner);␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC721Impl of interface::IERC721<ContractState> {␊
             fn balance_of(self: @ContractState, account: ContractAddress) -> u256 {␊
                 self.erc721.balance_of(account)␊
@@ -618,7 +618,7 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl ERC721CamelOnlyImpl of interface::IERC721CamelOnly<ContractState> {␊
             fn balanceOf(self: @ContractState, account: ContractAddress) -> u256 {␊
                 self.balance_of(account)␊
@@ -712,7 +712,7 @@ Generated by [AVA](https://avajs.dev).
             }␊
         }␊
     ␊
-        #[external(v0)]␊
+        #[abi(embed_v0)]␊
         impl UpgradeableImpl of IUpgradeable<ContractState> {␊
             fn upgrade(ref self: ContractState, new_class_hash: ClassHash) {␊
                 self.ownable.assert_only_owner();␊
diff --git a/packages/core-cairo/src/erc721.test.ts.snap b/packages/core-cairo/src/erc721.test.ts.snap
index 9f54491f02442ac31197af718b9e609bc8d1825e..35bd8992c28898dbfafca0c8b7c3f3144a46c958 100644
GIT binary patch
literal 2026
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
IVs%>p0N_~iBme*a

literal 2029
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
LBf)fra9aQX)_&>@

diff --git a/packages/core-cairo/src/erc721.ts b/packages/core-cairo/src/erc721.ts
index 93622efee..e5c538cf2 100644
--- a/packages/core-cairo/src/erc721.ts
+++ b/packages/core-cairo/src/erc721.ts
@@ -94,7 +94,7 @@ function addERC721ImplAndCamelOnlyImpl(c: ContractBuilder, pausable: boolean) {
       name: 'ERC721Impl',
       of: 'interface::IERC721<ContractState>',
       tags: [
-        'external(v0)'
+        'abi(embed_v0)'
       ],
     }
     c.addFunction(ERC721Impl, functions.balance_of);
@@ -110,7 +110,7 @@ function addERC721ImplAndCamelOnlyImpl(c: ContractBuilder, pausable: boolean) {
       name: 'ERC721CamelOnlyImpl',
       of: 'interface::IERC721CamelOnly<ContractState>',
       tags: [
-        'external(v0)'
+        'abi(embed_v0)'
       ],
     }
     c.addFunction(ERC721CamelOnlyImpl, functions.balanceOf);
diff --git a/packages/core-cairo/src/set-upgradeable.ts b/packages/core-cairo/src/set-upgradeable.ts
index 23003e83b..1cc89b187 100644
--- a/packages/core-cairo/src/set-upgradeable.ts
+++ b/packages/core-cairo/src/set-upgradeable.ts
@@ -24,7 +24,7 @@ export function setUpgradeable(c: ContractBuilder, upgradeable: Upgradeable, acc
     name: 'UpgradeableImpl',
     of: 'IUpgradeable<ContractState>',
     tags: [
-      'external(v0)'
+      'abi(embed_v0)'
     ],
   };
   c.addImplementedTrait(t);