From 0ad485b70261f3d29d1da489598d975ea2ecbe43 Mon Sep 17 00:00:00 2001
From: brozorec <9572072+brozorec@users.noreply.github.com>
Date: Tue, 27 Jan 2026 12:19:20 +0100
Subject: [PATCH 1/6] refactor for 0.6.0

---
 .changeset/pink-eyes-judge.md                 |  12 +
 .../common/src/ai/descriptions/stellar.ts     |   2 +-
 packages/core/stellar/src/add-pausable.ts     |   1 -
 packages/core/stellar/src/contract.test.ts.md |  26 +-
 .../core/stellar/src/contract.test.ts.snap    | Bin 774 -> 775 bytes
 packages/core/stellar/src/fungible.test.ts.md | 237 ++++++------
 .../core/stellar/src/fungible.test.ts.snap    | Bin 1709 -> 1707 bytes
 packages/core/stellar/src/fungible.ts         |  24 +-
 .../core/stellar/src/non-fungible.test.ts.md  | 190 ++++------
 .../stellar/src/non-fungible.test.ts.snap     | Bin 1918 -> 1900 bytes
 packages/core/stellar/src/non-fungible.ts     |  15 +-
 .../core/stellar/src/set-access-control.ts    |  26 +-
 .../core/stellar/src/stablecoin.test.ts.md    | 345 +++++++++---------
 .../core/stellar/src/stablecoin.test.ts.snap  | Bin 2208 -> 2198 bytes
 packages/core/stellar/src/utils/version.ts    |   6 +-
 .../stellar/src/zip-rust.compile.test.ts.md   |  45 ++-
 .../stellar/src/zip-rust.compile.test.ts.snap | Bin 1892 -> 1890 bytes
 .../stellar/TraitImplementationSection.svelte |   9 +-
 18 files changed, 454 insertions(+), 484 deletions(-)
 create mode 100644 .changeset/pink-eyes-judge.md

