@openzeppelin/wizard-stellar 0.4.5 → 0.6.0

package/dist/utils/compile-test.js

@@ -3,12 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runRustCompilationTest = exports.withTemporaryFolderDo = exports.runCargoTest = void 0;
+exports.withTemporaryFolderDo = exports.runCargoTest = void 0;
+exports.runRustCompilationTest = runRustCompilationTest;
 const child_process_1 = require("child_process");
 const promises_1 = require("fs/promises");
 const os_1 = require("os");
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
+const common_options_1 = require("../common-options");
 const zip_rust_1 = require("../zip-rust");
 const zip_shared_1 = require("../zip-shared");
 const zip_test_1 = require("./zip-test");
@@ -18,6 +20,46 @@ const runCargoTest = async (t, temporaryFolder) => {
     t.regex(result.stdout, /0 failed/);
 };
 exports.runCargoTest = runCargoTest;
+const resolvePath = (inputPath) => inputPath.startsWith('~/') ? path_1.default.join((0, os_1.homedir)(), inputPath.slice(2)) : path_1.default.resolve(inputPath);
+const toCargoPath = (inputPath) => inputPath.replace(/\\/g, '/');
+const localDependencies = [
+    ['stellar-tokens', 'packages/tokens'],
+    ['stellar-access', 'packages/access'],
+    ['stellar-contract-utils', 'packages/contract-utils'],
+    ['stellar-governance', 'packages/governance'],
+    ['stellar-macros', 'packages/macros'],
+];
+const workspaceDependenciesPattern = /\[workspace\.dependencies\][\s\S]*?(?=\n\[profile\.release\])/;
+async function rewriteWorkspaceCargoForLocalContracts(workspaceCargoPath, stellarContractsPath) {
+    const absoluteContractsPath = resolvePath(stellarContractsPath);
+    const upstreamCargoPath = path_1.default.join(absoluteContractsPath, 'Cargo.toml');
+    const upstreamLockPath = path_1.default.join(absoluteContractsPath, 'Cargo.lock');
+    const workspaceDir = path_1.default.dirname(workspaceCargoPath);
+    const [workspaceCargo, upstreamCargo] = await Promise.all([
+        (0, promises_1.readFile)(workspaceCargoPath, 'utf8'),
+        (0, promises_1.readFile)(upstreamCargoPath, 'utf8'),
+    ]);
+    const sorobanMatch = upstreamCargo.match(/^\s*soroban-sdk\s*=\s*"([^"]+)"/m);
+    if (sorobanMatch === null || sorobanMatch[1] === undefined) {
+        throw new Error(`Unable to find soroban-sdk version in ${upstreamCargoPath}`);
+    }
+    const dependencyLines = [
+        `soroban-sdk = "${sorobanMatch[1]}"`,
+        ...localDependencies.map(([crate, relativePath]) => `${crate} = { path = "${toCargoPath(path_1.default.join(absoluteContractsPath, relativePath))}" }`),
+    ];
+    if (!workspaceDependenciesPattern.test(workspaceCargo)) {
+        throw new Error(`Unable to locate [workspace.dependencies] section in ${workspaceCargoPath}`);
+    }
+    const nextCargo = workspaceCargo.replace(workspaceDependenciesPattern, `[workspace.dependencies]\n${dependencyLines.join('\n')}\n`);
+    await (0, promises_1.writeFile)(workspaceCargoPath, nextCargo);
+    // Reuse upstream lockfile when available to minimize resolver drift/offline cache misses.
+    try {
+        await (0, promises_1.copyFile)(upstreamLockPath, path_1.default.join(workspaceDir, 'Cargo.lock'));
+    }
+    catch {
+        // Ignore if lockfile is unavailable.
+    }
+}
 const withTemporaryFolderDo = (testFunction) => (...testFunctionArguments) => async (test) => {
     const temporaryFolder = await (0, promises_1.mkdtemp)(path_1.default.join((0, os_1.tmpdir)(), `compilation-test-${crypto.randomUUID()}`));
     try {
@@ -44,13 +86,19 @@ const doRunRustCompilationTest = async (makeContract, opts, testOptions, test, f
     const zip = await (0, zip_rust_1.zipRustProject)(makeContract(opts), opts);
     (0, zip_test_1.assertLayout)(test, zip, (0, zip_test_1.expandPathsFromFilesPaths)(expectedZipFiles));
     await (0, zip_test_1.extractPackage)(zip, folderPath);
+    if (process.env.STELLAR_CONTRACTS_PATH !== undefined) {
+        // Useful for release-candidate validation before crates.io publication.
+        await rewriteWorkspaceCargoForLocalContracts(path_1.default.join(folderPath, 'Cargo.toml'), process.env.STELLAR_CONTRACTS_PATH);
+    }
     await (0, exports.runCargoTest)(test, folderPath);
     if (testOptions.snapshotResult)
         await (0, zip_test_1.snapshotZipContents)(test, zip, expectedZipFiles);
 };
-exports.runRustCompilationTest = (0, exports.withTemporaryFolderDo)(async (makeContract, opts, testOptions, test, folderPath) => {
+const _runRustCompilationTest = (0, exports.withTemporaryFolderDo)(async (makeContract, opts, testOptions, test, folderPath) => {
     await doRunRustCompilationTest(makeContract, opts, testOptions, test, `${folderPath}/default`);
-    const shouldBeExcludedOrHasAlreadyRun = testOptions.excludeExplicitTraitTest || opts.explicitImplementations;
+    const mergedOpts = (0, common_options_1.withCommonContractDefaults)(opts);
+    const supportsExplicitImplementations = 'explicitImplementations' in mergedOpts;
+    const shouldBeExcludedOrHasAlreadyRun = testOptions.excludeExplicitTraitTest || !supportsExplicitImplementations || mergedOpts.explicitImplementations;
     if (shouldBeExcludedOrHasAlreadyRun)
         return;
     try {
@@ -60,4 +108,7 @@ exports.runRustCompilationTest = (0, exports.withTemporaryFolderDo)(async (makeC
         throw new Error(`EXPLICIT IMPLEMENTATION ERROR: ${error}`);
     }
 });
+function runRustCompilationTest(makeContract, opts, testOptions) {
+    return _runRustCompilationTest(makeContract, opts, testOptions);
+}
 //# sourceMappingURL=compile-test.js.map

package/dist/utils/compile-test.js.map

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

package/dist/utils/version.d.ts

@@ -1,14 +1,14 @@
 /**
  * The actual latest version to use in links.
  */
-export declare const contractsVersion = "0.4.1";
-export declare const contractsVersionTag = "v0.4.1";
+export declare const contractsVersion = "0.7.1";
+export declare const contractsVersionTag = "v0.7.1";
 /**
  * Semantic version string representing of the minimum compatible version of Contracts to display in output.
  */
-export declare const compatibleContractsSemver = "^0.4.1";
+export declare const compatibleContractsSemver = "^0.7.1";
 /**
  * The Soroban version for which compilation and testing have passing tests
  */
-export declare const compatibleSorobanVersion = "22.0.8";
+export declare const compatibleSorobanVersion = "25.3.0";
 //# sourceMappingURL=version.d.ts.map

package/dist/utils/version.js

@@ -4,14 +4,14 @@ exports.compatibleSorobanVersion = exports.compatibleContractsSemver = exports.c
 /**
  * The actual latest version to use in links.
  */
-exports.contractsVersion = '0.4.1';
+exports.contractsVersion = '0.7.1';
 exports.contractsVersionTag = `v${exports.contractsVersion}`;
 /**
  * Semantic version string representing of the minimum compatible version of Contracts to display in output.
  */
-exports.compatibleContractsSemver = '^0.4.1';
+exports.compatibleContractsSemver = '^0.7.1';
 /**
  * The Soroban version for which compilation and testing have passing tests
  */
-exports.compatibleSorobanVersion = '22.0.8';
+exports.compatibleSorobanVersion = '25.3.0';
 //# sourceMappingURL=version.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"zip-rust.d.ts","sourceRoot":"","sources":["../src/zip-rust.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AA6B3C,eAAO,MAAM,wBAAwB,GAAI,GAAG,QAAQ,EAAE,MAAM,cAAc,UAazE,CAAC;AAIF,eAAO,MAAM,cAAc,GAAU,GAAG,QAAQ,EAAE,MAAM,cAAc,mBACb,CAAC"}
+{"version":3,"file":"zip-rust.d.ts","sourceRoot":"","sources":["../src/zip-rust.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AA8B3C,eAAO,MAAM,wBAAwB,GAAI,GAAG,QAAQ,EAAE,MAAM,cAAc,UAczE,CAAC;AAIF,eAAO,MAAM,cAAc,GAAU,GAAG,QAAQ,EAAE,MAAM,cAAc,mBACb,CAAC"}

package/dist/zip-rust.js

@@ -27,11 +27,12 @@ target/
 const createRustZipEnvironment = (c, opts) => {
     const zip = new jszip_1.default();
     const contractName = (0, zip_shared_1.contractOptionsToContractName)(opts?.kind || 'contract');
+    const requiredLibDeps = (0, zip_shared_1.getRequiredLibDependencies)(c);
     zip.file(`contracts/${contractName}/src/contract.rs`, (0, print_1.removeCreateLevelAttributes)((0, print_1.printContract)(c)));
     zip.file(`contracts/${contractName}/src/test.rs`, (0, zip_shared_1.printRustNameTest)(c));
     zip.file(`contracts/${contractName}/src/lib.rs`, zip_shared_1.createRustLibFile);
-    zip.file(`contracts/${contractName}/Cargo.toml`, (0, zip_shared_1.printContractCargo)(contractName));
-    zip.file('Cargo.toml', zip_shared_1.workspaceCargo);
+    zip.file(`contracts/${contractName}/Cargo.toml`, (0, zip_shared_1.printContractCargo)(contractName, requiredLibDeps));
+    zip.file('Cargo.toml', (0, zip_shared_1.workspaceCargo)(requiredLibDeps));
     zip.file('.gitignore', gitIgnore);
     return zip;
 };

package/dist/zip-rust.js.map

@@ -1 +1 @@
-{"version":3,"file":"zip-rust.js","sourceRoot":"","sources":["../src/zip-rust.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAG1B,mCAAqE;AACrE,6CAMsB;AAEtB,MAAM,MAAM,GAAG;;;;;;;;;;;;;CAad,CAAC;AAEF,MAAM,SAAS,GAAG;;CAEjB,CAAC;AAEK,MAAM,wBAAwB,GAAG,CAAC,CAAW,EAAE,IAAoB,EAAE,EAAE;IAC5E,MAAM,GAAG,GAAG,IAAI,eAAK,EAAE,CAAC;IAExB,MAAM,YAAY,GAAG,IAAA,0CAA6B,EAAC,IAAI,EAAE,IAAI,IAAI,UAAU,CAAC,CAAC;IAE7E,GAAG,CAAC,IAAI,CAAC,aAAa,YAAY,kBAAkB,EAAE,IAAA,mCAA2B,EAAC,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrG,GAAG,CAAC,IAAI,CAAC,aAAa,YAAY,cAAc,EAAE,IAAA,8BAAiB,EAAC,CAAC,CAAC,CAAC,CAAC;IACxE,GAAG,CAAC,IAAI,CAAC,aAAa,YAAY,aAAa,EAAE,8BAAiB,CAAC,CAAC;IACpE,GAAG,CAAC,IAAI,CAAC,aAAa,YAAY,aAAa,EAAE,IAAA,+BAAkB,EAAC,YAAY,CAAC,CAAC,CAAC;IACnF,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,2BAAc,CAAC,CAAC;IACvC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAElC,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAbW,QAAA,wBAAwB,4BAanC;AAEF,MAAM,oBAAoB,GAAG,CAAC,GAAU,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AAEpE,MAAM,cAAc,GAAG,KAAK,EAAE,CAAW,EAAE,IAAoB,EAAE,EAAE,CACxE,oBAAoB,CAAC,IAAA,gCAAwB,EAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AAD7C,QAAA,cAAc,kBAC+B"}
+{"version":3,"file":"zip-rust.js","sourceRoot":"","sources":["../src/zip-rust.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAG1B,mCAAqE;AACrE,6CAOsB;AAEtB,MAAM,MAAM,GAAG;;;;;;;;;;;;;CAad,CAAC;AAEF,MAAM,SAAS,GAAG;;CAEjB,CAAC;AAEK,MAAM,wBAAwB,GAAG,CAAC,CAAW,EAAE,IAAoB,EAAE,EAAE;IAC5E,MAAM,GAAG,GAAG,IAAI,eAAK,EAAE,CAAC;IAExB,MAAM,YAAY,GAAG,IAAA,0CAA6B,EAAC,IAAI,EAAE,IAAI,IAAI,UAAU,CAAC,CAAC;IAC7E,MAAM,eAAe,GAAG,IAAA,uCAA0B,EAAC,CAAC,CAAC,CAAC;IAEtD,GAAG,CAAC,IAAI,CAAC,aAAa,YAAY,kBAAkB,EAAE,IAAA,mCAA2B,EAAC,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrG,GAAG,CAAC,IAAI,CAAC,aAAa,YAAY,cAAc,EAAE,IAAA,8BAAiB,EAAC,CAAC,CAAC,CAAC,CAAC;IACxE,GAAG,CAAC,IAAI,CAAC,aAAa,YAAY,aAAa,EAAE,8BAAiB,CAAC,CAAC;IACpE,GAAG,CAAC,IAAI,CAAC,aAAa,YAAY,aAAa,EAAE,IAAA,+BAAkB,EAAC,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC;IACpG,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,IAAA,2BAAc,EAAC,eAAe,CAAC,CAAC,CAAC;IACxD,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAElC,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAdW,QAAA,wBAAwB,4BAcnC;AAEF,MAAM,oBAAoB,GAAG,CAAC,GAAU,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;AAEpE,MAAM,cAAc,GAAG,KAAK,EAAE,CAAW,EAAE,IAAoB,EAAE,EAAE,CACxE,oBAAoB,CAAC,IAAA,gCAAwB,EAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;AAD7C,QAAA,cAAc,kBAC+B"}

package/dist/zip-shared.d.ts

@@ -3,11 +3,10 @@ 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 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 function getRequiredLibDependencies(c: Pick<Contract, 'useClauses'>): string[];
 export declare const addDependenciesWith: (dependencyValue: string, dependenciesToAdd: string[]) => string;
-export declare const printContractCargo: (scaffoldContractName: string) => string;
+export declare const printContractCargo: (scaffoldContractName: string, requiredLibDeps: readonly string[]) => string;
 export declare const createRustLibFile = "#![no_std]\n#![allow(dead_code)]\n\nmod contract;\nmod test;\n";
-export declare const workspaceCargo: string;
+export declare const workspaceCargo: (requiredLibDeps: readonly string[]) => 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;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,GAAI,GAAG,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,GAAI,iBAAiB,MAAM,EAAE,mBAAmB,MAAM,EAAE,WACG,CAAC;AAE5F,eAAO,MAAM,kBAAkB,GAAI,sBAAsB,MAAM,WAiB2B,CAAC;AAE3F,eAAO,MAAM,iBAAiB,mEAK7B,CAAC;AAEF,eAAO,MAAM,cAAc,QA0B1B,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,GAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,CAAC,WAqB9E,CAAC;AAiBF,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG,MAAM,EAAE,CAGpF;AAED,eAAO,MAAM,mBAAmB,GAAI,iBAAiB,MAAM,EAAE,mBAAmB,MAAM,EAAE,WACG,CAAC;AAE5F,eAAO,MAAM,kBAAkB,GAAI,sBAAsB,MAAM,EAAE,iBAAiB,SAAS,MAAM,EAAE,WAiBT,CAAC;AAE3F,eAAO,MAAM,iBAAiB,mEAK7B,CAAC;AAEF,eAAO,MAAM,cAAc,GAAI,iBAAiB,SAAS,MAAM,EAAE,WA0BhE,CAAC"}

package/dist/zip-shared.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.workspaceCargo = exports.createRustLibFile = exports.printContractCargo = exports.addDependenciesWith = exports.allDependencies = exports.libDependencies = exports.printRustNameTest = exports.contractOptionsToContractName = void 0;
+exports.workspaceCargo = exports.createRustLibFile = exports.printContractCargo = exports.addDependenciesWith = exports.printRustNameTest = exports.contractOptionsToContractName = void 0;
 exports.getAddressArgs = getAddressArgs;
+exports.getRequiredLibDependencies = getRequiredLibDependencies;
 const version_1 = require("./utils/version");
 function pascalToSnakeCase(string) {
     return string
@@ -38,16 +39,27 @@ fn initial_state() {
 // Add more tests bellow
 `;
 exports.printRustNameTest = printRustNameTest;
-exports.libDependencies = [
+const libDependencies = [
     'stellar-tokens',
     'stellar-access',
     'stellar-contract-utils',
+    'stellar-governance',
     'stellar-macros',
 ];
-exports.allDependencies = [...exports.libDependencies, 'soroban-sdk'];
+// Derives required lib crate dependencies from the contract's use clauses.
+// Each use clause has a containerPath like "stellar_tokens::fungible::Base".
+// We extract the first segment (the crate name), convert underscores to hyphens
+// to match Cargo naming (e.g., stellar_tokens -> stellar-tokens), then filter
+// libDependencies to include only crates the contract actually references.
+// Filtering against the known list preserves stable ordering and ignores
+// non-lib crates like soroban_sdk (which is always added separately).
+function getRequiredLibDependencies(c) {
+    const usedCrates = new Set(c.useClauses.map(uc => uc.containerPath.split('::')[0].replace(/_/g, '-')));
+    return libDependencies.filter(dep => usedCrates.has(dep));
+}
 const addDependenciesWith = (dependencyValue, dependenciesToAdd) => `${dependenciesToAdd.map(dependency => `${dependency} = ${dependencyValue}\n`).join('')}`;
 exports.addDependenciesWith = addDependenciesWith;
-const printContractCargo = (scaffoldContractName) => `[package]
+const printContractCargo = (scaffoldContractName, requiredLibDeps) => `[package]
 name = "${scaffoldContractName.replace(/_/, '-')}-contract"
 edition.workspace = true
 license.workspace = true
@@ -62,7 +74,7 @@ crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]
-${(0, exports.addDependenciesWith)('{ workspace = true }', [...exports.allDependencies])}
+${(0, exports.addDependenciesWith)('{ workspace = true }', [...requiredLibDeps, 'soroban-sdk'])}
 [dev-dependencies]
 ${(0, exports.addDependenciesWith)('{ workspace = true, features = ["testutils"] }', ['soroban-sdk'])}`;
 exports.printContractCargo = printContractCargo;
@@ -72,7 +84,7 @@ exports.createRustLibFile = `#![no_std]
 mod contract;
 mod test;
 `;
-exports.workspaceCargo = `[workspace]
+const workspaceCargo = (requiredLibDeps) => `[workspace]
 resolver = "2"
 members = ["contracts/*"]
 
@@ -83,7 +95,7 @@ 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])}
+${(0, exports.addDependenciesWith)(`"${version_1.compatibleSorobanVersion}"`, ['soroban-sdk'])}${(0, exports.addDependenciesWith)(`"=${version_1.contractsVersion}"`, [...requiredLibDeps])}
 
 [profile.release]
 opt-level = "z"
@@ -99,4 +111,5 @@ lto = true
 inherits = "release"
 debug-assertions = true
 `;
+exports.workspaceCargo = workspaceCargo;
 //# 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":";;;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,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,SAAS,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;;;;;;;;;;;;;;EAc9C,IAAA,2BAAmB,EAAC,sBAAsB,EAAE,CAAC,GAAG,uBAAe,CAAC,CAAC;;EAEjE,IAAA,2BAAmB,EAAC,gDAAgD,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;AAjB9E,QAAA,kBAAkB,sBAiB4D;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;;;;;;;;;;;;;;;CAe5I,CAAC"}
+{"version":3,"file":"zip-shared.js","sourceRoot":"","sources":["../src/zip-shared.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openzeppelin/wizard-stellar",
-  "version": "0.4.5",
+  "version": "0.6.0",
   "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

@@ -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',

package/src/add-upgradeable.ts

@@ -6,31 +6,30 @@ import { defineFunctions } from './utils/define-functions';
 
 export function addUpgradeable(c: ContractBuilder, access: Access, explicitImplementations: boolean) {
   const functions = defineFunctions({
-    _require_auth: {
-      args: [getSelfArg(), { name: 'operator', type: '&Address' }],
-      code: ['operator.require_auth();'],
+    upgrade: {
+      args: [getSelfArg(), { name: 'new_wasm_hash', type: 'BytesN<32>' }, { name: 'operator', type: 'Address' }],
+      code: ['upgradeable::upgrade(e, &new_wasm_hash)'],
     },
-    _require_auth_unused_operator: {
-      name: '_require_auth',
-      args: [getSelfArg(), { name: '_operator', type: '&Address' }],
-      code: [],
+    upgrade_unused_operator: {
+      name: 'upgrade',
+      args: [getSelfArg(), { name: 'new_wasm_hash', type: 'BytesN<32>' }, { name: '_operator', type: 'Address' }],
+      code: ['upgradeable::upgrade(e, &new_wasm_hash)'],
     },
   });
 
-  c.addUseClause('stellar_contract_utils::upgradeable', 'UpgradeableInternal');
-  c.addUseClause('stellar_macros', 'Upgradeable');
-
-  c.addDerives('Upgradeable');
+  c.addUseClause('soroban_sdk', 'Address');
+  c.addUseClause('soroban_sdk', 'BytesN');
+  c.addUseClause('stellar_contract_utils::upgradeable', 'self', { alias: 'upgradeable' });
+  c.addUseClause('stellar_contract_utils::upgradeable', 'Upgradeable');
 
   const upgradeableTrait = {
-    traitName: 'UpgradeableInternal',
+    traitName: 'Upgradeable',
     structName: c.name,
-    tags: [],
+    tags: ['contractimpl'],
     section: 'Utils',
   };
 
-  const upgradeFn: BaseFunction =
-    access === 'ownable' ? functions._require_auth_unused_operator : functions._require_auth;
+  const upgradeFn: BaseFunction = access === 'ownable' ? functions.upgrade_unused_operator : functions.upgrade;
 
   c.addTraitFunction(upgradeableTrait, upgradeFn);
 
@@ -40,7 +39,7 @@ export function addUpgradeable(c: ContractBuilder, access: Access, explicitImple
     upgradeFn,
     access,
     {
-      useMacro: false,
+      useMacro: true,
       role: 'upgrader',
       caller: 'operator',
     },

package/src/api.ts

@@ -1,5 +1,6 @@
-import type { CommonContractOptions } from './common-options';
+import type { CommonContractOptions, CommonOptions } from './common-options';
 import type { FungibleOptions } from './fungible';
+import type { GovernorOptions } from './governor';
 import type { NonFungibleOptions } from './non-fungible';
 import type { StablecoinOptions } from './stablecoin';
 import {
@@ -12,13 +13,18 @@ import {
   defaults as fungibledefaults,
   isAccessControlRequired as fungibleIsAccessControlRequired,
 } from './fungible';
+import {
+  printGovernor,
+  defaults as governorDefaults,
+  isAccessControlRequired as governorIsAccessControlRequired,
+} from './governor';
 import {
   printNonFungible,
   defaults as nonFungibledefaults,
   isAccessControlRequired as nonFungibleIsAccessControlRequired,
 } from './non-fungible';
 
-export interface WizardContractAPI<Options extends CommonContractOptions> {
+export interface WizardContractAPI<Options extends CommonOptions> {
   /**
    * Returns a string representation of a contract generated using the provided options. If opts is not provided, uses `defaults`.
    */
@@ -39,6 +45,7 @@ export interface AccessControlAPI<Options extends CommonContractOptions> {
 }
 
 export type Fungible = WizardContractAPI<FungibleOptions> & AccessControlAPI<FungibleOptions>;
+export type Governor = WizardContractAPI<GovernorOptions> & AccessControlAPI<GovernorOptions>;
 export type NonFungible = WizardContractAPI<NonFungibleOptions> & AccessControlAPI<NonFungibleOptions>;
 export type Stablecoin = WizardContractAPI<StablecoinOptions> & AccessControlAPI<StablecoinOptions>;
 
@@ -48,6 +55,12 @@ export const fungible: Fungible = {
   isAccessControlRequired: fungibleIsAccessControlRequired,
 };
 
+export const governor: Governor = {
+  print: printGovernor,
+  defaults: governorDefaults,
+  isAccessControlRequired: governorIsAccessControlRequired,
+};
+
 export const nonFungible: NonFungible = {
   print: printNonFungible,
   defaults: nonFungibledefaults,

package/src/build-generic.ts

@@ -1,5 +1,7 @@
 import type { FungibleOptions } from './fungible';
 import { buildFungible } from './fungible';
+import type { GovernorOptions } from './governor';
+import { buildGovernor } from './governor';
 import type { NonFungibleOptions } from './non-fungible';
 import { buildNonFungible } from './non-fungible';
 import type { StablecoinOptions } from './stablecoin';
@@ -7,6 +9,7 @@ import { buildStablecoin } from './stablecoin';
 
 export interface KindedOptions {
   Fungible: { kind: 'Fungible' } & FungibleOptions;
+  Governor: { kind: 'Governor' } & GovernorOptions;
   NonFungible: { kind: 'NonFungible' } & NonFungibleOptions;
   Stablecoin: { kind: 'Stablecoin' } & StablecoinOptions;
 }
@@ -18,6 +21,9 @@ export function buildGeneric(opts: GenericOptions) {
     case 'Fungible':
       return buildFungible(opts);
 
+    case 'Governor':
+      return buildGovernor(opts);
+
     case 'NonFungible':
       return buildNonFungible(opts);
 

package/src/contract.ts

@@ -10,6 +10,7 @@ export interface Contract {
   constructorArgs: Argument[];
   implementedTraits: TraitImplBlock[];
   freeFunctions: ContractFunction[];
+  topLevelDeclarations: string[][];
   variables: Variable[];
   errors: Error[];
   ownable: boolean;
@@ -81,6 +82,7 @@ export class ContractBuilder implements Contract {
 
   readonly constructorArgs: Argument[] = [];
   readonly constructorCode: string[] = [];
+  readonly topLevelDeclarations: string[][] = [];
 
   private implementedTraitsMap: Map<string, TraitImplBlock> = new Map();
   private freeFunctionsMap: Map<string, ContractFunction> = new Map();
@@ -250,6 +252,10 @@ export class ContractBuilder implements Contract {
     existingFn.code = [...code];
   }
 
+  addTopLevelDeclaration(lines: string[]): void {
+    this.topLevelDeclarations.push(lines);
+  }
+
   addConstructorArgument(arg: Argument): void {
     for (const existingArg of this.constructorArgs) {
       if (existingArg.name == arg.name) {