@openzeppelin/wizard-stellar 0.6.5 → 0.7.0

package/src/vault.ts

@@ -10,6 +10,7 @@ import { setInfo } from './set-info';
 import { contractDefaults as commonDefaults } from './common-options';
 import { printContract } from './print';
 import { toByteArray, toUint } from './utils/convert-strings';
+import { printComposedContractType } from './utils/compose';
 import { OptionsError } from './error';
 import { pickKeys } from '@openzeppelin/wizard-common';
 
@@ -119,7 +120,16 @@ function addBase(
 
   // Set token functions
   c.addUseClause('stellar_tokens::fungible', 'Base');
+  c.addUseClause('stellar_tokens::fungible', 'Compose');
   c.addUseClause('stellar_tokens::fungible', 'FungibleToken');
+  // `Vault` provides the total supply only through the `TotalSupplyOverrides` trait, which the
+  // explicitly implemented `total_supply` needs in scope.
+  c.addUseClause(
+    'stellar_tokens::fungible',
+    explicitImplementations
+      ? 'total_supply::{FungibleTotalSupply, TotalSupply, TotalSupplyOverrides}'
+      : 'total_supply::{FungibleTotalSupply, TotalSupply}',
+  );
   c.addUseClause('stellar_tokens::vault', 'FungibleVault');
   c.addUseClause('stellar_tokens::vault', 'Vault');
   // The base token functions we emit delegate to `Self::ContractType::...`,
@@ -138,7 +148,8 @@ function addBase(
     traitName: 'FungibleToken',
     structName: c.name,
     tags: explicitImplementations ? ['contractimpl'] : ['contractimpl(contracttrait)'],
-    assocType: 'type ContractType = Vault;',
+    // The vault tracks the share supply, which the library requires to be stated with `TotalSupply`.
+    assocType: printComposedContractType(['Vault', 'TotalSupply']),
   };
 
   c.addTraitImplBlock(fungibleTokenTrait);
@@ -161,6 +172,19 @@ function addBase(
     c.addFunctionTag(functions.transfer_from, 'when_not_paused', fungibleTokenTrait);
   }
 
+  const fungibleTotalSupplyTrait = {
+    traitName: 'FungibleTotalSupply',
+    structName: c.name,
+    tags: explicitImplementations ? ['contractimpl'] : ['contractimpl(contracttrait)'],
+    section: 'Extensions',
+  };
+
+  if (explicitImplementations) {
+    c.addTraitFunction(fungibleTotalSupplyTrait, functions.total_supply);
+  } else {
+    c.addTraitImplBlock(fungibleTotalSupplyTrait);
+  }
+
   const fungibleVaultTrait = {
     traitName: 'FungibleVault',
     structName: c.name,
@@ -177,11 +201,6 @@ function addBase(
 
 export const functions = defineFunctions({
   // FungibleToken Trait
-  total_supply: {
-    args: [getSelfArg()],
-    returns: 'i128',
-    code: ['Self::ContractType::total_supply(e)'],
-  },
   balance: {
     args: [getSelfArg(), { name: 'account', type: 'Address' }],
     returns: 'i128',
@@ -239,6 +258,13 @@ export const functions = defineFunctions({
     code: ['Self::ContractType::symbol(e)'],
   },
 
+  // FungibleTotalSupply Trait
+  total_supply: {
+    args: [getSelfArg()],
+    returns: 'i128',
+    code: ['Self::ContractType::total_supply(e)'],
+  },
+
   // FungibleVault Trait
   query_asset: {
     args: [getSelfArg()],
@@ -347,7 +373,6 @@ export const functions = defineFunctions({
 });
 
 const fungibleTokenTraitFunctions = pickKeys(functions, [
-  'total_supply',
   'balance',
   'allowance',
   'transfer',

package/src/zip-shared.ts

@@ -57,7 +57,7 @@ extern crate std;
 use soroban_sdk::{
     contract, contractimpl, testutils::Address as _, Address, Env, MuxedAddress, String,
 };
-use stellar_tokens::fungible::{Base, FungibleToken};
+use stellar_tokens::fungible::{Base, Compose, FungibleToken};
 
 use crate::contract::{ ${c.name}, ${c.name}Client };
 
@@ -74,13 +74,13 @@ impl MockAssetContract {
             String::from_str(e, "Mock Asset Token"),
             String::from_str(e, "MAT"),
         );
-        Base::mint(e, &admin, initial_supply);
+        <Self as FungibleToken>::ContractType::mint(e, &admin, initial_supply);
     }
 }
 
 #[contractimpl(contracttrait)]
 impl FungibleToken for MockAssetContract {
-    type ContractType = Base;
+    type ContractType = Compose<(Base,)>;
 }
 
 #[test]
@@ -95,6 +95,7 @@ fn initial_state() {
 
     assert_eq!(client.query_asset(), asset_address);
     assert_eq!(client.name(), String::from_str(&env, "${c.name}"));
+    assert_eq!(client.total_supply(), 0);
 }
 
 // Add more tests bellow