@openzeppelin/wizard-stellar 0.3.0 → 0.4.2

package/dist/zip-scaffold.js

@@ -1,129 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zipScaffold = zipScaffold;
-const jszip_1 = __importDefault(require("jszip"));
-const print_1 = require("./print");
-const version_1 = require("./utils/version");
-const zip_shared_1 = require("./zip-shared");
-function getAddressArgs(c) {
-    return c.constructorArgs
-        .filter(constructorArg => { var _a; return ((_a = constructorArg.type) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'address'; })
-        .map(constructorArg => constructorArg.name);
-}
-const setupSh = (c, opts, scaffoldContractName) => {
-    const environmentsFileUpdate = (setUpContract, setUpScaffoldContractName) => `
-# Update environments.toml: remove original contracts and insert wizard's contract
-setup_environment() {
-  local file="environments.toml"
-  local temp
-  temp="$(mktemp)"
-
-  local in_dev_contracts=0
-  local skip_entry=0
-  local contract_entry_inserted=0
-  insert_contract_entry() {
-    {
-      printf '%s\\n' "[development.contracts.${setUpScaffoldContractName}_contract]" \\
-        "client = true" "" \\
-        "# If your contract has a \\\`__constructor\\\`, specify your arguments to it here." \\
-        "# These are the same arguments you could pass after the \\\`--\\\` in a call to" \\
-        "# \\\`stellar contract deploy\\\`" \\
-        "# Only available in \\\`development\\\` and \\\`test\\\` environments" \\
-        ${setUpContract.constructorArgs.length
-        ? // Mind the spacing
-            `"# TODO add appropriate values for for the constructors arguments" \\
-        "constructor_args = \\"\\"\\"" \\
-        "${setUpContract.constructorArgs.map(constructorArg => { var _a; return `--${constructorArg.name} \\"ADD_${constructorArg.name.toLocaleUpperCase()}_${((_a = constructorArg.type) === null || _a === void 0 ? void 0 : _a.toLocaleUpperCase()) || 'ARGUMENT'}_HERE\\"`; }).join(' ')}" \\
-        "\\"\\"\\"" \\
-        ""`
-        : '""'}
-    } >> "$temp"
-  }
-
-  while IFS= read -r line; do
-    if [[ $contract_entry_inserted -eq 0 && $line == '[staging.network]' ]]; then
-      insert_contract_entry
-      contract_entry_inserted=1
-    fi
-
-    if [[ $line =~ ^\\[development\\.contracts\\]$ ]]; then
-      printf '%s\\n' "$line" >> "$temp"
-      in_dev_contracts=1
-      skip_entry=0
-      continue
-    fi
-
-    if [[ $line =~ ^\\[[^]]+\\]$ ]]; then
-      if (( in_dev_contracts )) && [[ $line =~ ^\\[development\\.contracts\\..+\\]$ ]]; then
-        skip_entry=1
-        in_dev_contracts=0
-        continue
-      fi
-      in_dev_contracts=0
-      skip_entry=0
-      printf '%s\\n' "$line" >> "$temp"
-      continue
-    fi
-
-    if (( skip_entry )); then
-      continue
-    fi
-
-    if (( in_dev_contracts )); then
-      if [[ $line =~ ^[[:space:]]*# ]]; then
-        printf '%s\\n' "$line" >> "$temp"
-      fi
-      continue
-    fi
-
-    printf '%s\\n' "$line" >> "$temp"
-  done < "$file"
-
-  mv "$temp" "$file"
-}
-`;
-    const updateWorkspaceCargo = `update_cargo() {
-  cp Cargo.toml Cargo.toml.bak
-
-  cat <<EOF > deps.tmp
-${(0, zip_shared_1.addDependenciesWith)(`{ git = "https://github.com/OpenZeppelin/stellar-contracts", tag = "${version_1.contractsVersionTag}" }`, zip_shared_1.allStellarDependencies)}${(0, zip_shared_1.addDependenciesWith)(`{ version = "${version_1.compatibleSorobanVersion}" }`, ['soroban'])}
-EOF
-
-  awk '
-    BEGIN {
-      inserted = 0
-      deps = ""
-      while ((getline line < "deps.tmp") > 0) {
-        deps = deps line "\\n"
-      }
-      close("deps.tmp")
-    }
-    /^\\[workspace.dependencies\\]/ {
-      in_deps = 1
-      print
-      if (!inserted) {
-        printf "%s", deps
-        inserted = 1
-      }
-      next
-    }
-    /^\\[/ { in_deps = 0 }
-    in_deps { next }
-    { print }
-  ' Cargo.toml.bak > Cargo.toml
-
-  rm deps.tmp
-  rm Cargo.toml.bak
-}`;
-    return `\
+exports.zipScaffoldProject = void 0;
+const zip_rust_1 = require("./zip-rust");
+const setupSh = `\
 #!/usr/bin/env bash
 #
 # setup.sh
-# 
-# This script is meant to set up a Scaffold project and insert the Wizard's contracts in the project
+#
+# This script is meant to set up a Scaffold project with the Wizard's contracts
 
 check_is_installed() {
   if ! which "$1" &> /dev/null; then
@@ -134,18 +18,7 @@ check_is_installed() {
 }
 
 scaffold() {
-  tmp_folder="tmp"
-  stellar scaffold init "$tmp_folder"
-
-  rm -rf "$tmp_folder/contracts"
-
-  local current_directory
-  current_directory="$(cd "$(dirname "\${BASH_SOURCE[0]}")" && pwd)"
-
-  shopt -s dotglob
-
-  cp -a "$current_directory/$tmp_folder"/. "$current_directory"/
-  rm -rf "$current_directory/$tmp_folder"
+  stellar-scaffold upgrade
 }
 
 init_git(){
@@ -154,10 +27,6 @@ init_git(){
   git commit -m "openzeppelin: add wizard output" --quiet
 }
 
-${environmentsFileUpdate(c, scaffoldContractName)}
-
-${updateWorkspaceCargo}
-
 build_contracts() {
   cargo build
 }
@@ -187,10 +56,6 @@ then
   echo "🏗️ Building Scaffold project"
 
   scaffold
-  
-  setup_environment
-
-  update_cargo
 
   build_contracts
 
@@ -203,13 +68,10 @@ else
   echo "✅ Scaffold project already initialized."
 fi
 `;
-};
-const readme = (c) => {
-    const hasTodosToResolve = (c) => getAddressArgs(c).length > 0;
-    return `\
+const wizardReadme = `\
 # Sample Scaffold Project
 
-This project demonstrates a basic Scaffold use case. It comes with a contract generated by [OpenZeppelin Wizard](https://wizard.openzeppelin.com/), a test for that contract, and a script that initiate a Stellar Scaffold project with this contract. [Scaffold Stellar](https://github.com/AhaLabs/scaffold-stellar?tab=readme-ov-file#scaffold-stellar) is a convention-over-configuration toolkit for blockchain and distributed application development on the Stellar network. It provides a seamless development experience through CLI tools, smart contract management, and deployment utilities.
+This project demonstrates a basic Scaffold use case. It comes with a contract generated by [OpenZeppelin Wizard](https://wizard.openzeppelin.com/), a test for that contract, and a script that initiates a Stellar Scaffold project with this contract. [Scaffold Stellar](https://github.com/AhaLabs/scaffold-stellar?tab=readme-ov-file#scaffold-stellar) is a convention-over-configuration toolkit for blockchain and distributed application development on the Stellar network. It provides a seamless development experience through CLI tools, smart contract management, and deployment utilities.
 
 ## Installing dependencies
 
@@ -224,7 +86,6 @@ This project demonstrates a basic Scaffold use case. It comes with a contract ge
 \`\`\`
 bash setup.sh
 \`\`\`
-${hasTodosToResolve(c) ? '\n## Resolve any TODOs \n\nSearch for any TODO comments in the project and resolve them (search for TODO with your code editor).\n' : ''}
 
 ## Testing the contract
 
@@ -244,16 +105,11 @@ stellar scaffold watch --build-clients
 npm run dev
 \`\`\`
 `;
-};
-async function zipScaffold(c, opts) {
-    const zip = new jszip_1.default();
-    const scaffoldContractName = (0, zip_shared_1.contractOptionsToContractName)((opts === null || opts === void 0 ? void 0 : opts.kind) || 'contract');
-    zip.file(`contracts/${scaffoldContractName}/src/contract.rs`, (0, print_1.removeCreateLevelAttributes)((0, print_1.printContract)(c)));
-    zip.file(`contracts/${scaffoldContractName}/src/test.rs`, (0, zip_shared_1.printRustNameTest)(c));
-    zip.file(`contracts/${scaffoldContractName}/src/lib.rs`, zip_shared_1.createRustLibFile);
-    zip.file(`contracts/${scaffoldContractName}/Cargo.toml`, (0, zip_shared_1.printContractCargo)(scaffoldContractName));
-    zip.file('setup.sh', setupSh(c, opts, scaffoldContractName));
-    zip.file('README-WIZARD.md', readme(c));
+const addScaffoldProjectFiles = (zip) => {
+    zip.file('README-WIZARD.md', wizardReadme);
+    zip.file('setup.sh', setupSh);
     return zip;
-}
+};
+const zipScaffoldProject = async (c, opts) => addScaffoldProjectFiles((0, zip_rust_1.createRustZipEnvironment)(c, opts));
+exports.zipScaffoldProject = zipScaffoldProject;
 //# sourceMappingURL=zip-scaffold.js.map

package/dist/zip-scaffold.js.map

@@ -1 +1 @@
-{"version":3,"file":"zip-scaffold.js","sourceRoot":"","sources":["../src/zip-scaffold.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"zip-scaffold.js","sourceRoot":"","sources":["../src/zip-scaffold.ts"],"names":[],"mappings":";;;AAGA,yCAAsD;AAEtD,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiEf,CAAC;AAEF,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoCpB,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAAC,GAAU,EAAE,EAAE;IAC7C,GAAG,CAAC,IAAI,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;IAC3C,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAE9B,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEK,MAAM,kBAAkB,GAAG,KAAK,EAAE,CAAW,EAAE,IAAoB,EAAE,EAAE,CAC5E,uBAAuB,CAAC,IAAA,mCAAwB,EAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AADhD,QAAA,kBAAkB,sBAC8B"}

package/dist/zip-shared.d.ts

@@ -3,24 +3,11 @@ declare function pascalToSnakeCase(string: string): string;
 export declare const contractOptionsToContractName: typeof pascalToSnakeCase;
 export declare function getAddressArgs(c: Pick<Contract, 'constructorArgs'>): string[];
 export declare const printRustNameTest: (c: Pick<Contract, "constructorArgs" | "name">) => string;
-export declare const stellarDependencies: {
-    readonly base: readonly ["stellar-default-impl-macro"];
-    readonly fungible: readonly ["stellar-fungible"];
-    readonly nonFungible: readonly ["stellar-non-fungible"];
-    readonly pausable: readonly ["stellar-pausable", "stellar-pausable-macros"];
-    readonly upgradable: readonly ["stellar-upgradeable", "stellar-upgradeable-macros"];
-};
-export declare const allStellarDependencies: ("pausable" | "base" | "fungible" | "nonFungible" | "upgradable")[];
-export declare const allDependencies: {
-    readonly soroban: readonly ["soroban-sdk"];
-    readonly base: readonly ["stellar-default-impl-macro"];
-    readonly fungible: readonly ["stellar-fungible"];
-    readonly nonFungible: readonly ["stellar-non-fungible"];
-    readonly pausable: readonly ["stellar-pausable", "stellar-pausable-macros"];
-    readonly upgradable: readonly ["stellar-upgradeable", "stellar-upgradeable-macros"];
-};
-export declare const addDependenciesWith: (dependencyValue: string, dependenciesToAdd: (keyof typeof allDependencies)[]) => string;
+export declare const libDependencies: readonly ["stellar-tokens", "stellar-access", "stellar-contract-utils", "stellar-macros"];
+export declare const allDependencies: readonly ["stellar-tokens", "stellar-access", "stellar-contract-utils", "stellar-macros", "soroban-sdk"];
+export declare const addDependenciesWith: (dependencyValue: string, dependenciesToAdd: string[]) => string;
 export declare const printContractCargo: (scaffoldContractName: string) => string;
 export declare const createRustLibFile = "#![no_std]\n#![allow(dead_code)]\n\nmod contract;\nmod test;\n";
+export declare const workspaceCargo: string;
 export {};
 //# sourceMappingURL=zip-shared.d.ts.map

package/dist/zip-shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zip-shared.d.ts","sourceRoot":"","sources":["../src/zip-shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAE3C,iBAAS,iBAAiB,CAAC,MAAM,EAAE,MAAM,UAKxC;AAED,eAAO,MAAM,6BAA6B,0BAAoB,CAAC;AAE/D,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GAAG,MAAM,EAAE,CAI7E;AAED,eAAO,MAAM,iBAAiB,MAAO,IAAI,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,CAAC,WAqB9E,CAAC;AAKF,eAAO,MAAM,mBAAmB;;;;;;CAMtB,CAAC;AAEX,eAAO,MAAM,sBAAsB,qEAAiC,CAAC;AAErE,eAAO,MAAM,eAAe;;;;;;;CAGlB,CAAC;AAEX,eAAO,MAAM,mBAAmB,oBAAqB,MAAM,qBAAqB,CAAC,MAAM,OAAO,eAAe,CAAC,EAAE,WAGxG,CAAC;AAET,eAAO,MAAM,kBAAkB,yBAA0B,MAAM,WAcuB,CAAC;AAEvF,eAAO,MAAM,iBAAiB,mEAK7B,CAAC"}
+{"version":3,"file":"zip-shared.d.ts","sourceRoot":"","sources":["../src/zip-shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAG3C,iBAAS,iBAAiB,CAAC,MAAM,EAAE,MAAM,UAKxC;AAED,eAAO,MAAM,6BAA6B,0BAAoB,CAAC;AAE/D,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,GAAG,MAAM,EAAE,CAI7E;AAED,eAAO,MAAM,iBAAiB,MAAO,IAAI,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,CAAC,WAqB9E,CAAC;AAEF,eAAO,MAAM,eAAe,2FAKlB,CAAC;AAEX,eAAO,MAAM,eAAe,0GAA+C,CAAC;AAE5E,eAAO,MAAM,mBAAmB,oBAAqB,MAAM,qBAAqB,MAAM,EAAE,WACG,CAAC;AAE5F,eAAO,MAAM,kBAAkB,yBAA0B,MAAM,WAc2B,CAAC;AAE3F,eAAO,MAAM,iBAAiB,mEAK7B,CAAC;AAEF,eAAO,MAAM,cAAc,QAY1B,CAAC"}

package/dist/zip-shared.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRustLibFile = exports.printContractCargo = exports.addDependenciesWith = exports.allDependencies = exports.allStellarDependencies = exports.stellarDependencies = exports.printRustNameTest = exports.contractOptionsToContractName = void 0;
+exports.workspaceCargo = exports.createRustLibFile = exports.printContractCargo = exports.addDependenciesWith = exports.allDependencies = exports.libDependencies = exports.printRustNameTest = exports.contractOptionsToContractName = void 0;
 exports.getAddressArgs = getAddressArgs;
+const version_1 = require("./utils/version");
 function pascalToSnakeCase(string) {
     return string
         .replace(/([A-Z])/g, '_$1')
@@ -37,22 +38,14 @@ fn initial_state() {
 // Add more tests bellow
 `;
 exports.printRustNameTest = printRustNameTest;
-const getKeysOf = (objectToGetKeysOf) => Object.keys(objectToGetKeysOf);
-exports.stellarDependencies = {
-    base: ['stellar-default-impl-macro'],
-    fungible: ['stellar-fungible'],
-    nonFungible: ['stellar-non-fungible'],
-    pausable: ['stellar-pausable', 'stellar-pausable-macros'],
-    upgradable: ['stellar-upgradeable', 'stellar-upgradeable-macros'],
-};
-exports.allStellarDependencies = getKeysOf(exports.stellarDependencies);
-exports.allDependencies = {
-    ...exports.stellarDependencies,
-    soroban: ['soroban-sdk'],
-};
-const addDependenciesWith = (dependencyValue, dependenciesToAdd) => dependenciesToAdd.reduce((addedDependency, dependencyName) => {
-    return `${addedDependency}${exports.allDependencies[dependencyName].map(cargoDependencies => `${cargoDependencies} = ${dependencyValue}\n`).join('')}`;
-}, '');
+exports.libDependencies = [
+    'stellar-tokens',
+    'stellar-access',
+    'stellar-contract-utils',
+    'stellar-macros',
+];
+exports.allDependencies = [...exports.libDependencies, 'soroban-sdk'];
+const addDependenciesWith = (dependencyValue, dependenciesToAdd) => `${dependenciesToAdd.map(dependency => `${dependency} = ${dependencyValue}\n`).join('')}`;
 exports.addDependenciesWith = addDependenciesWith;
 const printContractCargo = (scaffoldContractName) => `[package]
 name = "${scaffoldContractName.replace(/_/, '-')}-contract"
@@ -66,9 +59,9 @@ crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]
-${(0, exports.addDependenciesWith)('{ workspace = true }', [...exports.allStellarDependencies, 'soroban'])}
+${(0, exports.addDependenciesWith)('{ workspace = true }', [...exports.allDependencies])}
 [dev-dependencies]
-${(0, exports.addDependenciesWith)('{ workspace = true, features = ["testutils"] }', ['soroban'])}`;
+${(0, exports.addDependenciesWith)('{ workspace = true, features = ["testutils"] }', ['soroban-sdk'])}`;
 exports.printContractCargo = printContractCargo;
 exports.createRustLibFile = `#![no_std]
 #![allow(dead_code)]
@@ -76,4 +69,17 @@ exports.createRustLibFile = `#![no_std]
 mod contract;
 mod test;
 `;
+exports.workspaceCargo = `[workspace]
+resolver = "2"
+members = ["contracts/*"]
+
+[workspace.package]
+authors = []
+edition = "2021"
+license = "Apache-2.0"
+version = "0.0.1"
+
+[workspace.dependencies]
+${(0, exports.addDependenciesWith)(`"${version_1.compatibleSorobanVersion}"`, ['soroban-sdk'])}${(0, exports.addDependenciesWith)(`"=${version_1.contractsVersion}"`, [...exports.libDependencies])}
+`;
 //# sourceMappingURL=zip-shared.js.map

package/dist/zip-shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"zip-shared.js","sourceRoot":"","sources":["../src/zip-shared.ts"],"names":[],"mappings":";;;AAWA,wCAIC;AAbD,SAAS,iBAAiB,CAAC,MAAc;IACvC,OAAO,MAAM;SACV,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;SAC1B,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;SACjB,WAAW,EAAE,CAAC;AACnB,CAAC;AAEY,QAAA,6BAA6B,GAAG,iBAAiB,CAAC;AAE/D,SAAgB,cAAc,CAAC,CAAoC;IACjE,OAAO,CAAC,CAAC,CAAC,eAAe,IAAI,EAAE,CAAC;SAC7B,MAAM,CAAC,cAAc,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,cAAc,CAAC,IAAI,0CAAE,IAAI,EAAE,MAAK,SAAS,CAAA,EAAA,CAAC;SACnE,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;AAChD,CAAC;AAEM,MAAM,iBAAiB,GAAG,CAAC,CAA6C,EAAE,EAAE,CAAC;;;;qBAI/D,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,EAAE;;yBAEhE,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;;;;;;uCAMH,CAAC,CAAC,IAAI,MAAM,cAAc,CAAC,CAAC,CAAC;KAC7D,GAAG,CAAC,GAAG,EAAE,CAAC,yBAAyB,CAAC;KACpC,IAAI,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;mBACzC,CAAC,CAAC,IAAI;;wDAE+B,CAAC,CAAC,IAAI;;;;CAI7D,CAAC;AArBW,QAAA,iBAAiB,qBAqB5B;AAEF,MAAM,SAAS,GAAG,CAA0C,iBAA0B,EAAE,EAAE,CACxF,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAsB,CAAC;AAEzC,QAAA,mBAAmB,GAAG;IACjC,IAAI,EAAE,CAAC,4BAA4B,CAAC;IACpC,QAAQ,EAAE,CAAC,kBAAkB,CAAC;IAC9B,WAAW,EAAE,CAAC,sBAAsB,CAAC;IACrC,QAAQ,EAAE,CAAC,kBAAkB,EAAE,yBAAyB,CAAC;IACzD,UAAU,EAAE,CAAC,qBAAqB,EAAE,4BAA4B,CAAC;CACzD,CAAC;AAEE,QAAA,sBAAsB,GAAG,SAAS,CAAC,2BAAmB,CAAC,CAAC;AAExD,QAAA,eAAe,GAAG;IAC7B,GAAG,2BAAmB;IACtB,OAAO,EAAE,CAAC,aAAa,CAAC;CAChB,CAAC;AAEJ,MAAM,mBAAmB,GAAG,CAAC,eAAuB,EAAE,iBAAmD,EAAE,EAAE,CAClH,iBAAiB,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,cAAc,EAAE,EAAE;IAC3D,OAAO,GAAG,eAAe,GAAG,uBAAe,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,iBAAiB,MAAM,eAAe,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;AACjJ,CAAC,EAAE,EAAE,CAAC,CAAC;AAHI,QAAA,mBAAmB,uBAGvB;AAEF,MAAM,kBAAkB,GAAG,CAAC,oBAA4B,EAAE,EAAE,CAAC;UAC1D,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC;;;;;;;;;;;EAW9C,IAAA,2BAAmB,EAAC,sBAAsB,EAAE,CAAC,GAAG,8BAAsB,EAAE,SAAS,CAAC,CAAC;;EAEnF,IAAA,2BAAmB,EAAC,gDAAgD,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;AAd1E,QAAA,kBAAkB,sBAcwD;AAE1E,QAAA,iBAAiB,GAAG;;;;;CAKhC,CAAC"}
+{"version":3,"file":"zip-shared.js","sourceRoot":"","sources":["../src/zip-shared.ts"],"names":[],"mappings":";;;AAYA,wCAIC;AAfD,6CAA6E;AAE7E,SAAS,iBAAiB,CAAC,MAAc;IACvC,OAAO,MAAM;SACV,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;SAC1B,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;SACjB,WAAW,EAAE,CAAC;AACnB,CAAC;AAEY,QAAA,6BAA6B,GAAG,iBAAiB,CAAC;AAE/D,SAAgB,cAAc,CAAC,CAAoC;IACjE,OAAO,CAAC,CAAC,CAAC,eAAe,IAAI,EAAE,CAAC;SAC7B,MAAM,CAAC,cAAc,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,cAAc,CAAC,IAAI,0CAAE,IAAI,EAAE,MAAK,SAAS,CAAA,EAAA,CAAC;SACnE,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;AAChD,CAAC;AAEM,MAAM,iBAAiB,GAAG,CAAC,CAA6C,EAAE,EAAE,CAAC;;;;qBAI/D,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,EAAE;;yBAEhE,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI;;;;;;uCAMH,CAAC,CAAC,IAAI,MAAM,cAAc,CAAC,CAAC,CAAC;KAC7D,GAAG,CAAC,GAAG,EAAE,CAAC,yBAAyB,CAAC;KACpC,IAAI,CAAC,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;mBACzC,CAAC,CAAC,IAAI;;wDAE+B,CAAC,CAAC,IAAI;;;;CAI7D,CAAC;AArBW,QAAA,iBAAiB,qBAqB5B;AAEW,QAAA,eAAe,GAAG;IAC7B,gBAAgB;IAChB,gBAAgB;IAChB,wBAAwB;IACxB,gBAAgB;CACR,CAAC;AAEE,QAAA,eAAe,GAAG,CAAC,GAAG,uBAAe,EAAE,aAAa,CAAU,CAAC;AAErE,MAAM,mBAAmB,GAAG,CAAC,eAAuB,EAAE,iBAA2B,EAAE,EAAE,CAC1F,GAAG,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,UAAU,MAAM,eAAe,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;AAD/E,QAAA,mBAAmB,uBAC4D;AAErF,MAAM,kBAAkB,GAAG,CAAC,oBAA4B,EAAE,EAAE,CAAC;UAC1D,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC;;;;;;;;;;;EAW9C,IAAA,2BAAmB,EAAC,sBAAsB,EAAE,CAAC,GAAG,uBAAe,CAAC,CAAC;;EAEjE,IAAA,2BAAmB,EAAC,gDAAgD,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;AAd9E,QAAA,kBAAkB,sBAc4D;AAE9E,QAAA,iBAAiB,GAAG;;;;;CAKhC,CAAC;AAEW,QAAA,cAAc,GAAG;;;;;;;;;;;EAW5B,IAAA,2BAAmB,EAAC,IAAI,kCAAwB,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,GAAG,IAAA,2BAAmB,EAAC,KAAK,0BAAgB,GAAG,EAAE,CAAC,GAAG,uBAAe,CAAC,CAAC;CAC5I,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-stellar",
-  "version": "0.3.0",
+  "version": "0.4.2",
   "description": "A boilerplate generator to get started with OpenZeppelin Stellar Soroban Contracts",
   "license": "AGPL-3.0-only",
   "repository": "https://github.com/OpenZeppelin/contracts-wizard",

package/src/add-pausable.ts

@@ -1,13 +1,13 @@
 import { getSelfArg } from './common-options';
-import type { ContractBuilder } from './contract';
+import type { BaseFunction, ContractBuilder } from './contract';
 import type { Access } from './set-access-control';
 import { requireAccessControl } from './set-access-control';
 import { defineFunctions } from './utils/define-functions';
 
 export function addPausable(c: ContractBuilder, access: Access) {
-  c.addUseClause('stellar_pausable', 'self', { alias: 'pausable' });
-  c.addUseClause('stellar_pausable', 'Pausable');
-  c.addUseClause('stellar_default_impl_macro', 'default_impl');
+  c.addUseClause('stellar_contract_utils::pausable', 'self', { alias: 'pausable' });
+  c.addUseClause('stellar_contract_utils::pausable', 'Pausable');
+  c.addUseClause('stellar_macros', 'default_impl');
 
   const pausableTrait = {
     traitName: 'Pausable',
@@ -16,12 +16,19 @@ export function addPausable(c: ContractBuilder, access: Access) {
     section: 'Utils',
   };
 
+  const pauseFn: BaseFunction = access === 'ownable' ? functions.pause_unused_caller : functions.pause;
+  const unpauseFn: BaseFunction = access === 'ownable' ? functions.unpause_unused_caller : functions.unpause;
+
   c.addTraitFunction(pausableTrait, functions.paused);
-  c.addTraitFunction(pausableTrait, functions.pause);
-  c.addTraitFunction(pausableTrait, functions.unpause);
+  c.addTraitFunction(pausableTrait, pauseFn);
+  c.addTraitFunction(pausableTrait, unpauseFn);
+  requireAccessControl(c, pausableTrait, pauseFn, access, {
+    useMacro: true,
+    role: 'pauser',
+    caller: 'caller',
+  });
 
-  requireAccessControl(c, pausableTrait, functions.pause, access, { useMacro: true, role: 'pauser', caller: 'caller' });
-  requireAccessControl(c, pausableTrait, functions.unpause, access, {
+  requireAccessControl(c, pausableTrait, unpauseFn, access, {
     useMacro: true,
     role: 'pauser',
     caller: 'caller',
@@ -38,8 +45,18 @@ const functions = defineFunctions({
     args: [getSelfArg(), { name: 'caller', type: 'Address' }],
     code: ['pausable::pause(e)'],
   },
+  pause_unused_caller: {
+    name: 'pause',
+    args: [getSelfArg(), { name: '_caller', type: 'Address' }],
+    code: ['pausable::pause(e)'],
+  },
   unpause: {
     args: [getSelfArg(), { name: 'caller', type: 'Address' }],
     code: ['pausable::unpause(e)'],
   },
+  unpause_unused_caller: {
+    name: 'unpause',
+    args: [getSelfArg(), { name: '_caller', type: 'Address' }],
+    code: ['pausable::unpause(e)'],
+  },
 });

package/src/add-upgradeable.ts

@@ -1,19 +1,24 @@
 import { getSelfArg } from './common-options';
 import type { Access } from './set-access-control';
 import { requireAccessControl } from './set-access-control';
-import type { ContractBuilder } from './contract';
+import type { BaseFunction, ContractBuilder } from './contract';
 import { defineFunctions } from './utils/define-functions';
 
 export function addUpgradeable(c: ContractBuilder, access: Access) {
   const functions = defineFunctions({
     _require_auth: {
       args: [getSelfArg(), { name: 'operator', type: '&Address' }],
+      code: ['operator.require_auth();'],
+    },
+    _require_auth_unused_operator: {
+      name: '_require_auth',
+      args: [getSelfArg(), { name: '_operator', type: '&Address' }],
       code: [],
     },
   });
 
-  c.addUseClause('stellar_upgradeable', 'UpgradeableInternal');
-  c.addUseClause('stellar_upgradeable_macros', 'Upgradeable');
+  c.addUseClause('stellar_contract_utils::upgradeable', 'UpgradeableInternal');
+  c.addUseClause('stellar_macros', 'Upgradeable');
 
   c.addDerives('Upgradeable');
 
@@ -24,9 +29,12 @@ export function addUpgradeable(c: ContractBuilder, access: Access) {
     section: 'Utils',
   };
 
-  c.addTraitFunction(upgradeableTrait, functions._require_auth);
+  const upgradeFn: BaseFunction =
+    access === 'ownable' ? functions._require_auth_unused_operator : functions._require_auth;
+
+  c.addTraitFunction(upgradeableTrait, upgradeFn);
 
-  requireAccessControl(c, upgradeableTrait, functions._require_auth, access, {
+  requireAccessControl(c, upgradeableTrait, upgradeFn, access, {
     useMacro: false,
     role: 'upgrader',
     caller: 'operator',

package/src/fungible.ts

@@ -92,12 +92,11 @@ function addBase(c: ContractBuilder, name: string, symbol: string, pausable: boo
   c.addConstructorCode(`Base::set_metadata(e, 18, String::from_str(e, "${name}"), String::from_str(e, "${symbol}"));`);
 
   // Set token functions
-  c.addUseClause('stellar_fungible', 'Base');
-  c.addUseClause('stellar_fungible', 'FungibleToken');
-  c.addUseClause('stellar_default_impl_macro', 'default_impl');
+  c.addUseClause('stellar_tokens::fungible', 'Base');
+  c.addUseClause('stellar_tokens::fungible', 'FungibleToken');
+  c.addUseClause('stellar_macros', 'default_impl');
   c.addUseClause('soroban_sdk', 'contract');
   c.addUseClause('soroban_sdk', 'contractimpl');
-  c.addUseClause('soroban_sdk', 'Address');
   c.addUseClause('soroban_sdk', 'String');
   c.addUseClause('soroban_sdk', 'Env');
 
@@ -111,7 +110,8 @@ function addBase(c: ContractBuilder, name: string, symbol: string, pausable: boo
   c.addTraitImplBlock(fungibleTokenTrait);
 
   if (pausable) {
-    c.addUseClause('stellar_pausable_macros', 'when_not_paused');
+    c.addUseClause('soroban_sdk', 'Address');
+    c.addUseClause('stellar_macros', 'when_not_paused');
 
     c.addTraitFunction(fungibleTokenTrait, functions.transfer);
     c.addFunctionTag(functions.transfer, 'when_not_paused', fungibleTokenTrait);
@@ -122,6 +122,7 @@ function addBase(c: ContractBuilder, name: string, symbol: string, pausable: boo
 }
 
 function addMintable(c: ContractBuilder, access: Access, pausable: boolean) {
+  c.addUseClause('soroban_sdk', 'Address');
   switch (access) {
     case false:
       break;
@@ -157,7 +158,7 @@ function addMintable(c: ContractBuilder, access: Access, pausable: boolean) {
 }
 
 function addBurnable(c: ContractBuilder, pausable: boolean) {
-  c.addUseClause('stellar_fungible', 'burnable::FungibleBurnable');
+  c.addUseClause('stellar_tokens::fungible', 'burnable::FungibleBurnable');
   c.addUseClause('soroban_sdk', 'Address');
 
   const fungibleBurnableTrait = {
@@ -168,7 +169,7 @@ function addBurnable(c: ContractBuilder, pausable: boolean) {
   };
 
   if (pausable) {
-    c.addUseClause('stellar_pausable_macros', 'when_not_paused');
+    c.addUseClause('stellar_macros', 'when_not_paused');
 
     c.addTraitFunction(fungibleBurnableTrait, functions.burn);
     c.addFunctionTag(functions.burn, 'when_not_paused', fungibleBurnableTrait);

package/src/non-fungible.ts

@@ -127,12 +127,11 @@ function addBase(c: ContractBuilder, name: string, symbol: string, pausable: boo
   c.addConstructorCode(`Base::set_metadata(e, uri, name, symbol);`);
 
   // Set token functions
-  c.addUseClause('stellar_non_fungible', 'Base');
-  c.addUseClause('stellar_non_fungible', 'NonFungibleToken');
-  c.addUseClause('stellar_default_impl_macro', 'default_impl');
+  c.addUseClause('stellar_tokens::non_fungible', 'Base');
+  c.addUseClause('stellar_tokens::non_fungible', 'NonFungibleToken');
+  c.addUseClause('stellar_macros', 'default_impl');
   c.addUseClause('soroban_sdk', 'contract');
   c.addUseClause('soroban_sdk', 'contractimpl');
-  c.addUseClause('soroban_sdk', 'Address');
   c.addUseClause('soroban_sdk', 'String');
   c.addUseClause('soroban_sdk', 'Env');
 
@@ -146,7 +145,7 @@ function addBase(c: ContractBuilder, name: string, symbol: string, pausable: boo
   c.addTraitImplBlock(nonFungibleTokenTrait);
 
   if (pausable) {
-    c.addUseClause('stellar_pausable_macros', 'when_not_paused');
+    c.addUseClause('stellar_macros', 'when_not_paused');
 
     c.addTraitFunction(nonFungibleTokenTrait, baseFunctions.transfer);
     c.addFunctionTag(baseFunctions.transfer, 'when_not_paused', nonFungibleTokenTrait);
@@ -157,8 +156,7 @@ function addBase(c: ContractBuilder, name: string, symbol: string, pausable: boo
 }
 
 function addBurnable(c: ContractBuilder, pausable: boolean) {
-  c.addUseClause('stellar_non_fungible', 'burnable::NonFungibleBurnable');
-  c.addUseClause('soroban_sdk', 'Address');
+  c.addUseClause('stellar_tokens::non_fungible', 'burnable::NonFungibleBurnable');
 
   const nonFungibleBurnableTrait = {
     traitName: 'NonFungibleBurnable',
@@ -168,7 +166,7 @@ function addBurnable(c: ContractBuilder, pausable: boolean) {
   };
 
   if (pausable) {
-    c.addUseClause('stellar_pausable_macros', 'when_not_paused');
+    c.addUseClause('stellar_macros', 'when_not_paused');
 
     c.addTraitFunction(nonFungibleBurnableTrait, burnableFunctions.burn);
     c.addFunctionTag(burnableFunctions.burn, 'when_not_paused', nonFungibleBurnableTrait);
@@ -183,8 +181,8 @@ function addBurnable(c: ContractBuilder, pausable: boolean) {
 }
 
 function addEnumerable(c: ContractBuilder) {
-  c.addUseClause('stellar_non_fungible', 'enumerable::{NonFungibleEnumerable, Enumerable}');
-  c.addUseClause('stellar_default_impl_macro', 'default_impl');
+  c.addUseClause('stellar_tokens::non_fungible', 'enumerable::{NonFungibleEnumerable, Enumerable}');
+  c.addUseClause('stellar_macros', 'default_impl');
 
   const nonFungibleEnumerableTrait = {
     traitName: 'NonFungibleEnumerable',
@@ -198,7 +196,8 @@ function addEnumerable(c: ContractBuilder) {
 }
 
 function addConsecutive(c: ContractBuilder, pausable: boolean, access: Access) {
-  c.addUseClause('stellar_non_fungible', 'consecutive::{NonFungibleConsecutive, Consecutive}');
+  c.addUseClause('stellar_tokens::non_fungible', 'consecutive::{NonFungibleConsecutive, Consecutive}');
+  c.addUseClause('soroban_sdk', 'Address');
 
   const nonFungibleConsecutiveTrait = {
     traitName: 'NonFungibleConsecutive',
@@ -225,6 +224,7 @@ function addConsecutive(c: ContractBuilder, pausable: boolean, access: Access) {
 }
 
 function addMintable(c: ContractBuilder, enumerable: boolean, pausable: boolean, sequential: boolean, access: Access) {
+  c.addUseClause('soroban_sdk', 'Address');
   const accessProps = { useMacro: true, role: 'minter', caller: 'caller' };
 
   let mintFn;

package/src/set-access-control.ts

@@ -21,8 +21,8 @@ export function setAccessControl(c: ContractBuilder, access: Access): void {
       if (!c.ownable) {
         c.ownable = true;
         c.addUseClause('soroban_sdk', 'Address');
-        c.addUseClause('stellar_ownable', 'self', { alias: 'ownable' });
-        c.addUseClause('stellar_ownable', 'Ownable');
+        c.addUseClause('stellar_access::ownable', 'self', { alias: 'ownable' });
+        c.addUseClause('stellar_access::ownable', 'Ownable');
 
         const ownableTrait = {
           traitName: 'Ownable',
@@ -39,8 +39,8 @@ export function setAccessControl(c: ContractBuilder, access: Access): void {
     }
     case 'roles': {
       c.addUseClause('soroban_sdk', 'Address');
-      c.addUseClause('stellar_access_control', 'self', { alias: 'access_control' });
-      c.addUseClause('stellar_access_control', 'AccessControl');
+      c.addUseClause('stellar_access::access_control', 'self', { alias: 'access_control' });
+      c.addUseClause('stellar_access::access_control', 'AccessControl');
 
       const accessControltrait = {
         traitName: 'AccessControl',
@@ -78,7 +78,7 @@ export function requireAccessControl(
 
   switch (access) {
     case 'ownable': {
-      c.addUseClause('stellar_ownable_macro', 'only_owner');
+      c.addUseClause('stellar_macros', 'only_owner');
 
       if (accessProps.useMacro) {
         c.addFunctionTag(fn, 'only_owner', trait);
@@ -97,7 +97,7 @@ export function requireAccessControl(
         c.addConstructorCode(`access_control::grant_role_no_auth(e, &admin, &${role}, &Symbol::new(e, "${role}"));`);
 
         if (useMacro) {
-          c.addUseClause('stellar_access_control_macros', 'only_role');
+          c.addUseClause('stellar_macros', 'only_role');
           c.addFunctionTag(fn, `only_role(${caller}, "${role}")`, trait);
         } else {
           c.addFunctionCodeBefore(
@@ -108,7 +108,7 @@ export function requireAccessControl(
         }
       } else {
         if (useMacro) {
-          c.addUseClause('stellar_access_control_macros', 'only_admin');
+          c.addUseClause('stellar_macros', 'only_admin');
           c.addFunctionTag(fn, 'only_admin', trait);
         } else {
           c.addFunctionCodeBefore(fn, ['access_control::enforce_admin_auth(e);'], trait);

package/src/stablecoin.ts

@@ -65,10 +65,10 @@ function addLimitations(c: ContractBuilder, access: Access, mode: 'allowlist' |
   };
 
   if (type) {
-    c.addUseClause('stellar_fungible', 'allowlist::{AllowList, FungibleAllowList}');
+    c.addUseClause('stellar_tokens::fungible', 'allowlist::{AllowList, FungibleAllowList}');
     c.overrideAssocType('FungibleToken', 'type ContractType = AllowList;');
   } else {
-    c.addUseClause('stellar_fungible', 'blocklist::{BlockList, FungibleBlockList}');
+    c.addUseClause('stellar_tokens::fungible', 'blocklist::{BlockList, FungibleBlockList}');
     c.overrideAssocType('FungibleToken', 'type ContractType = BlockList;');
   }