@openzeppelin/wizard-stellar 0.1.0 → 0.2.0

package/README.md

@@ -12,6 +12,7 @@ This package provides a programmatic API. For a web interface, see https://wizar
 
 The following contract types are supported:
 - `fungible`
+- `nonFungible`
 
 Each contract type has functions/constants as defined below.
 

package/dist/add-pausable.js

@@ -5,17 +5,17 @@ const common_options_1 = require("./common-options");
 const set_access_control_1 = require("./set-access-control");
 const define_functions_1 = require("./utils/define-functions");
 function addPausable(c, access) {
-    c.addUseClause('openzeppelin_pausable', 'self', { alias: 'pausable' });
-    c.addUseClause('openzeppelin_pausable', 'Pausable');
+    c.addUseClause('stellar_pausable', 'self', { alias: 'pausable' });
+    c.addUseClause('stellar_pausable', 'Pausable');
     const pausableTrait = {
-        name: 'Pausable',
-        for: c.name,
+        traitName: 'Pausable',
+        structName: c.name,
         tags: ['contractimpl'],
         section: 'Utils',
     };
-    c.addFunction(pausableTrait, functions.paused);
-    c.addFunction(pausableTrait, functions.pause);
-    c.addFunction(pausableTrait, functions.unpause);
+    c.addTraitFunction(pausableTrait, functions.paused);
+    c.addTraitFunction(pausableTrait, functions.pause);
+    c.addTraitFunction(pausableTrait, functions.unpause);
     (0, set_access_control_1.requireAccessControl)(c, pausableTrait, functions.pause, access, 'caller');
     (0, set_access_control_1.requireAccessControl)(c, pausableTrait, functions.unpause, access, 'caller');
 }

package/dist/add-pausable.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-pausable.js","sourceRoot":"","sources":["../src/add-pausable.ts"],"names":[],"mappings":";;AAMA,kCAiBC;AAvBD,qDAA8C;AAG9C,6DAA4D;AAC5D,+DAA2D;AAE3D,SAAgB,WAAW,CAAC,CAAkB,EAAE,MAAc;IAC5D,CAAC,CAAC,YAAY,CAAC,uBAAuB,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IACvE,CAAC,CAAC,YAAY,CAAC,uBAAuB,EAAE,UAAU,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG;QACpB,IAAI,EAAE,UAAU;QAChB,GAAG,EAAE,CAAC,CAAC,IAAI;QACX,IAAI,EAAE,CAAC,cAAc,CAAC;QACtB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,CAAC,CAAC,WAAW,CAAC,aAAa,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC/C,CAAC,CAAC,WAAW,CAAC,aAAa,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC,CAAC,WAAW,CAAC,aAAa,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAEhD,IAAA,yCAAoB,EAAC,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC1E,IAAA,yCAAoB,EAAC,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,SAAS,GAAG,IAAA,kCAAe,EAAC;IAChC,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,IAAA,2BAAU,GAAE,CAAC;QACpB,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,CAAC,qBAAqB,CAAC;KAC9B;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC,IAAA,2BAAU,GAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACzD,IAAI,EAAE,CAAC,6BAA6B,CAAC;KACtC;IACD,OAAO,EAAE;QACP,IAAI,EAAE,CAAC,IAAA,2BAAU,GAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACzD,IAAI,EAAE,CAAC,+BAA+B,CAAC;KACxC;CACF,CAAC,CAAC"}
+{"version":3,"file":"add-pausable.js","sourceRoot":"","sources":["../src/add-pausable.ts"],"names":[],"mappings":";;AAMA,kCAiBC;AAvBD,qDAA8C;AAG9C,6DAA4D;AAC5D,+DAA2D;AAE3D,SAAgB,WAAW,CAAC,CAAkB,EAAE,MAAc;IAC5D,CAAC,CAAC,YAAY,CAAC,kBAAkB,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;IAClE,CAAC,CAAC,YAAY,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC;IAE/C,MAAM,aAAa,GAAG;QACpB,SAAS,EAAE,UAAU;QACrB,UAAU,EAAE,CAAC,CAAC,IAAI;QAClB,IAAI,EAAE,CAAC,cAAc,CAAC;QACtB,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,CAAC,CAAC,gBAAgB,CAAC,aAAa,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACpD,CAAC,CAAC,gBAAgB,CAAC,aAAa,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC,gBAAgB,CAAC,aAAa,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;IAErD,IAAA,yCAAoB,EAAC,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC1E,IAAA,yCAAoB,EAAC,CAAC,EAAE,aAAa,EAAE,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,SAAS,GAAG,IAAA,kCAAe,EAAC;IAChC,MAAM,EAAE;QACN,IAAI,EAAE,CAAC,IAAA,2BAAU,GAAE,CAAC;QACpB,OAAO,EAAE,MAAM;QACf,IAAI,EAAE,CAAC,qBAAqB,CAAC;KAC9B;IACD,KAAK,EAAE;QACL,IAAI,EAAE,CAAC,IAAA,2BAAU,GAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACzD,IAAI,EAAE,CAAC,6BAA6B,CAAC;KACtC;IACD,OAAO,EAAE;QACP,IAAI,EAAE,CAAC,IAAA,2BAAU,GAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QACzD,IAAI,EAAE,CAAC,+BAA+B,CAAC;KACxC;CACF,CAAC,CAAC"}