diff --git a/.changeset/pink-eyes-judge.md b/.changeset/pink-eyes-judge.md
new file mode 100644
index 000000000..81a6606d2
--- /dev/null
+++ b/.changeset/pink-eyes-judge.md
@@ -0,0 +1,12 @@
+---
+'@openzeppelin/wizard-stellar': minor
+'@openzeppelin/wizard-common': minor
+---
+
+Refactor Stellar contracts to match the latest v0.6.0
+  - **Breaking changes**:
+    - Use OpenZeppelin Stellar Soroban Contracts v0.6.0
+    - Use `MuxedAddress` for fungible transfer function
+    - Change order of parameters in access control
+
+Change default fungible decimals to 7
diff --git a/packages/common/src/ai/descriptions/stellar.ts b/packages/common/src/ai/descriptions/stellar.ts
index cc151bcc2..3a0c7fd49 100644
--- a/packages/common/src/ai/descriptions/stellar.ts
+++ b/packages/common/src/ai/descriptions/stellar.ts
@@ -13,7 +13,7 @@ export const stellarCommonDescriptions = {
   access:
     'The type of access control to provision. Ownable is a simple mechanism with a single account authorized for all privileged actions. Roles is a flexible mechanism with a separate role for each privileged action. A role can have many authorized accounts.',
   explicitImplementations:
-    'Whether the contract should use explicit trait implementations instead of using the #[default_impl] macro to auto-generate trait method bodies.',
+    'Whether the contract should use explicit trait implementations instead of using the default ones provided by the library.',
 };
 
 export const stellarFungibleDescriptions = {
diff --git a/packages/core/stellar/src/add-pausable.ts b/packages/core/stellar/src/add-pausable.ts
index d5cf968fd..0ac7fedb2 100644
--- a/packages/core/stellar/src/add-pausable.ts
+++ b/packages/core/stellar/src/add-pausable.ts
@@ -7,7 +7,6 @@ import { defineFunctions } from './utils/define-functions';
 export function addPausable(c: ContractBuilder, access: Access, explicitImplementations: boolean) {
   c.addUseClause('stellar_contract_utils::pausable', 'self', { alias: 'pausable' });
   c.addUseClause('stellar_contract_utils::pausable', 'Pausable');
-  if (!explicitImplementations) c.addUseClause('stellar_macros', 'default_impl');
 
   const pausableTrait = {
     traitName: 'Pausable',
diff --git a/packages/core/stellar/src/contract.test.ts.md b/packages/core/stellar/src/contract.test.ts.md
index 40c6b6b58..a45f9d867 100644
--- a/packages/core/stellar/src/contract.test.ts.md
+++ b/packages/core/stellar/src/contract.test.ts.md
@@ -9,7 +9,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     #[contract]␊
@@ -21,7 +21,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     #[contract]␊
@@ -40,7 +40,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     #[contract]␊
@@ -59,7 +59,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     #[contract]␊
@@ -81,7 +81,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     #[contract]␊
@@ -103,7 +103,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use some::library::SomeLibrary;␊
@@ -117,7 +117,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use some::library::{Misc, SomeLibrary};␊
@@ -131,7 +131,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use another::library::{self as custom1, self as custom2, AnotherLibrary};␊
@@ -146,7 +146,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     ␊
     //! Some documentation␊
     #![no_std]␊
@@ -160,7 +160,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::contractmeta;␊
@@ -176,7 +176,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::contractmeta;␊
@@ -193,7 +193,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     ␊
     //! Some documentation␊
     #![no_std]␊
@@ -212,7 +212,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::contractmeta;␊
diff --git a/packages/core/stellar/src/contract.test.ts.snap b/packages/core/stellar/src/contract.test.ts.snap
index bd748d120ba343aee14caf4d69d865aae8e67398..81d7162798ddc17b9dbc619ffd02efb1ca6745db 100644
GIT binary patch
literal 775
zcmV+i1Ni(wRzV<BZeeh9Xm4~Nb~6eC0RB+pFmOin{eA37eY*1zrtBo~4q@g-SEw?$
zhsEQ4%O8sf00000000B+mcMTkF%*CkDui@QtRUbu5ztC$(^iP#qDr9BN|joHlnyOb
zh#cQLYSrg=vVEmh)q#<LowbZih>el|g@u6$1_lOnm!!nGK!fNnq~35k`|O;*&+k2F
zKWs_jo95LUw8BaxPReS=Ewq>s+z6vsY&OW67yCiLEL(j&Qn*w|uj0kRl?yKm)hg5<
zKU|$y5*(GmiNyew6`?@w!}8*aSFOSvMKQCYB@vzry8(}4R8KIDQ3?fhi&8QTb<)&g
z3g$WsFz|G0^4{c>R~}tg)HF6|cwTwEyS|1OCoM2mC)~mUQO)ZRY~MIQ$UeqNwMUT#
zP66hLzB@#p&kj+~OA*Dg;idQV73_Kd0O|NpL9^MzIEFslo>yDroiXWUD8hwAaVtoT
zjn}gNJ#X*8*u<ZWwR;Ulf|De5E-)vs<O&QsL)-RR7?RG1-CFUkqwQAlENLUVf!eZX
zjll}%w=HVLB!r|78Y`L!+p$(&?@GviB<%`SpT{1-ZAV?T!ziCQTzOyI=4;vc7W~r|
z+;q3VSf&CdNg;?RCT;VD;)A36?a3C3#9)Tx`%<(t(>uOjrwEtYjoNUB%XOFenWiMh
zpaVSMwEXB0zdv>2-DP2T1$w~uh9rl+-6m}@fb<hwvc%w^^cr#KznwfiQ&|@E3NR=`
zU<P<%EJf25a64uy@Sr{Em!BhvoNKPXfOrz2vMkN6eB8Wq%<Uh)Ij>qB&BDT6*<b(r
zy3-dX$P+E>P8L0BZ-kbmgn8tz4)UkdNR@10(*&Eo-^EDRTl2i$=IGca?#z}tM5PLB
zF*#f6lHSK{7R3@LIYp)MA%ml@ltziPB9{1jTWiIuj;_lmdvqP2t^qUC$L_S0eQ2xG
zhgb!sf<qE<tvKU&E+4<=VKVW*@SpUT0=uX}$|wF0$MBakpZHyM&7-IQKLOXjx#58i
F008j=e|-P|

literal 774
zcmV+h1Nr<xRzV<BZeeh9Xm4~Nb~6eC0H$QqddJjyx)l|870^A*V&AWC1_%AZcW))$
zo&FGx0w0SA00000000B+mcMTkF%*CkDui@QtRUbu5ztC$L#s{~RRWb(s?-XkbZDtU
z<oMpTR(*aa+gDmu9T*wdS<A?T*cka=SQwaKU|>LZNlKgxG>HB}>J6u}&(8V#{N8g8
z!j>eyWnR5OE38D~q^xG#LW>!}jWCMEW|ORWaS#N|venlkg)4>hDqb#JyY#Y9twR0D
zqt%He!BH8USPW2E5en2kEHAEj)hf(U6f-MY65+Y9oA5YB^%Ub6rBG0}C?(TSCrvG;
zV6L+O1JCYH&P+~u<<WITO=E+G=atvH>uY#%(gI_3!YwQi)w~YD&aFd)>|>l%dlYHl
z6kwj{yF>K({1ElL6j3Z2UV2Yo!JY>Ikd6-(G@Ct)W9Y-(d9^*>8IxXyB3wumw}RBz
zcrEMS_x2BsP5jwdyVqbOI7w0$0&@aOuE4M}v~912A?bYBtrce+ZFh?2NgLTs)Rt{D
z1}mK3v8WZ35RyJ@tY{`|$69&4D<S)lv@2A79(x409d*?XqkQ^k<$ZCRuVoio@K0NC
z+uZ_VnF^RBg&?Asw9OZa5037)r&}lzgBg<VOVQFy@A`h7B3x=WYQr5aH(llpO-YPF
z2YA3~`OzVMf9Aw{%fj#q^nmXVNe+FxP1<4r=_j~kiNQhXHR8~JJAHblvMlNqU{Hp@
z4DiHQil!>yc1%~`VSCaqKgSX|H(Y-K@gzcJS(;t>xOwN8J2-iBUbQ-!g@wDazy9}i
zuP;oHCtBFuEPB%32rWwq^T=Nv<WFajD%rrM3ATK{i;=Fk=6Su%(XlPuoh@~UN)^~<
za<<eZeSkYGiX~2Rib~@{21j2hjS^`^Eb;fY){561T~|-{=sG!F17@a=-DxTN&{n68
zunJ5CM<n7}aoX`*K6%f>Wa59}Kj|+8c2R|tPy8Q_;V<Vt@w@7p$58=(0vf3-SAh=z
E0Hoz@!T<mO

diff --git a/packages/core/stellar/src/fungible.test.ts.md b/packages/core/stellar/src/fungible.test.ts.md
index a97f0739c..7818a875e 100644
--- a/packages/core/stellar/src/fungible.test.ts.md
+++ b/packages/core/stellar/src/fungible.test.ts.md
@@ -9,11 +9,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -22,12 +23,11 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -39,11 +39,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
     ␊
     #[contract]␊
@@ -52,12 +53,11 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -67,8 +67,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for MyToken {}␊
     `
 
@@ -77,13 +76,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -92,18 +93,17 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
             ownable::set_owner(e, &owner);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -117,6 +117,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -133,10 +136,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyToken {}␊
     `
 
 ## fungible burnable pausable
@@ -144,13 +143,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
     ␊
     #[contract]␊
@@ -159,18 +160,17 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
             ownable::set_owner(e, &owner);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -184,7 +184,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for MyToken {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, amount: i128) {␊
@@ -201,6 +201,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -217,10 +220,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyToken {}␊
     `
 
 ## fungible preminted
@@ -228,11 +227,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -241,13 +241,12 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env, recipient: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
-            Base::mint(e, &recipient, 1000000000000000000000);␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::mint(e, &recipient, 10000000000);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -259,11 +258,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -272,12 +272,11 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -289,11 +288,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -302,12 +302,11 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -319,12 +318,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
-    use stellar_macros::default_impl;␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -333,13 +333,12 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
             ownable::set_owner(e, &owner);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -349,8 +348,7 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl Ownable for MyToken {}␊
     `
 
@@ -359,12 +357,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::access_control::{self as access_control, AccessControl};␊
-    use stellar_macros::default_impl;␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -373,13 +372,12 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env, admin: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
             access_control::set_admin(e, &admin);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -389,8 +387,7 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl AccessControl for MyToken {}␊
     `
 
@@ -399,13 +396,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
     ␊
     #[contract]␊
@@ -414,8 +413,8 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env, recipient: Address, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
-            Base::mint(e, &recipient, 2000000000000000000000);␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::mint(e, &recipient, 20000000000);␊
             ownable::set_owner(e, &owner);␊
         }␊
     ␊
@@ -426,13 +425,12 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -446,7 +444,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for MyToken {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, amount: i128) {␊
@@ -463,6 +461,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -479,10 +480,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyToken {}␊
     `
 
 ## fungible full - roles
@@ -490,14 +487,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String, Symbol};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::access_control::{self as access_control, AccessControl};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
     use stellar_contract_utils::upgradeable::UpgradeableInternal;␊
-    use stellar_macros::{default_impl, only_role, Upgradeable, when_not_paused};␊
+    use stellar_macros::{only_role, Upgradeable, when_not_paused};␊
     use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
     ␊
     #[derive(Upgradeable)]␊
@@ -514,12 +513,12 @@ Generated by [AVA](https://avajs.dev).
             upgrader: Address,␊
             minter: Address,␊
         ) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
-            Base::mint(e, &recipient, 2000000000000000000000);␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::mint(e, &recipient, 20000000000);␊
             access_control::set_admin(e, &admin);␊
-            access_control::grant_role_no_auth(e, &admin, &pauser, &Symbol::new(e, "pauser"));␊
-            access_control::grant_role_no_auth(e, &admin, &upgrader, &Symbol::new(e, "upgrader"));␊
-            access_control::grant_role_no_auth(e, &admin, &minter, &Symbol::new(e, "minter"));␊
+            access_control::grant_role_no_auth(e, &pauser, &Symbol::new(e, "pauser"), &admin);␊
+            access_control::grant_role_no_auth(e, &upgrader, &Symbol::new(e, "upgrader"), &admin);␊
+            access_control::grant_role_no_auth(e, &minter, &Symbol::new(e, "minter"), &admin);␊
         }␊
     ␊
         #[only_role(caller, "minter")]␊
@@ -529,13 +528,12 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -549,7 +547,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for MyToken {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, amount: i128) {␊
@@ -568,11 +566,14 @@ Generated by [AVA](https://avajs.dev).
     ␊
     impl UpgradeableInternal for MyToken {␊
         fn _require_auth(e: &Env, operator: &Address) {␊
-            access_control::ensure_role(e, operator, &Symbol::new(e, "upgrader"));␊
+            access_control::ensure_role(e, &Symbol::new(e, "upgrader"), operator);␊
             operator.require_auth();␊
         }␊
     }␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl AccessControl for MyToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -589,10 +590,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl AccessControl for MyToken {}␊
     `
 
 ## fungible full - complex name
@@ -600,14 +597,16 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
     use stellar_contract_utils::upgradeable::UpgradeableInternal;␊
-    use stellar_macros::{default_impl, only_owner, Upgradeable, when_not_paused};␊
+    use stellar_macros::{only_owner, Upgradeable, when_not_paused};␊
     use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
     ␊
     #[derive(Upgradeable)]␊
@@ -617,8 +616,8 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl CustomToken {␊
         pub fn __constructor(e: &Env, recipient: Address, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "Custom  $ Token"), String::from_str(e, "MTK"));␊
-            Base::mint(e, &recipient, 2000000000000000000000);␊
+            Base::set_metadata(e, 7, String::from_str(e, "Custom  $ Token"), String::from_str(e, "MTK"));␊
+            Base::mint(e, &recipient, 20000000000);␊
             ownable::set_owner(e, &owner);␊
         }␊
     ␊
@@ -629,13 +628,12 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for CustomToken {␊
         type ContractType = Base;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -649,7 +647,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for CustomToken {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, amount: i128) {␊
@@ -672,6 +670,9 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for CustomToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for CustomToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -688,10 +689,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for CustomToken {}␊
     `
 
 ## fungible explicit trait implementations
@@ -699,10 +696,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -711,7 +710,7 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyToken {␊
         pub fn __constructor(e: &Env) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
         }␊
     }␊
     ␊
@@ -731,7 +730,7 @@ Generated by [AVA](https://avajs.dev).
             Self::ContractType::allowance(e, &owner, &spender)␊
         }␊
     ␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
diff --git a/packages/core/stellar/src/fungible.test.ts.snap b/packages/core/stellar/src/fungible.test.ts.snap
index 84a1df52a5de7d2820743ad997e24ebded9f0c86..57c61bb47f1a8493740e2986e82230fbbcc302ea 100644
GIT binary patch
literal 1707
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
BUTFXT

literal 1709
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
DZ|O(d

diff --git a/packages/core/stellar/src/fungible.ts b/packages/core/stellar/src/fungible.ts
index ab4d20135..b79b4d2ed 100644
--- a/packages/core/stellar/src/fungible.ts
+++ b/packages/core/stellar/src/fungible.ts
@@ -97,24 +97,24 @@ function addBase(
   explicitImplementations: boolean,
 ) {
   // Set metadata
-  c.addConstructorCode(`Base::set_metadata(e, 18, String::from_str(e, "${name}"), String::from_str(e, "${symbol}"));`);
+  c.addConstructorCode(`Base::set_metadata(e, 7, String::from_str(e, "${name}"), String::from_str(e, "${symbol}"));`);
 
   // Set token functions
   c.addUseClause('stellar_tokens::fungible', 'Base');
   c.addUseClause('stellar_tokens::fungible', 'FungibleToken');
-  if (!explicitImplementations) c.addUseClause('stellar_macros', 'default_impl');
   c.addUseClause('soroban_sdk', 'contract');
   c.addUseClause('soroban_sdk', 'contractimpl');
   c.addUseClause('soroban_sdk', 'String');
+  c.addUseClause('soroban_sdk', 'Symbol');
   c.addUseClause('soroban_sdk', 'Env');
-  if (explicitImplementations || pausable) {
-    c.addUseClause('soroban_sdk', 'Address');
-  }
+  c.addUseClause('soroban_sdk', 'Address');
+  c.addUseClause('soroban_sdk', 'MuxedAddress');
+  c.addUseClause('soroban_sdk', 'Vec');
 
   const fungibleTokenTrait = {
     traitName: 'FungibleToken',
     structName: c.name,
-    tags: explicitImplementations ? ['contractimpl'] : ['default_impl', 'contractimpl'],
+    tags: explicitImplementations ? ['contractimpl'] : ['contractimpl(contracttrait)'],
     assocType: 'type ContractType = Base;',
   };
 
@@ -134,7 +134,6 @@ function addBase(
 }
 
 function addMintable(c: ContractBuilder, access: Access, pausable: boolean, explicitImplementations: boolean) {
-  c.addUseClause('soroban_sdk', 'Address');
   switch (access) {
     case false:
       break;
@@ -178,12 +177,11 @@ function addMintable(c: ContractBuilder, access: Access, pausable: boolean, expl
 
 function addBurnable(c: ContractBuilder, pausable: boolean, explicitImplementations: boolean) {
   c.addUseClause('stellar_tokens::fungible', 'burnable::FungibleBurnable');
-  c.addUseClause('soroban_sdk', 'Address');
 
   const fungibleBurnableTrait = {
     traitName: 'FungibleBurnable',
     structName: c.name,
-    tags: ['contractimpl'],
+    tags: explicitImplementations ? ['contractimpl'] : ['contractimpl(contracttrait)'],
     section: 'Extensions',
   };
 
@@ -197,8 +195,6 @@ function addBurnable(c: ContractBuilder, pausable: boolean, explicitImplementati
     c.addFunctionTag(functions.burn_from, 'when_not_paused', fungibleBurnableTrait);
   } else if (explicitImplementations) c.addTraitForEachFunctions(fungibleBurnableTrait, fungibleBurnableFunctions);
   else {
-    // prepend '#[default_impl]'
-    fungibleBurnableTrait.tags.unshift('default_impl');
     c.addTraitImplBlock(fungibleBurnableTrait);
   }
 }
@@ -214,9 +210,7 @@ function addPremint(c: ContractBuilder, amount: string) {
     }
 
     // TODO: handle signed int?
-    const premintAbsolute = toUint(getInitialSupply(amount, 18), 'premint', 'u128');
-
-    c.addUseClause('soroban_sdk', 'Address');
+    const premintAbsolute = toUint(getInitialSupply(amount, 7), 'premint', 'u128');
 
     c.addConstructorArgument({ name: 'recipient', type: 'Address' });
     c.addConstructorCode(`Base::mint(e, &recipient, ${premintAbsolute});`);
@@ -285,7 +279,7 @@ export const functions = defineFunctions({
     args: [
       getSelfArg(),
       { name: 'from', type: 'Address' },
-      { name: 'to', type: 'Address' },
+      { name: 'to', type: 'MuxedAddress' },
       { name: 'amount', type: 'i128' },
     ],
     code: ['Self::ContractType::transfer(e, &from, &to, amount)'],
diff --git a/packages/core/stellar/src/non-fungible.test.ts.md b/packages/core/stellar/src/non-fungible.test.ts.md
index 462dc1400..0b5d7af06 100644
--- a/packages/core/stellar/src/non-fungible.test.ts.md
+++ b/packages/core/stellar/src/non-fungible.test.ts.md
@@ -9,11 +9,10 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_tokens::non_fungible::{Base, NonFungibleToken};␊
     ␊
     #[contract]␊
@@ -29,8 +28,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -42,11 +40,10 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_tokens::non_fungible::{Base, burnable::NonFungibleBurnable, NonFungibleToken};␊
     ␊
     #[contract]␊
@@ -62,8 +59,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -73,8 +69,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleBurnable for MyToken {}␊
     `
 
@@ -83,13 +78,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::non_fungible::{Base, NonFungibleToken};␊
     ␊
     #[contract]␊
@@ -106,8 +101,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -126,6 +120,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -142,10 +139,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyToken {}␊
     `
 
 ## non-fungible burnable pausable
@@ -153,13 +146,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::non_fungible::{Base, burnable::NonFungibleBurnable, NonFungibleToken};␊
     ␊
     #[contract]␊
@@ -176,8 +169,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -196,7 +188,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleBurnable for MyToken {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, token_id: u32) {␊
@@ -213,6 +205,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -229,10 +224,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyToken {}␊
     `
 
 ## non-fungible mintable
@@ -240,12 +231,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
-    use stellar_macros::{default_impl, only_owner};␊
+    use stellar_macros::only_owner;␊
     use stellar_tokens::non_fungible::{Base, NonFungibleToken};␊
     ␊
     #[contract]␊
@@ -267,8 +258,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -278,8 +268,7 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl Ownable for MyToken {}␊
     `
 
@@ -288,11 +277,10 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_tokens::non_fungible::{␊
         Base, enumerable::{NonFungibleEnumerable, Enumerable}, NonFungibleToken␊
     };␊
@@ -310,8 +298,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Enumerable;␊
     ␊
@@ -321,8 +308,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleEnumerable for MyToken {}␊
     `
 
@@ -331,12 +317,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
-    use stellar_macros::{default_impl, only_owner};␊
+    use stellar_macros::only_owner;␊
     use stellar_tokens::non_fungible::{␊
         Base, consecutive::{NonFungibleConsecutive, Consecutive}, NonFungibleToken␊
     };␊
@@ -360,8 +346,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Consecutive;␊
     ␊
@@ -378,8 +363,7 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl Ownable for MyToken {}␊
     `
 
@@ -388,12 +372,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
-    use stellar_macros::{default_impl, only_owner};␊
+    use stellar_macros::only_owner;␊
     use stellar_tokens::non_fungible::{␊
         Base, burnable::NonFungibleBurnable, consecutive::{NonFungibleConsecutive, Consecutive},␊
         NonFungibleToken␊
@@ -418,8 +402,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Consecutive;␊
     ␊
@@ -429,19 +412,17 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
-    impl NonFungibleConsecutive for MyToken {}␊
+    #[contractimpl(contracttrait)]␊
+    impl NonFungibleBurnable for MyToken {}␊
     ␊
-    #[default_impl]␊
     #[contractimpl]␊
-    impl NonFungibleBurnable for MyToken {}␊
+    impl NonFungibleConsecutive for MyToken {}␊
     ␊
     //␊
     // Utils␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl Ownable for MyToken {}␊
     `
 
@@ -450,13 +431,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::non_fungible::{␊
         Base, consecutive::{NonFungibleConsecutive, Consecutive}, NonFungibleToken␊
     };␊
@@ -481,8 +462,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Consecutive;␊
     ␊
@@ -508,6 +488,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -524,10 +507,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyToken {}␊
     `
 
 ## non-fungible consecutive burnable pausable
@@ -535,13 +514,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::non_fungible::{␊
         Base, burnable::NonFungibleBurnable, consecutive::{NonFungibleConsecutive, Consecutive},␊
         NonFungibleToken␊
@@ -567,8 +546,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Consecutive;␊
     ␊
@@ -587,7 +565,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleBurnable for MyToken {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, token_id: u32) {␊
@@ -607,6 +585,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -623,10 +604,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyToken {}␊
     `
 
 ## non-fungible sequential
@@ -634,11 +611,10 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_tokens::non_fungible::{Base, NonFungibleToken};␊
     ␊
     #[contract]␊
@@ -654,8 +630,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -667,13 +642,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::upgradeable::UpgradeableInternal;␊
-    use stellar_macros::{default_impl, only_owner, Upgradeable};␊
+    use stellar_macros::{only_owner, Upgradeable};␊
     use stellar_tokens::non_fungible::{Base, NonFungibleToken};␊
     ␊
     #[derive(Upgradeable)]␊
@@ -691,8 +666,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
@@ -709,8 +683,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl Ownable for MyToken {}␊
     `
 
@@ -719,14 +692,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
     use stellar_contract_utils::upgradeable::UpgradeableInternal;␊
-    use stellar_macros::{default_impl, only_owner, Upgradeable, when_not_paused};␊
+    use stellar_macros::{only_owner, Upgradeable, when_not_paused};␊
     use stellar_tokens::non_fungible::{␊
         Base, burnable::NonFungibleBurnable, enumerable::{NonFungibleEnumerable, Enumerable},␊
         NonFungibleToken␊
@@ -753,8 +726,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Enumerable;␊
     ␊
@@ -773,7 +745,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleBurnable for MyToken {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, token_id: u32) {␊
@@ -786,8 +758,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleEnumerable for MyToken {}␊
     ␊
     //␊
@@ -800,6 +771,9 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -816,10 +790,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyToken {}␊
     `
 
 ## non-fungible - complex name
@@ -827,13 +797,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::non_fungible::{Base, burnable::NonFungibleBurnable, NonFungibleToken};␊
     ␊
     #[contract]␊
@@ -850,8 +820,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for CustomToken {␊
         type ContractType = Base;␊
     ␊
@@ -870,7 +839,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleBurnable for CustomToken {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, token_id: u32) {␊
@@ -887,6 +856,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for CustomToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for CustomToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -903,10 +875,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for CustomToken {}␊
     `
 
 ## non-fungible explicit trait implementations
@@ -914,7 +882,7 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
     use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
@@ -994,11 +962,10 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
     use stellar_tokens::non_fungible::{Base, NonFungibleToken};␊
     ␊
     #[contract]␊
@@ -1014,8 +981,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl NonFungibleToken for MyToken {␊
         type ContractType = Base;␊
     ␊
diff --git a/packages/core/stellar/src/non-fungible.test.ts.snap b/packages/core/stellar/src/non-fungible.test.ts.snap
index 7c8e15e563443a82ab1ce422dd5faaa5993a2d27..5dab96554cb7f11bbb8a94daed1fe317c588af76 100644
GIT binary patch
literal 1900
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

literal 1918
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
E0FZ8^k^lez

diff --git a/packages/core/stellar/src/non-fungible.ts b/packages/core/stellar/src/non-fungible.ts
index 1029695a6..dbd2defa2 100644
--- a/packages/core/stellar/src/non-fungible.ts
+++ b/packages/core/stellar/src/non-fungible.ts
@@ -155,17 +155,16 @@ function addBase(
   c.addUseClause('stellar_tokens::non_fungible', 'Base');
   c.addUseClause('stellar_tokens::non_fungible', 'NonFungibleToken');
   if (explicitImplementations) c.addUseClause('stellar_tokens::non_fungible', 'ContractOverrides');
-  else c.addUseClause('stellar_macros', 'default_impl');
   c.addUseClause('soroban_sdk', 'contract');
   c.addUseClause('soroban_sdk', 'contractimpl');
   c.addUseClause('soroban_sdk', 'String');
   c.addUseClause('soroban_sdk', 'Env');
-  if (explicitImplementations || pausable) c.addUseClause('soroban_sdk', 'Address');
+  c.addUseClause('soroban_sdk', 'Address');
 
   const nonFungibleTokenTrait = {
     traitName: 'NonFungibleToken',
     structName: c.name,
-    tags: explicitImplementations ? ['contractimpl'] : ['default_impl', 'contractimpl'],
+    tags: explicitImplementations ? ['contractimpl'] : ['contractimpl(contracttrait)'],
     assocType: 'type ContractType = Base;',
   };
 
@@ -190,7 +189,7 @@ function addBurnable(c: ContractBuilder, pausable: boolean, explicitImplementati
   const nonFungibleBurnableTrait = {
     traitName: 'NonFungibleBurnable',
     structName: c.name,
-    tags: ['contractimpl'],
+    tags: explicitImplementations ? ['contractimpl'] : ['contractimpl(contracttrait)'],
     section: 'Extensions',
   };
 
@@ -205,21 +204,17 @@ function addBurnable(c: ContractBuilder, pausable: boolean, explicitImplementati
   } else if (explicitImplementations)
     c.addTraitForEachFunctions(nonFungibleBurnableTrait, nonFungibleBurnableFunctions);
   else {
-    // prepend '#[default_impl]'
-    nonFungibleBurnableTrait.tags.unshift('default_impl');
     c.addTraitImplBlock(nonFungibleBurnableTrait);
   }
 }
 
 function addEnumerable(c: ContractBuilder, explicitImplementations: boolean) {
   c.addUseClause('stellar_tokens::non_fungible', 'enumerable::{NonFungibleEnumerable, Enumerable}');
-  if (explicitImplementations) c.addUseClause('soroban_sdk', 'Address');
-  else c.addUseClause('stellar_macros', 'default_impl');
 
   const nonFungibleEnumerableTrait = {
     traitName: 'NonFungibleEnumerable',
     structName: c.name,
-    tags: explicitImplementations ? ['contractimpl'] : ['default_impl', 'contractimpl'],
+    tags: explicitImplementations ? ['contractimpl'] : ['contractimpl(contracttrait)'],
     section: 'Extensions',
   };
   if (explicitImplementations)
@@ -231,7 +226,6 @@ function addEnumerable(c: ContractBuilder, explicitImplementations: boolean) {
 
 function addConsecutive(c: ContractBuilder, pausable: boolean, access: Access, explicitImplementations: boolean) {
   c.addUseClause('stellar_tokens::non_fungible', 'consecutive::{NonFungibleConsecutive, Consecutive}');
-  c.addUseClause('soroban_sdk', 'Address');
 
   const effectiveAccess = access === false ? DEFAULT_ACCESS_CONTROL : access;
   const nonFungibleConsecutiveTrait = {
@@ -274,7 +268,6 @@ function addMintable(
   access: Access,
   explicitImplementations: boolean,
 ) {
-  c.addUseClause('soroban_sdk', 'Address');
   const accessProps = { useMacro: true, role: 'minter', caller: 'caller' };
   const effectiveAccess = access === false ? DEFAULT_ACCESS_CONTROL : access;
 
diff --git a/packages/core/stellar/src/set-access-control.ts b/packages/core/stellar/src/set-access-control.ts
index e7ee71b74..f9edf362f 100644
--- a/packages/core/stellar/src/set-access-control.ts
+++ b/packages/core/stellar/src/set-access-control.ts
@@ -29,7 +29,7 @@ export function setAccessControl(c: ContractBuilder, access: Access, explicitImp
         const ownableTrait = {
           traitName: 'Ownable',
           structName: c.name,
-          tags: explicitImplementations ? ['contractimpl'] : ['default_impl', 'contractimpl'],
+          tags: explicitImplementations ? ['contractimpl'] : ['contractimpl(contracttrait)'],
           section: 'Utils',
         };
         if (explicitImplementations) {
@@ -51,7 +51,7 @@ export function setAccessControl(c: ContractBuilder, access: Access, explicitImp
       const accessControlTrait = {
         traitName: 'AccessControl',
         structName: c.name,
-        tags: explicitImplementations ? ['contractimpl'] : ['default_impl', 'contractimpl'],
+        tags: explicitImplementations ? ['contractimpl'] : ['contractimpl(contracttrait)'],
         section: 'Utils',
       };
       if (explicitImplementations) {
@@ -105,8 +105,9 @@ export function requireAccessControl(
 
       if (caller && role) {
         c.addUseClause('soroban_sdk', 'Symbol');
+        c.addUseClause('soroban_sdk', 'Vec');
         c.addConstructorArgument({ name: role, type: 'Address' });
-        c.addConstructorCode(`access_control::grant_role_no_auth(e, &admin, &${role}, &Symbol::new(e, "${role}"));`);
+        c.addConstructorCode(`access_control::grant_role_no_auth(e, &${role}, &Symbol::new(e, "${role}"), &admin);`);
 
         if (useMacro) {
           c.addUseClause('stellar_macros', 'only_role');
@@ -114,7 +115,7 @@ export function requireAccessControl(
         } else {
           c.addFunctionCodeBefore(
             fn,
-            [`access_control::ensure_role(e, ${caller}, &Symbol::new(e, "${role}"));`],
+            [`access_control::ensure_role(e, &Symbol::new(e, "${role}"), ${caller});`],
             trait,
           );
         }
@@ -162,6 +163,11 @@ const accessControlFunctions = defineFunctions({
     returns: 'Option<u32>',
     code: ['access_control::has_role(e, &account, &role)'],
   },
+  get_existing_roles: {
+    args: [getSelfArg()],
+    returns: 'Vec<Symbol>',
+    code: ['access_control::get_existing_roles(e)'],
+  },
   get_role_member_count: {
     args: [getSelfArg(), { name: 'role', type: 'Symbol' }],
     returns: 'u32',
@@ -185,24 +191,24 @@ const accessControlFunctions = defineFunctions({
   grant_role: {
     args: [
       getSelfArg(),
-      { name: 'caller', type: 'Address' },
       { name: 'account', type: 'Address' },
       { name: 'role', type: 'Symbol' },
+      { name: 'caller', type: 'Address' },
     ],
-    code: ['access_control::grant_role(e, &caller, &account, &role);'],
+    code: ['access_control::grant_role(e, &account, &role, &caller);'],
   },
   revoke_role: {
     args: [
       getSelfArg(),
-      { name: 'caller', type: 'Address' },
       { name: 'account', type: 'Address' },
       { name: 'role', type: 'Symbol' },
+      { name: 'caller', type: 'Address' },
     ],
-    code: ['access_control::revoke_role(e, &caller, &account, &role);'],
+    code: ['access_control::revoke_role(e, &account, &role, &caller);'],
   },
   renounce_role: {
-    args: [getSelfArg(), { name: 'caller', type: 'Address' }, { name: 'role', type: 'Symbol' }],
-    code: ['access_control::renounce_role(e, &caller, &role);'],
+    args: [getSelfArg(), { name: 'role', type: 'Symbol' }, { name: 'caller', type: 'Address' }],
+    code: ['access_control::renounce_role(e, &role, &caller);'],
   },
   transfer_admin_role: {
     args: [getSelfArg(), { name: 'new_admin', type: 'Address' }, { name: 'live_until_ledger', type: 'u32' }],
diff --git a/packages/core/stellar/src/stablecoin.test.ts.md b/packages/core/stellar/src/stablecoin.test.ts.md
index abb7da355..d2225ae65 100644
--- a/packages/core/stellar/src/stablecoin.test.ts.md
+++ b/packages/core/stellar/src/stablecoin.test.ts.md
@@ -9,11 +9,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -22,12 +23,11 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = Base;␊
     ␊
@@ -39,11 +39,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
     ␊
     #[contract]␊
@@ -52,12 +53,11 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = Base;␊
     ␊
@@ -67,8 +67,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for MyStablecoin {}␊
     `
 
@@ -77,13 +76,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -92,18 +93,17 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
             ownable::set_owner(e, &owner);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = Base;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -117,6 +117,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyStablecoin {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyStablecoin {␊
         fn paused(e: &Env) -> bool {␊
@@ -133,10 +136,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyStablecoin {}␊
     `
 
 ## stablecoin burnable pausable
@@ -144,13 +143,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
     ␊
     #[contract]␊
@@ -159,18 +160,17 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
             ownable::set_owner(e, &owner);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = Base;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -184,7 +184,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for MyStablecoin {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, amount: i128) {␊
@@ -201,6 +201,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyStablecoin {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyStablecoin {␊
         fn paused(e: &Env) -> bool {␊
@@ -217,10 +220,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyStablecoin {}␊
     `
 
 ## stablecoin preminted
@@ -228,11 +227,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -241,13 +241,12 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, recipient: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
-            Base::mint(e, &recipient, 1000000000000000000000);␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::mint(e, &recipient, 10000000000);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = Base;␊
     ␊
@@ -259,11 +258,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -272,12 +272,11 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = Base;␊
     ␊
@@ -289,11 +288,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
-    use stellar_macros::default_impl;␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -302,12 +302,11 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = Base;␊
     ␊
@@ -319,12 +318,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
-    use stellar_macros::default_impl;␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -333,13 +333,12 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
             ownable::set_owner(e, &owner);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = Base;␊
     ␊
@@ -349,8 +348,7 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl Ownable for MyStablecoin {}␊
     `
 
@@ -359,12 +357,13 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::access_control::{self as access_control, AccessControl};␊
-    use stellar_macros::default_impl;␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -373,13 +372,12 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, admin: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
             access_control::set_admin(e, &admin);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = Base;␊
     ␊
@@ -389,8 +387,7 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl AccessControl for MyStablecoin {}␊
     `
 
@@ -399,12 +396,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
-    use stellar_macros::{default_impl, only_owner};␊
+    use stellar_macros::only_owner;␊
     use stellar_tokens::fungible::{␊
         allowlist::{AllowList, FungibleAllowList}, Base, FungibleToken␊
     };␊
@@ -415,13 +414,12 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
             ownable::set_owner(e, &owner);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = AllowList;␊
     ␊
@@ -452,8 +450,7 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl Ownable for MyStablecoin {}␊
     `
 
@@ -462,12 +459,14 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
-    use stellar_macros::{default_impl, only_owner};␊
+    use stellar_macros::only_owner;␊
     use stellar_tokens::fungible::{␊
         Base, blocklist::{BlockList, FungibleBlockList}, FungibleToken␊
     };␊
@@ -478,13 +477,12 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
             ownable::set_owner(e, &owner);␊
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = BlockList;␊
     ␊
@@ -515,8 +513,7 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl Ownable for MyStablecoin {}␊
     `
 
@@ -525,10 +522,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_macros::only_owner;␊
     use stellar_tokens::fungible::{␊
@@ -541,7 +540,7 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
             ownable::set_owner(e, &owner);␊
         }␊
     }␊
@@ -562,7 +561,7 @@ Generated by [AVA](https://avajs.dev).
             Self::ContractType::allowance(e, &owner, &spender)␊
         }␊
     ␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -637,10 +636,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_macros::only_owner;␊
     use stellar_tokens::fungible::{␊
@@ -653,7 +654,7 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
             ownable::set_owner(e, &owner);␊
         }␊
     }␊
@@ -674,7 +675,7 @@ Generated by [AVA](https://avajs.dev).
             Self::ContractType::allowance(e, &owner, &spender)␊
         }␊
     ␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -749,13 +750,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::fungible::{␊
         allowlist::{AllowList, FungibleAllowList}, Base, burnable::FungibleBurnable, FungibleToken␊
     };␊
@@ -766,8 +769,8 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, recipient: Address, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
-            Base::mint(e, &recipient, 2000000000000000000000);␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::mint(e, &recipient, 20000000000);␊
             ownable::set_owner(e, &owner);␊
         }␊
     ␊
@@ -778,13 +781,12 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = AllowList;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -815,7 +817,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for MyStablecoin {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, amount: i128) {␊
@@ -832,6 +834,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyStablecoin {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyStablecoin {␊
         fn paused(e: &Env) -> bool {␊
@@ -848,10 +853,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyStablecoin {}␊
     `
 
 ## stablecoin full - ownable, blocklist
@@ -859,13 +860,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::fungible::{␊
         Base, blocklist::{BlockList, FungibleBlockList}, burnable::FungibleBurnable, FungibleToken␊
     };␊
@@ -876,8 +879,8 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env, recipient: Address, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
-            Base::mint(e, &recipient, 2000000000000000000000);␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::mint(e, &recipient, 20000000000);␊
             ownable::set_owner(e, &owner);␊
         }␊
     ␊
@@ -888,13 +891,12 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = BlockList;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -925,7 +927,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for MyStablecoin {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, amount: i128) {␊
@@ -942,6 +944,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for MyStablecoin {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyStablecoin {␊
         fn paused(e: &Env) -> bool {␊
@@ -958,10 +963,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for MyStablecoin {}␊
     `
 
 ## stablecoin full - roles, allowlist
@@ -969,13 +970,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String, Symbol};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::access_control::{self as access_control, AccessControl};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_role, when_not_paused};␊
+    use stellar_macros::{only_role, when_not_paused};␊
     use stellar_tokens::fungible::{␊
         allowlist::{AllowList, FungibleAllowList}, Base, burnable::FungibleBurnable, FungibleToken␊
     };␊
@@ -993,12 +996,12 @@ Generated by [AVA](https://avajs.dev).
             minter: Address,␊
             manager: Address,␊
         ) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
-            Base::mint(e, &recipient, 2000000000000000000000);␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::mint(e, &recipient, 20000000000);␊
             access_control::set_admin(e, &admin);␊
-            access_control::grant_role_no_auth(e, &admin, &pauser, &Symbol::new(e, "pauser"));␊
-            access_control::grant_role_no_auth(e, &admin, &minter, &Symbol::new(e, "minter"));␊
-            access_control::grant_role_no_auth(e, &admin, &manager, &Symbol::new(e, "manager"));␊
+            access_control::grant_role_no_auth(e, &pauser, &Symbol::new(e, "pauser"), &admin);␊
+            access_control::grant_role_no_auth(e, &minter, &Symbol::new(e, "minter"), &admin);␊
+            access_control::grant_role_no_auth(e, &manager, &Symbol::new(e, "manager"), &admin);␊
         }␊
     ␊
         #[only_role(caller, "minter")]␊
@@ -1008,13 +1011,12 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = AllowList;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -1045,7 +1047,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for MyStablecoin {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, amount: i128) {␊
@@ -1062,6 +1064,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl AccessControl for MyStablecoin {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyStablecoin {␊
         fn paused(e: &Env) -> bool {␊
@@ -1078,10 +1083,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl AccessControl for MyStablecoin {}␊
     `
 
 ## stablecoin full - roles, blocklist
@@ -1089,13 +1090,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String, Symbol};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::access_control::{self as access_control, AccessControl};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_role, when_not_paused};␊
+    use stellar_macros::{only_role, when_not_paused};␊
     use stellar_tokens::fungible::{␊
         Base, blocklist::{BlockList, FungibleBlockList}, burnable::FungibleBurnable, FungibleToken␊
     };␊
@@ -1113,12 +1116,12 @@ Generated by [AVA](https://avajs.dev).
             minter: Address,␊
             manager: Address,␊
         ) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
-            Base::mint(e, &recipient, 2000000000000000000000);␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::mint(e, &recipient, 20000000000);␊
             access_control::set_admin(e, &admin);␊
-            access_control::grant_role_no_auth(e, &admin, &pauser, &Symbol::new(e, "pauser"));␊
-            access_control::grant_role_no_auth(e, &admin, &minter, &Symbol::new(e, "minter"));␊
-            access_control::grant_role_no_auth(e, &admin, &manager, &Symbol::new(e, "manager"));␊
+            access_control::grant_role_no_auth(e, &pauser, &Symbol::new(e, "pauser"), &admin);␊
+            access_control::grant_role_no_auth(e, &minter, &Symbol::new(e, "minter"), &admin);␊
+            access_control::grant_role_no_auth(e, &manager, &Symbol::new(e, "manager"), &admin);␊
         }␊
     ␊
         #[only_role(caller, "minter")]␊
@@ -1128,13 +1131,12 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for MyStablecoin {␊
         type ContractType = BlockList;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -1165,7 +1167,7 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for MyStablecoin {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, amount: i128) {␊
@@ -1182,6 +1184,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl AccessControl for MyStablecoin {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for MyStablecoin {␊
         fn paused(e: &Env) -> bool {␊
@@ -1198,10 +1203,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl AccessControl for MyStablecoin {}␊
     `
 
 ## stablecoin full - complex name
@@ -1209,13 +1210,15 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_access::ownable::{self as ownable, Ownable};␊
     use stellar_contract_utils::pausable::{self as pausable, Pausable};␊
-    use stellar_macros::{default_impl, only_owner, when_not_paused};␊
+    use stellar_macros::{only_owner, when_not_paused};␊
     use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
     ␊
     #[contract]␊
@@ -1224,8 +1227,8 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl CustomToken {␊
         pub fn __constructor(e: &Env, recipient: Address, owner: Address) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "Custom  $ Token"), String::from_str(e, "MST"));␊
-            Base::mint(e, &recipient, 2000000000000000000000);␊
+            Base::set_metadata(e, 7, String::from_str(e, "Custom  $ Token"), String::from_str(e, "MST"));␊
+            Base::mint(e, &recipient, 20000000000);␊
             ownable::set_owner(e, &owner);␊
         }␊
     ␊
@@ -1236,13 +1239,12 @@ Generated by [AVA](https://avajs.dev).
         }␊
     }␊
     ␊
-    #[default_impl]␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleToken for CustomToken {␊
         type ContractType = Base;␊
     ␊
         #[when_not_paused]␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
@@ -1256,7 +1258,7 @@ Generated by [AVA](https://avajs.dev).
     // Extensions␊
     //␊
     ␊
-    #[contractimpl]␊
+    #[contractimpl(contracttrait)]␊
     impl FungibleBurnable for CustomToken {␊
         #[when_not_paused]␊
         fn burn(e: &Env, from: Address, amount: i128) {␊
@@ -1273,6 +1275,9 @@ Generated by [AVA](https://avajs.dev).
     // Utils␊
     //␊
     ␊
+    #[contractimpl(contracttrait)]␊
+    impl Ownable for CustomToken {}␊
+    ␊
     #[contractimpl]␊
     impl Pausable for CustomToken {␊
         fn paused(e: &Env) -> bool {␊
@@ -1289,10 +1294,6 @@ Generated by [AVA](https://avajs.dev).
             pausable::unpause(e);␊
         }␊
     }␊
-    ␊
-    #[default_impl]␊
-    #[contractimpl]␊
-    impl Ownable for CustomToken {}␊
     `
 
 ## stablecoin explicit trait implementations
@@ -1300,10 +1301,12 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `// SPDX-License-Identifier: MIT␊
-    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+    // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
     #![no_std]␊
     ␊
-    use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+    use soroban_sdk::{␊
+        Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+    };␊
     use stellar_tokens::fungible::{Base, FungibleToken};␊
     ␊
     #[contract]␊
@@ -1312,7 +1315,7 @@ Generated by [AVA](https://avajs.dev).
     #[contractimpl]␊
     impl MyStablecoin {␊
         pub fn __constructor(e: &Env) {␊
-            Base::set_metadata(e, 18, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
+            Base::set_metadata(e, 7, String::from_str(e, "MyStablecoin"), String::from_str(e, "MST"));␊
         }␊
     }␊
     ␊
@@ -1332,7 +1335,7 @@ Generated by [AVA](https://avajs.dev).
             Self::ContractType::allowance(e, &owner, &spender)␊
         }␊
     ␊
-        fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+        fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
             Self::ContractType::transfer(e, &from, &to, amount);␊
         }␊
     ␊
diff --git a/packages/core/stellar/src/stablecoin.test.ts.snap b/packages/core/stellar/src/stablecoin.test.ts.snap
index 1b347ebdf96d1238d144bff75ce478106702c8f3..d196cdb830f76ab1cc9f438d510cd1d6a2744f60 100644
GIT binary patch
literal 2198
zcmV;H2x<30RzV<BZeeh9Xm4~Nb~6eC0CRzSwFA=`O*X{mQb{&I!%-mxIbOdbuDqq&
zFx?F}IUkD%00000000B+UEOZnL=-NqnpReCxBzj1(2$mGR&ts)kqVkXr8WeqQma%-
zKtL5NuRWVs@y=MDaW)~^3vQ6OMo8S2H{cEW23#Uu0Pz@T{4@6WXT6(jcD>ozi^M-O
zXU@#|neQCW*l)TWmsm&i*FO+*n2WrQNgWGNW_Da;5eGXIn;tzRjQ;e-woPV!cYW{1
zwOiNt@12|1-o3tkeQgcwzWVap)fbM1Fh#4+ZG@TAb&wCi%jbLA+8Wp*J<nuL$3>v;
zutTupA^bh^JmfkU>@wuKrVn<BPdX+BTLd%Tv={|HJbdu@!9(rt$FDIlD6{u9EuaX{
zsGvdZBM8ql004Mu+diUH2Uc7;J#u=UtAlNPtb>=q39?1eUFJLZKnJ_0y$*48@C~xG
z!DiG##FD|t5yBM0Zh#Ls_Yj^vGbz%+SMh~CUSP1PX?I^I?d@w`&;gYBfyKbf(_Jx?
zQYp^WzQ+GbWkA#&PN9o|VORu5l!(8AAZTsl<91wz|2Q)cQpAiNVkQ^Q3ev%+N#7vs
z`lM%2=JU(T*@l+eRfTr<mfP*ku!(^-$n(6CoG{;XSUc{5G#sEy{IX85Qx6H@?(vf^
z!VYX|+CYo-kEWUjI)RV*Nr?*nC8^-sg;c?0cpywh|5<!RsprJiQ(If(O0<2#5T*{n
zlwTOD?L;^w&6jGwX9l!f`<K=v?FUO&So=-OLX<*C`mwH`QRH@kNkM!?2RqS0u42--
z5irN45GKQ!p^#kC!K?TvN26z2KA{kv5$v8Cq>quWgZ?4H1}4nl)sa016NU~#)?p%}
zDOxE13DNOZLQZ(GR(LdRL*}>dzRrnoKfK(<fcYk-U6dI(-Z7Z!HX|^n!e);Im_gt?
zTK_CNuDi(XLYQR&!j!xYTAZ>DT8tz##88aLq`@hqoKg>AJ0s*$-Y>*<+@KCxaa%)s
zAzbFy-2O)Pma#FHI>~ZlNNl%C8@iDzMRqzttv&%ALflNhQ}2+JZOhU~J;1(1H5Gti
znXX%5WjXRIC@<_1@&P_q1EN|+67lSE@?i<M8Zyt^dMnK{f8J8_O!McNhN40>2dOz|
zc5~3>!1kI!;+9w`#j4Inwh&bneH%|Wyz;n$sb{Bp<kiIA^ogHk!%83Z9L$hil2!R#
zn(u#E$gIjt=SUw}j^`k5iL;p}qb9h5gr+X|(ZQpK;y1J8V85uxfONq_m7{K&Dqqbc
zU`dva>tIEWTB)E?!OK!XKcj+iY*W<08}CUPxOC$RYv8%#_a>^Y3YLpcUM3e!Bu~0C
zCgc+r(GmlCEE&-KMKGY~f0WiDZpMz}8#;Izo^M5`b754b-E;7)j4D5_ys?m>(6+*(
zIk7EC@WU)D8+MwmOZu)uS<%XF-j}TGgPRLrWn)iMNs2hl7t~r@*bg!85S~5d$1fbp
zQacov20AFQP)*Hy)1LQ)L`GhAkZVy87?KwYwIWT7>D)U-2|zLO#Z;Lf456scT~}1K
zK5Z6OG6I^-ZS%8C8j^U(HyJ6{fPDKgDIK)<!3c>p+o2QWAxACG#^nK*tXmBi?^U?f
zPb9bczH+M*bgS{Rwq*1<zTwBRa}}2c%B{}YtqNJ3*R2WyL)>bp597L3K^Q_&e;l_O
zR=R*o%eOzaTMh68S&)fM&#9hllz~-%PCVDK90o#qfKx*~gqg{>))bwt_MhZ*|Iw7w
zogtP@25aXS`MzT#s{HWSet432Hg*_{Fw-??;Cb$;^lX+teXd&wAk~$;Blm@-Yhnx4
zIN%YQ5rir{aRO)M)@1P(AG?p*dWLi&p!B(Wo{t7C7@41yAwr0r=ab_xL?|<-1J^l5
zMu3^)8ZNRAc*$U6y^d+oY*D;P10|#j+}p@<dZtSyBMLUwYg$jM<#h?0JtPr}97_$o
zs8*g94QGz=sU`K=sYg;l@Kp_hYXMrq_CY#lWfW@1<2dZ|n8zm>9>rvrsaWMXqx<yG
z@zU|YsBh$bLA|YuR?A51pe3k|V%;2Hd927>X@kYW1$sWhB)}FLkz!f#k~PH}W!Z@F
zar3_tZvI>0=2<2y6mFh9Zq6nwfWplRH!Iw%aPu%~6T!_Y%Q+8OPKBE19W~#}pyqDi
zx?nX0e?yi^Xn_Qiy9y>ZdPm;*veqN-;F~%OFK$nmF*L8<uCQL%t^h`b@)dJH#fGbR
z#3CN5X2iM;R-y-S#j;IRQ(JX1q_fR}%?q+WQKdE;n%Y#`NYysd__q+-NQa`<AuG`|
zDxp?eq1NW3*0FQO3biWKI&IXN&yg$C+E~=85{u19EGo>ZFzZ5L*5x8*4R?DE&9mMa
zNQf2RSpdX3k&T~|N3mR3i<^2C%AQz+xKM&>#XWhWt1ekg))k5y;TwTUZ<yFTDBNi{
zULJj`ZCU99-^46bI|CEL4A@~<EgCx=v?5c25Tky`ZFGZo=Deh%(Jvt#-MA3xNPcCs
zqdNuSvU}zPS0W#r;b+pJg${<e`G&+ADnmXuu||V3<e~i};5}<~v&@>;Go>==Dk`ae
z&BM%N6M1$@CgQ4K<-)N_O>>3d<q~6;A=&mjXHx9qs@P>NW0(0)z^m9r#V#s#X+rFx
zo|DW??9!m;B=up!44$3TGo_xVNX|z^E-G@Fe&q5|F><j8-voLR?v*J<Ew_J@qL!a;
zFF@2X$7_Tp_pO<&fHKkxOH~CNnIbb^@DuR@z&#N1qt^UP49ga!tiGW$Hz;-t;8T>d
z!ab8;M<R{#NPwp(7qyB+;F)#?&y4$Si=`hWXmfOxKiAsC7k|(8Ll6`EXq<Wlgn9+U
Y>;ZugqIv~H^Irk+KO}Y?m*0T^02FgCbN~PV

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

diff --git a/packages/core/stellar/src/utils/version.ts b/packages/core/stellar/src/utils/version.ts
index 20d840cec..9fe7720f4 100644
--- a/packages/core/stellar/src/utils/version.ts
+++ b/packages/core/stellar/src/utils/version.ts
@@ -1,15 +1,15 @@
 /**
  * The actual latest version to use in links.
  */
-export const contractsVersion = '0.4.1';
+export const contractsVersion = '0.6.0';
 export const contractsVersionTag = `v${contractsVersion}`;
 
 /**
  * Semantic version string representing of the minimum compatible version of Contracts to display in output.
  */
-export const compatibleContractsSemver = '^0.4.1';
+export const compatibleContractsSemver = '^0.6.0';
 
 /**
  * The Soroban version for which compilation and testing have passing tests
  */
-export const compatibleSorobanVersion = '22.0.8';
+export const compatibleSorobanVersion = '23.4.0';
diff --git a/packages/core/stellar/src/zip-rust.compile.test.ts.md b/packages/core/stellar/src/zip-rust.compile.test.ts.md
index 2a4007672..0b6272bd3 100644
--- a/packages/core/stellar/src/zip-rust.compile.test.ts.md
+++ b/packages/core/stellar/src/zip-rust.compile.test.ts.md
@@ -10,11 +10,10 @@ Generated by [AVA](https://avajs.dev).
 
     [
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+      // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
       ␊
       ␊
-      use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
-      use stellar_macros::default_impl;␊
+      use soroban_sdk::{Address, contract, contractimpl, Env, MuxedAddress, String};␊
       use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
       ␊
       #[contract]␊
@@ -23,13 +22,12 @@ Generated by [AVA](https://avajs.dev).
       #[contractimpl]␊
       impl MyToken {␊
           pub fn __constructor(e: &Env, recipient: Address) {␊
-              Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
-              Base::mint(e, &recipient, 2000000000000000000000);␊
+              Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+              Base::mint(e, &recipient, 20000000000);␊
           }␊
       }␊
       ␊
-      #[default_impl]␊
-      #[contractimpl]␊
+      #[contractimpl(contracttrait)]␊
       impl FungibleToken for MyToken {␊
           type ContractType = Base;␊
       ␊
@@ -39,8 +37,7 @@ Generated by [AVA](https://avajs.dev).
       // Extensions␊
       //␊
       ␊
-      #[default_impl]␊
-      #[contractimpl]␊
+      #[contractimpl(contracttrait)]␊
       impl FungibleBurnable for MyToken {}␊
       `,
       `#![cfg(test)]␊
@@ -104,11 +101,11 @@ Generated by [AVA](https://avajs.dev).
       version = "0.0.1"␊
       ␊
       [workspace.dependencies]␊
-      soroban-sdk = "22.0.8"␊
-      stellar-tokens = "=0.4.1"␊
-      stellar-access = "=0.4.1"␊
-      stellar-contract-utils = "=0.4.1"␊
-      stellar-macros = "=0.4.1"␊
+      soroban-sdk = "23.4.0"␊
+      stellar-tokens = "=0.6.0"␊
+      stellar-access = "=0.6.0"␊
+      stellar-contract-utils = "=0.6.0"␊
+      stellar-macros = "=0.6.0"␊
       ␊
       ␊
       [profile.release]␊
@@ -146,10 +143,10 @@ Generated by [AVA](https://avajs.dev).
 
     [
       `// SPDX-License-Identifier: MIT␊
-      // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.4.1␊
+      // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
       ␊
       ␊
-      use soroban_sdk::{Address, contract, contractimpl, Env, String};␊
+      use soroban_sdk::{Address, contract, contractimpl, Env, MuxedAddress, String};␊
       use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
       ␊
       #[contract]␊
@@ -158,8 +155,8 @@ Generated by [AVA](https://avajs.dev).
       #[contractimpl]␊
       impl MyToken {␊
           pub fn __constructor(e: &Env, recipient: Address) {␊
-              Base::set_metadata(e, 18, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
-              Base::mint(e, &recipient, 2000000000000000000000);␊
+              Base::set_metadata(e, 7, String::from_str(e, "MyToken"), String::from_str(e, "MTK"));␊
+              Base::mint(e, &recipient, 20000000000);␊
           }␊
       }␊
       ␊
@@ -179,7 +176,7 @@ Generated by [AVA](https://avajs.dev).
               Self::ContractType::allowance(e, &owner, &spender)␊
           }␊
       ␊
-          fn transfer(e: &Env, from: Address, to: Address, amount: i128) {␊
+          fn transfer(e: &Env, from: Address, to: MuxedAddress, amount: i128) {␊
               Self::ContractType::transfer(e, &from, &to, amount);␊
           }␊
       ␊
@@ -280,11 +277,11 @@ Generated by [AVA](https://avajs.dev).
       version = "0.0.1"␊
       ␊
       [workspace.dependencies]␊
-      soroban-sdk = "22.0.8"␊
-      stellar-tokens = "=0.4.1"␊
-      stellar-access = "=0.4.1"␊
-      stellar-contract-utils = "=0.4.1"␊
-      stellar-macros = "=0.4.1"␊
+      soroban-sdk = "23.4.0"␊
+      stellar-tokens = "=0.6.0"␊
+      stellar-access = "=0.6.0"␊
+      stellar-contract-utils = "=0.6.0"␊
+      stellar-macros = "=0.6.0"␊
       ␊
       ␊
       [profile.release]␊
diff --git a/packages/core/stellar/src/zip-rust.compile.test.ts.snap b/packages/core/stellar/src/zip-rust.compile.test.ts.snap
index 8714750999a570270d844f76815231270c9019e2..81599a9bb0a34e5a0a6703b3ebfafdbc45a26fca 100644
GIT binary patch
literal 1890
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

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

diff --git a/packages/ui/src/stellar/TraitImplementationSection.svelte b/packages/ui/src/stellar/TraitImplementationSection.svelte
index fa9cf86fc..ef001cf67 100644
--- a/packages/ui/src/stellar/TraitImplementationSection.svelte
+++ b/packages/ui/src/stellar/TraitImplementationSection.svelte
@@ -18,8 +18,8 @@
   <h1 class="flex justify-between pr-2">
     Trait Implementations
     <HelpTooltip>
-      Whether the contract should use explicit trait implementations instead of the <code>#[default_impl]</code> macro to
-      auto-generate trait method bodies.
+      Whether the contract functions should be explicitly implemented or be auto-generated with the defaults provided by
+      the library.
     </HelpTooltip>
   </h1>
   <div class="checkbox-group">
@@ -27,7 +27,8 @@
       <input type="radio" bind:group={implementationMode} value="default" on:change={syncExplicit} />
       Default
       <HelpTooltip
-        >Keep the <code>#[default_impl]</code> attribute so unused trait functions rely on the macro.</HelpTooltip
+        >The <code>#[contractimpl(contracttrait)]</code> attribute generates the contract functions with the defaults provided
+        in the trait. If needed, one can always re-implement some of the functions with custom logic.</HelpTooltip
       >
     </label>
 
@@ -35,7 +36,7 @@
       <input type="radio" bind:group={implementationMode} value="explicit" on:change={syncExplicit} />
       Explicit
       <HelpTooltip
-        >Generate every trait function body explicitly and omit the <code>#[default_impl]</code> attribute. Easier to customize.</HelpTooltip
+        >Generate every trait function body explicitly. Useful when all of them need to be customized.</HelpTooltip
       >
     </label>
   </div>

From 9632bc91bc43d0f65f96b3940b18d1cc51103c3a Mon Sep 17 00:00:00 2001
From: brozorec <9572072+brozorec@users.noreply.github.com>
Date: Tue, 27 Jan 2026 14:22:43 +0100
Subject: [PATCH 2/6] update zip-rust snapshot

---
 .../stellar/src/zip-rust.compile.test.ts.md   |   8 ++++++--
 .../stellar/src/zip-rust.compile.test.ts.snap | Bin 1890 -> 1897 bytes
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/core/stellar/src/zip-rust.compile.test.ts.md b/packages/core/stellar/src/zip-rust.compile.test.ts.md
index 0b6272bd3..aa28730a1 100644
--- a/packages/core/stellar/src/zip-rust.compile.test.ts.md
+++ b/packages/core/stellar/src/zip-rust.compile.test.ts.md
@@ -13,7 +13,9 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
       ␊
       ␊
-      use soroban_sdk::{Address, contract, contractimpl, Env, MuxedAddress, String};␊
+      use soroban_sdk::{␊
+          Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+      };␊
       use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
       ␊
       #[contract]␊
@@ -146,7 +148,9 @@ Generated by [AVA](https://avajs.dev).
       // Compatible with OpenZeppelin Stellar Soroban Contracts ^0.6.0␊
       ␊
       ␊
-      use soroban_sdk::{Address, contract, contractimpl, Env, MuxedAddress, String};␊
+      use soroban_sdk::{␊
+          Address, contract, contractimpl, Env, MuxedAddress, String, Symbol, Vec␊
+      };␊
       use stellar_tokens::fungible::{Base, burnable::FungibleBurnable, FungibleToken};␊
       ␊
       #[contract]␊
diff --git a/packages/core/stellar/src/zip-rust.compile.test.ts.snap b/packages/core/stellar/src/zip-rust.compile.test.ts.snap
index 81599a9bb0a34e5a0a6703b3ebfafdbc45a26fca..ab029b4cf0dc462f782a7d7e302fab889f995976 100644
GIT binary patch
literal 1897
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

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


From 8dec060b86e2ec0302a1f8b76258a8085cc032f0 Mon Sep 17 00:00:00 2001
From: Boyan Barakov <9572072+brozorec@users.noreply.github.com>
Date: Wed, 28 Jan 2026 09:46:06 +0100
Subject: [PATCH 3/6] Update
 packages/ui/src/stellar/TraitImplementationSection.svelte

Co-authored-by: Eric Lau <ericglau@outlook.com>
---
 packages/ui/src/stellar/TraitImplementationSection.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/src/stellar/TraitImplementationSection.svelte b/packages/ui/src/stellar/TraitImplementationSection.svelte
index ef001cf67..fbd1b7f8a 100644
--- a/packages/ui/src/stellar/TraitImplementationSection.svelte
+++ b/packages/ui/src/stellar/TraitImplementationSection.svelte
@@ -36,7 +36,7 @@
       <input type="radio" bind:group={implementationMode} value="explicit" on:change={syncExplicit} />
       Explicit
       <HelpTooltip
-        >Generate every trait function body explicitly. Useful when all of them need to be customized.</HelpTooltip
+        >Include every trait function body explicitly. Useful when all of them need to be customized.</HelpTooltip
       >
     </label>
   </div>

From aff2a222c9cf7d24f407f17088a7fec9d4027bd5 Mon Sep 17 00:00:00 2001
From: Boyan Barakov <9572072+brozorec@users.noreply.github.com>
Date: Wed, 28 Jan 2026 09:46:13 +0100
Subject: [PATCH 4/6] Update
 packages/ui/src/stellar/TraitImplementationSection.svelte

Co-authored-by: Eric Lau <ericglau@outlook.com>
---
 packages/ui/src/stellar/TraitImplementationSection.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/src/stellar/TraitImplementationSection.svelte b/packages/ui/src/stellar/TraitImplementationSection.svelte
index fbd1b7f8a..87f526200 100644
--- a/packages/ui/src/stellar/TraitImplementationSection.svelte
+++ b/packages/ui/src/stellar/TraitImplementationSection.svelte
@@ -28,7 +28,7 @@
       Default
       <HelpTooltip
         >The <code>#[contractimpl(contracttrait)]</code> attribute generates the contract functions with the defaults provided
-        in the trait. If needed, one can always re-implement some of the functions with custom logic.</HelpTooltip
+        in the trait. You can re-implement some of the functions with custom logic if needed.</HelpTooltip
       >
     </label>
 

From 337fc3309da5e1a0de4ebd14896dabfd62979001 Mon Sep 17 00:00:00 2001
From: brozorec <9572072+brozorec@users.noreply.github.com>
Date: Wed, 28 Jan 2026 09:46:48 +0100
Subject: [PATCH 5/6] separate changesets

---
 .changeset/little-papers-notice.md | 5 +++++
 .changeset/pink-eyes-judge.md      | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/little-papers-notice.md

diff --git a/.changeset/little-papers-notice.md b/.changeset/little-papers-notice.md
new file mode 100644
index 000000000..7947684bd
--- /dev/null
+++ b/.changeset/little-papers-notice.md
@@ -0,0 +1,5 @@
+---
+'@openzeppelin/wizard-common': minor
+---
+
+Modify tooltip descriptions regarding default implementations to fit the changes introduced with v0.6.0
diff --git a/.changeset/pink-eyes-judge.md b/.changeset/pink-eyes-judge.md
index 81a6606d2..1cdd3710f 100644
--- a/.changeset/pink-eyes-judge.md
+++ b/.changeset/pink-eyes-judge.md
@@ -1,6 +1,5 @@
 ---
 '@openzeppelin/wizard-stellar': minor
-'@openzeppelin/wizard-common': minor
 ---
 
 Refactor Stellar contracts to match the latest v0.6.0
@@ -8,5 +7,4 @@ Refactor Stellar contracts to match the latest v0.6.0
     - Use OpenZeppelin Stellar Soroban Contracts v0.6.0
     - Use `MuxedAddress` for fungible transfer function
     - Change order of parameters in access control
-
-Change default fungible decimals to 7
+    - Change default fungible decimals to 7

From e78be74505cffe00358bc7940c85e135b38bce2e Mon Sep 17 00:00:00 2001
From: Boyan Barakov <9572072+brozorec@users.noreply.github.com>
Date: Wed, 28 Jan 2026 16:37:10 +0100
Subject: [PATCH 6/6] Update .changeset/little-papers-notice.md

Co-authored-by: Eric Lau <ericglau@outlook.com>
---
 .changeset/little-papers-notice.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/little-papers-notice.md b/.changeset/little-papers-notice.md
index 7947684bd..0ba683536 100644
--- a/.changeset/little-papers-notice.md
+++ b/.changeset/little-papers-notice.md
@@ -1,5 +1,5 @@
 ---
-'@openzeppelin/wizard-common': minor
+'@openzeppelin/wizard-common': patch
 ---
 
 Modify tooltip descriptions regarding default implementations to fit the changes introduced with v0.6.0