package/dist/add-upgradeable.d.ts

@@ -0,0 +1,4 @@
+import type { Access } from './set-access-control';
+import type { ContractBuilder } from './contract';
+export declare function addUpgradeable(c: ContractBuilder, access: Access): void;
+//# sourceMappingURL=add-upgradeable.d.ts.map

package/dist/add-upgradeable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-upgradeable.d.ts","sourceRoot":"","sources":["../src/add-upgradeable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGlD,wBAAgB,cAAc,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,QAuBhE"}

package/dist/add-upgradeable.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addUpgradeable = addUpgradeable;
+const common_options_1 = require("./common-options");
+const set_access_control_1 = require("./set-access-control");
+const define_functions_1 = require("./utils/define-functions");
+function addUpgradeable(c, access) {
+    const functions = (0, define_functions_1.defineFunctions)({
+        _require_auth: {
+            args: [(0, common_options_1.getSelfArg)(), { name: 'operator', type: '&Address' }],
+            code: ['operator.require_auth();'],
+        },
+    });
+    c.addUseClause('stellar_upgradeable', 'UpgradeableInternal');
+    c.addUseClause('stellar_upgradeable_macros', 'Upgradeable');
+    c.addDerives('Upgradeable');
+    const upgradeableTrait = {
+        traitName: 'UpgradeableInternal',
+        structName: c.name,
+        tags: [],
+        section: 'Utils',
+    };
+    c.addTraitFunction(upgradeableTrait, functions._require_auth);
+    (0, set_access_control_1.requireAccessControl)(c, upgradeableTrait, functions._require_auth, access, '*operator');
+}
+//# sourceMappingURL=add-upgradeable.js.map

package/dist/add-upgradeable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-upgradeable.js","sourceRoot":"","sources":["../src/add-upgradeable.ts"],"names":[],"mappings":";;AAMA,wCAuBC;AA7BD,qDAA8C;AAE9C,6DAA4D;AAE5D,+DAA2D;AAE3D,SAAgB,cAAc,CAAC,CAAkB,EAAE,MAAc;IAC/D,MAAM,SAAS,GAAG,IAAA,kCAAe,EAAC;QAChC,aAAa,EAAE;YACb,IAAI,EAAE,CAAC,IAAA,2BAAU,GAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;YAC5D,IAAI,EAAE,CAAC,0BAA0B,CAAC;SACnC;KACF,CAAC,CAAC;IAEH,CAAC,CAAC,YAAY,CAAC,qBAAqB,EAAE,qBAAqB,CAAC,CAAC;IAC7D,CAAC,CAAC,YAAY,CAAC,4BAA4B,EAAE,aAAa,CAAC,CAAC;IAE5D,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAE5B,MAAM,gBAAgB,GAAG;QACvB,SAAS,EAAE,qBAAqB;QAChC,UAAU,EAAE,CAAC,CAAC,IAAI;QAClB,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,OAAO;KACjB,CAAC;IAEF,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;IAE9D,IAAA,yCAAoB,EAAC,CAAC,EAAE,gBAAgB,EAAE,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;AAC1F,CAAC"}

package/dist/api.d.ts

@@ -1,5 +1,6 @@
 import type { CommonContractOptions } from './common-options';
 import type { FungibleOptions } from './fungible';
+import type { NonFungibleOptions } from './non-fungible';
 export interface WizardContractAPI<Options extends CommonContractOptions> {
     /**
      * Returns a string representation of a contract generated using the provided options. If opts is not provided, uses `defaults`.
@@ -18,5 +19,7 @@ export interface AccessControlAPI<Options extends CommonContractOptions> {
     isAccessControlRequired: (opts: Partial<Options>) => boolean;
 }
 export type Fungible = WizardContractAPI<FungibleOptions>;
+export type NonFungible = WizardContractAPI<NonFungibleOptions>;
 export declare const fungible: Fungible;
+export declare const nonFungible: NonFungible;
 //# sourceMappingURL=api.d.ts.map

package/dist/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGlD,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,qBAAqB;IACtE;;OAEG;IACH,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;IAElC;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB,CAAC,OAAO,SAAS,qBAAqB;IACrE;;;OAGG;IACH,uBAAuB,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC;CAC9D;AAED,MAAM,MAAM,QAAQ,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;AAE1D,eAAO,MAAM,QAAQ,EAAE,QAGtB,CAAC"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAIzD,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,qBAAqB;IACtE;;OAEG;IACH,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC;IAElC;;OAEG;IACH,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC7B;AAED,MAAM,WAAW,gBAAgB,CAAC,OAAO,SAAS,qBAAqB;IACrE;;;OAGG;IACH,uBAAuB,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC;CAC9D;AAED,MAAM,MAAM,QAAQ,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;AAC1D,MAAM,MAAM,WAAW,GAAG,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;AAEhE,eAAO,MAAM,QAAQ,EAAE,QAGtB,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,WAGzB,CAAC"}

package/dist/api.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fungible = void 0;
+exports.nonFungible = exports.fungible = void 0;
 const fungible_1 = require("./fungible");
+const non_fungible_1 = require("./non-fungible");
 exports.fungible = {
     print: fungible_1.printFungible,
     defaults: fungible_1.defaults,
 };
+exports.nonFungible = {
+    print: non_fungible_1.printNonFungible,
+    defaults: non_fungible_1.defaults,
+};
 //# sourceMappingURL=api.js.map

package/dist/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";;;AAEA,yCAAyE;AAwB5D,QAAA,QAAQ,GAAa;IAChC,KAAK,EAAE,wBAAa;IACpB,QAAQ,EAAE,mBAAgB;CAC3B,CAAC"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../src/api.ts"],"names":[],"mappings":";;;AAGA,yCAAyE;AACzE,iDAAmF;AAyBtE,QAAA,QAAQ,GAAa;IAChC,KAAK,EAAE,wBAAa;IACpB,QAAQ,EAAE,mBAAgB;CAC3B,CAAC;AAEW,QAAA,WAAW,GAAgB;IACtC,KAAK,EAAE,+BAAgB;IACvB,QAAQ,EAAE,uBAAmB;CAC9B,CAAC"}

package/dist/build-generic.d.ts

@@ -1,8 +1,12 @@
 import type { FungibleOptions } from './fungible';
+import type { NonFungibleOptions } from './non-fungible';
 export interface KindedOptions {
     Fungible: {
         kind: 'Fungible';
     } & FungibleOptions;
+    NonFungible: {
+        kind: 'NonFungible';
+    } & NonFungibleOptions;
 }
 export type GenericOptions = KindedOptions[keyof KindedOptions];
 export declare function buildGeneric(opts: GenericOptions): import("./contract").Contract;

package/dist/build-generic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build-generic.d.ts","sourceRoot":"","sources":["../src/build-generic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGlD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,GAAG,eAAe,CAAC;CAClD;AAED,MAAM,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,aAAa,CAAC,CAAC;AAEhE,wBAAgB,YAAY,CAAC,IAAI,EAAE,cAAc,iCAShD"}
+{"version":3,"file":"build-generic.d.ts","sourceRoot":"","sources":["../src/build-generic.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAGzD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE;QAAE,IAAI,EAAE,UAAU,CAAA;KAAE,GAAG,eAAe,CAAC;IACjD,WAAW,EAAE;QAAE,IAAI,EAAE,aAAa,CAAA;KAAE,GAAG,kBAAkB,CAAC;CAC3D;AAED,MAAM,MAAM,cAAc,GAAG,aAAa,CAAC,MAAM,aAAa,CAAC,CAAC;AAEhE,wBAAgB,YAAY,CAAC,IAAI,EAAE,cAAc,iCAahD"}

package/dist/build-generic.js

@@ -2,13 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildGeneric = buildGeneric;
 const fungible_1 = require("./fungible");
+const non_fungible_1 = require("./non-fungible");
 function buildGeneric(opts) {
     switch (opts.kind) {
         case 'Fungible':
             return (0, fungible_1.buildFungible)(opts);
+        case 'NonFungible':
+            return (0, non_fungible_1.buildNonFungible)(opts);
         default: {
-            const _ = opts.kind; // TODO: When there are additional kinds above, change this assignment to just `opts` instead of `opts.kind`
-            throw new Error('Unknown ERC');
+            const _ = opts;
+            throw new Error('Unknown kind');
         }
     }
 }

package/dist/build-generic.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-generic.js","sourceRoot":"","sources":["../src/build-generic.ts"],"names":[],"mappings":";;AASA,oCASC;AAjBD,yCAA2C;AAQ3C,SAAgB,YAAY,CAAC,IAAoB;IAC/C,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,UAAU;YACb,OAAO,IAAA,wBAAa,EAAC,IAAI,CAAC,CAAC;QAC7B,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,CAAC,GAAU,IAAI,CAAC,IAAI,CAAC,CAAC,4GAA4G;YACxI,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"build-generic.js","sourceRoot":"","sources":["../src/build-generic.ts"],"names":[],"mappings":";;AAYA,oCAaC;AAxBD,yCAA2C;AAE3C,iDAAkD;AASlD,SAAgB,YAAY,CAAC,IAAoB;IAC/C,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,UAAU;YACb,OAAO,IAAA,wBAAa,EAAC,IAAI,CAAC,CAAC;QAE7B,KAAK,aAAa;YAChB,OAAO,IAAA,+BAAgB,EAAC,IAAI,CAAC,CAAC;QAEhC,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,CAAC,GAAU,IAAI,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/contract.d.ts

@@ -4,10 +4,12 @@ export interface Contract {
     useClauses: UseClause[];
     constructorCode: string[];
     constructorArgs: Argument[];
-    implementedTraits: ImplementedTrait[];
+    implementedTraits: TraitImplBlock[];
+    freeFunctions: ContractFunction[];
     variables: Variable[];
     errors: Error[];
     ownable: boolean;
+    derives: string[];
 }
 export interface Error {
     name: string;
@@ -25,10 +27,11 @@ export interface UseClause {
     groupable?: boolean;
     alias?: string;
 }
-export interface BaseImplementedTrait {
-    name: string;
-    for: string;
+export interface BaseTraitImplBlock {
+    traitName: string;
+    structName: string;
     tags: string[];
+    assocType?: string;
     section?: string;
     /**
      * Priority for which trait to print first.
@@ -36,14 +39,14 @@ export interface BaseImplementedTrait {
      */
     priority?: number;
 }
-export interface ImplementedTrait extends BaseImplementedTrait {
+export interface TraitImplBlock extends BaseTraitImplBlock {
     functions: ContractFunction[];
-    section?: string;
 }
 export interface BaseFunction {
     name: string;
     args: Argument[];
     code: string[];
+    pub?: boolean;
     returns?: string;
 }
 export interface ContractFunction extends BaseFunction {
@@ -66,26 +69,34 @@ export declare class ContractBuilder implements Contract {
     readonly constructorArgs: Argument[];
     readonly constructorCode: string[];
     private implementedTraitsMap;
+    private freeFunctionsMap;
     private variablesMap;
     private useClausesMap;
     private errorsMap;
+    private derivesSet;
     constructor(name: string);
-    get implementedTraits(): ImplementedTrait[];
+    get implementedTraits(): TraitImplBlock[];
+    get freeFunctions(): ContractFunction[];
     get variables(): Variable[];
     get useClauses(): UseClause[];
     get errors(): Error[];
+    get derives(): string[];
     addError(name: string, num: number): boolean;
     addUseClause(containerPath: string, name: string, options?: {
         groupable?: boolean;
         alias?: string;
     }): void;
     addVariable(variable: Variable): boolean;
-    addImplementedTrait(baseTrait: BaseImplementedTrait): ImplementedTrait;
-    addFunction(baseTrait: BaseImplementedTrait, fn: BaseFunction): ContractFunction;
+    addTraitImplBlock(baseTrait: BaseTraitImplBlock): TraitImplBlock;
+    addFreeFunction(fn: BaseFunction): ContractFunction;
+    addTraitFunction(baseTrait: BaseTraitImplBlock, fn: BaseFunction): ContractFunction;
+    overrideAssocType(traitName: string, newAssocType: string): void;
     private getFunctionSignature;
-    addFunctionCodeBefore(baseTrait: BaseImplementedTrait, fn: BaseFunction, codeBefore: string[]): void;
-    addFunctionTag(baseTrait: BaseImplementedTrait, fn: BaseFunction, tag: string): void;
+    private getOrCreateFunction;
+    addFunctionCodeBefore(fn: BaseFunction, codeBefore: string[], baseTrait?: BaseTraitImplBlock): void;
+    addFunctionTag(fn: BaseFunction, tag: string, baseTrait?: BaseTraitImplBlock): void;
     addConstructorArgument(arg: Argument): void;
     addConstructorCode(code: string): void;
+    addDerives(derive: string): void;
 }
 //# sourceMappingURL=contract.d.ts.map

package/dist/contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"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"}

package/dist/contract.js

@@ -9,14 +9,19 @@ class ContractBuilder {
         this.constructorArgs = [];
         this.constructorCode = [];
         this.implementedTraitsMap = new Map();
+        this.freeFunctionsMap = new Map();
         this.variablesMap = new Map();
         this.useClausesMap = new Map();
         this.errorsMap = new Map();
+        this.derivesSet = new Set();
         this.name = (0, convert_strings_1.toIdentifier)(name, true);
     }
     get implementedTraits() {
         return [...this.implementedTraitsMap.values()];
     }
+    get freeFunctions() {
+        return [...this.freeFunctionsMap.values()];
+    }
     get variables() {
         return [...this.variablesMap.values()];
     }
@@ -26,6 +31,9 @@ class ContractBuilder {
     get errors() {
         return [...this.errorsMap.values()];
     }
+    get derives() {
+        return [...this.derivesSet];
+    }
     addError(name, num) {
         if (this.errorsMap.has(name)) {
             return false;
@@ -56,17 +64,18 @@ class ContractBuilder {
             return true;
         }
     }
-    addImplementedTrait(baseTrait) {
-        const key = baseTrait.name;
+    addTraitImplBlock(baseTrait) {
+        const key = baseTrait.traitName;
         const existingTrait = this.implementedTraitsMap.get(key);
         if (existingTrait !== undefined) {
             return existingTrait;
         }
         else {
             const t = {
-                name: baseTrait.name,
-                for: baseTrait.for,
+                traitName: baseTrait.traitName,
+                structName: baseTrait.structName,
                 tags: [...baseTrait.tags],
+                assocType: baseTrait.assocType,
                 functions: [],
                 section: baseTrait.section,
                 priority: baseTrait.priority,
@@ -75,8 +84,26 @@ class ContractBuilder {
             return t;
         }
     }
-    addFunction(baseTrait, fn) {
-        const t = this.addImplementedTrait(baseTrait);
+    // used for adding a function to the `impl Contract` block
+    addFreeFunction(fn) {
+        const signature = this.getFunctionSignature(fn);
+        const existingFn = this.freeFunctionsMap.get(signature);
+        if (existingFn !== undefined) {
+            return existingFn;
+        }
+        else {
+            const contractFn = {
+                ...fn,
+                pub: true,
+                codeBefore: [],
+            };
+            this.freeFunctionsMap.set(signature, contractFn);
+            return contractFn;
+        }
+    }
+    // used for adding a function to a trait implementation block
+    addTraitFunction(baseTrait, fn) {
+        const t = this.addTraitImplBlock(baseTrait);
         const signature = this.getFunctionSignature(fn);
         // Look for the existing function with the same signature and return it if found
         for (let i = 0; i < t.functions.length; i++) {
@@ -93,18 +120,34 @@ class ContractBuilder {
         t.functions.push(contractFn);
         return contractFn;
     }
+    overrideAssocType(traitName, newAssocType) {
+        const trait = this.implementedTraitsMap.get(traitName);
+        if (trait) {
+            trait.assocType = newAssocType;
+        }
+        else {
+            throw new Error(`Trait '${traitName}' does not exist and cannot be overridden.`);
+        }
+    }
     getFunctionSignature(fn) {
         return [fn.name, '(', ...fn.args.map(a => a.name), ')'].join('');
     }
-    addFunctionCodeBefore(baseTrait, fn, codeBefore) {
+    getOrCreateFunction(fn, baseTrait) {
+        if (baseTrait === undefined) {
+            return this.addFreeFunction(fn);
+        }
+        else {
+            this.addTraitImplBlock(baseTrait);
+            return this.addTraitFunction(baseTrait, fn);
+        }
+    }
+    addFunctionCodeBefore(fn, codeBefore, baseTrait) {
         var _a;
-        this.addImplementedTrait(baseTrait);
-        const existingFn = this.addFunction(baseTrait, fn);
+        const existingFn = this.getOrCreateFunction(fn, baseTrait);
         existingFn.codeBefore = [...((_a = existingFn.codeBefore) !== null && _a !== void 0 ? _a : []), ...codeBefore];
     }
-    addFunctionTag(baseTrait, fn, tag) {
-        this.addImplementedTrait(baseTrait);
-        const existingFn = this.addFunction(baseTrait, fn);
+    addFunctionTag(fn, tag, baseTrait) {
+        const existingFn = this.getOrCreateFunction(fn, baseTrait);
         existingFn.tag = tag;
     }
     addConstructorArgument(arg) {
@@ -118,6 +161,9 @@ class ContractBuilder {
     addConstructorCode(code) {
         this.constructorCode.push(code);
     }
+    addDerives(derive) {
+        this.derivesSet.add(derive);
+    }
 }
 exports.ContractBuilder = ContractBuilder;
 //# sourceMappingURL=contract.js.map

package/dist/contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../src/contract.ts"],"names":[],"mappings":"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"}

package/dist/fungible.d.ts

@@ -7,6 +7,7 @@ export interface FungibleOptions extends CommonContractOptions {
     symbol: string;
     burnable?: boolean;
     pausable?: boolean;
+    upgradeable?: boolean;
     premint?: string;
     mintable?: boolean;
 }

package/dist/fungible.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fungible.d.ts","sourceRoot":"","sources":["../src/fungible.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAM3C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAQ9D,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,eAAe,CASrC,CAAC;AAEX,wBAAgB,aAAa,CAAC,IAAI,GAAE,eAA0B,GAAG,MAAM,CAEtE;AAED,MAAM,WAAW,eAAgB,SAAQ,qBAAqB;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAaD,wBAAgB,aAAa,CAAC,IAAI,EAAE,eAAe,GAAG,QAAQ,CA2B7D;AA8DD,eAAO,MAAM,cAAc,QAAkB,CAAC;AAqB9C;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CA+B1E"}
+{"version":3,"file":"fungible.d.ts","sourceRoot":"","sources":["../src/fungible.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAO3C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAQ9D,eAAO,MAAM,QAAQ,EAAE,QAAQ,CAAC,eAAe,CAUrC,CAAC;AAEX,wBAAgB,aAAa,CAAC,IAAI,GAAE,eAA0B,GAAG,MAAM,CAEtE;AAED,MAAM,WAAW,eAAgB,SAAQ,qBAAqB;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAcD,wBAAgB,aAAa,CAAC,IAAI,EAAE,eAAe,GAAG,QAAQ,CA+B7D;AA8DD,eAAO,MAAM,cAAc,QAAkB,CAAC;AAqB9C;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CA+B1E"}

package/dist/fungible.js

@@ -7,6 +7,7 @@ exports.getInitialSupply = getInitialSupply;
 const contract_1 = require("./contract");
 const set_access_control_1 = require("./set-access-control");
 const add_pausable_1 = require("./add-pausable");
+const add_upgradeable_1 = require("./add-upgradeable");
 const define_functions_1 = require("./utils/define-functions");
 const common_options_1 = require("./common-options");
 const set_info_1 = require("./set-info");
@@ -19,6 +20,7 @@ exports.defaults = {
     symbol: 'MTK',
     burnable: false,
     pausable: false,
+    upgradeable: false,
     premint: '0',
     mintable: false,
     access: common_options_2.contractDefaults.access, // TODO: Determine whether Access Control options should be visible in the UI before they are implemented as modules
@@ -28,14 +30,15 @@ function printFungible(opts = exports.defaults) {
     return (0, print_1.printContract)(buildFungible(opts));
 }
 function withDefaults(opts) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     return {
         ...opts,
         ...(0, common_options_1.withCommonContractDefaults)(opts),
         burnable: (_a = opts.burnable) !== null && _a !== void 0 ? _a : exports.defaults.burnable,
         pausable: (_b = opts.pausable) !== null && _b !== void 0 ? _b : exports.defaults.pausable,
+        upgradeable: (_c = opts.upgradeable) !== null && _c !== void 0 ? _c : exports.defaults.upgradeable,
         premint: opts.premint || exports.defaults.premint,
-        mintable: (_c = opts.mintable) !== null && _c !== void 0 ? _c : exports.defaults.mintable,
+        mintable: (_d = opts.mintable) !== null && _d !== void 0 ? _d : exports.defaults.mintable,
     };
 }
 function buildFungible(opts) {
@@ -48,6 +51,9 @@ function buildFungible(opts) {
     if (allOpts.pausable) {
         (0, add_pausable_1.addPausable)(c, allOpts.access);
     }
+    if (allOpts.upgradeable) {
+        (0, add_upgradeable_1.addUpgradeable)(c, allOpts.access);
+    }
     if (allOpts.burnable) {
         addBurnable(c, allOpts.pausable);
     }
@@ -62,8 +68,8 @@ function addBase(c, name, symbol, pausable) {
     // Set metadata
     c.addConstructorCode(`fungible::metadata::set_metadata(e, 18, String::from_str(e, "${name}"), String::from_str(e, "${symbol}"));`);
     // Set token functions
-    c.addUseClause('openzeppelin_fungible_token', 'self', { alias: 'fungible' });
-    c.addUseClause('openzeppelin_fungible_token', 'FungibleToken');
+    c.addUseClause('stellar_fungible', 'self', { alias: 'fungible' });
+    c.addUseClause('stellar_fungible', 'FungibleToken');
     c.addUseClause('soroban_sdk', 'contract');
     c.addUseClause('soroban_sdk', 'contractimpl');
     c.addUseClause('soroban_sdk', 'Address');
@@ -71,40 +77,40 @@ function addBase(c, name, symbol, pausable) {
     c.addUseClause('soroban_sdk', 'Env');
     c.addUseClause('soroban_sdk', 'Symbol');
     const fungibleTokenTrait = {
-        name: 'FungibleToken',
-        for: c.name,
+        traitName: 'FungibleToken',
+        structName: c.name,
         tags: ['contractimpl'],
     };
-    c.addFunction(fungibleTokenTrait, functions.total_supply);
-    c.addFunction(fungibleTokenTrait, functions.balance);
-    c.addFunction(fungibleTokenTrait, functions.allowance);
-    c.addFunction(fungibleTokenTrait, functions.transfer);
-    c.addFunction(fungibleTokenTrait, functions.transfer_from);
-    c.addFunction(fungibleTokenTrait, functions.approve);
-    c.addFunction(fungibleTokenTrait, functions.decimals);
-    c.addFunction(fungibleTokenTrait, functions.name);
-    c.addFunction(fungibleTokenTrait, functions.symbol);
+    c.addTraitFunction(fungibleTokenTrait, functions.total_supply);
+    c.addTraitFunction(fungibleTokenTrait, functions.balance);
+    c.addTraitFunction(fungibleTokenTrait, functions.allowance);
+    c.addTraitFunction(fungibleTokenTrait, functions.transfer);
+    c.addTraitFunction(fungibleTokenTrait, functions.transfer_from);
+    c.addTraitFunction(fungibleTokenTrait, functions.approve);
+    c.addTraitFunction(fungibleTokenTrait, functions.decimals);
+    c.addTraitFunction(fungibleTokenTrait, functions.name);
+    c.addTraitFunction(fungibleTokenTrait, functions.symbol);
     if (pausable) {
-        c.addUseClause('openzeppelin_pausable_macros', 'when_not_paused');
-        c.addFunctionTag(fungibleTokenTrait, functions.transfer, 'when_not_paused');
-        c.addFunctionTag(fungibleTokenTrait, functions.transfer_from, 'when_not_paused');
+        c.addUseClause('stellar_pausable_macros', 'when_not_paused');
+        c.addFunctionTag(functions.transfer, 'when_not_paused', fungibleTokenTrait);
+        c.addFunctionTag(functions.transfer_from, 'when_not_paused', fungibleTokenTrait);
     }
 }
 function addBurnable(c, pausable) {
-    c.addUseClause('openzeppelin_fungible_token', 'burnable::FungibleBurnable');
+    c.addUseClause('stellar_fungible', 'burnable::FungibleBurnable');
     c.addUseClause('soroban_sdk', 'Address');
     const fungibleBurnableTrait = {
-        name: 'FungibleBurnable',
-        for: c.name,
+        traitName: 'FungibleBurnable',
+        structName: c.name,
         tags: ['contractimpl'],
         section: 'Extensions',
     };
-    c.addFunction(fungibleBurnableTrait, functions.burn);
-    c.addFunction(fungibleBurnableTrait, functions.burn_from);
+    c.addTraitFunction(fungibleBurnableTrait, functions.burn);
+    c.addTraitFunction(fungibleBurnableTrait, functions.burn_from);
     if (pausable) {
-        c.addUseClause('openzeppelin_pausable_macros', 'when_not_paused');
-        c.addFunctionTag(fungibleBurnableTrait, functions.burn, 'when_not_paused');
-        c.addFunctionTag(fungibleBurnableTrait, functions.burn_from, 'when_not_paused');
+        c.addUseClause('stellar_pausable_macros', 'when_not_paused');
+        c.addFunctionTag(functions.burn, 'when_not_paused', fungibleBurnableTrait);
+        c.addFunctionTag(functions.burn_from, 'when_not_paused', fungibleBurnableTrait);
     }
 }
 exports.premintPattern = /^(\d*\.?\d*)$/;
@@ -117,7 +123,7 @@ function addPremint(c, amount) {
         }
         // TODO: handle signed int?
         const premintAbsolute = (0, convert_strings_1.toUint)(getInitialSupply(amount, 18), 'premint', 'u128');
-        c.addUseClause('openzeppelin_fungible_token', 'mintable::FungibleMintable');
+        c.addUseClause('stellar_fungible', 'mintable::FungibleMintable');
         c.addUseClause('soroban_sdk', 'Address');
         c.addConstructorArgument({ name: 'recipient', type: 'Address' });
         c.addConstructorCode(`fungible::mintable::mint(e, &recipient, ${premintAbsolute});`);
@@ -168,17 +174,17 @@ function getInitialSupply(premint, decimals) {
     return result;
 }
 function addMintable(c, access, pausable) {
-    c.addUseClause('openzeppelin_fungible_token', 'mintable::FungibleMintable');
+    c.addUseClause('stellar_fungible', 'mintable::FungibleMintable');
     const fungibleMintableTrait = {
-        name: 'FungibleMintable',
-        for: c.name,
+        traitName: 'FungibleMintable',
+        structName: c.name,
         tags: ['contractimpl'],
         section: 'Extensions',
     };
-    c.addFunction(fungibleMintableTrait, functions.mint);
+    c.addTraitFunction(fungibleMintableTrait, functions.mint);
     (0, set_access_control_1.requireAccessControl)(c, fungibleMintableTrait, functions.mint, access);
     if (pausable) {
-        c.addFunctionTag(fungibleMintableTrait, functions.mint, 'when_not_paused');
+        c.addFunctionTag(functions.mint, 'when_not_paused', fungibleMintableTrait);
     }
 }
 const functions = (0, define_functions_1.defineFunctions)({