@openzeppelin/wizard-stellar 0.4.4 → 0.5.0

package/src/utils/compile-test.ts

@@ -1,14 +1,14 @@
-import { tmpdir } from 'os';
 import type { ExecutionContext } from 'ava';
+import { exec } from 'child_process';
+import { mkdir, mkdtemp, rm } from 'fs/promises';
+import { tmpdir } from 'os';
 import path from 'path';
 import { promisify } from 'util';
-import { exec } from 'child_process';
 import type { GenericOptions } from '../build-generic';
 import type { Contract } from '../contract';
-import { assertLayout, snapshotZipContents, expandPathsFromFilesPaths, extractPackage } from './zip-test';
-import { mkdtemp, rm } from 'fs/promises';
-import { contractOptionsToContractName } from '../zip-shared';
 import { zipRustProject } from '../zip-rust';
+import { contractOptionsToContractName } from '../zip-shared';
+import { assertLayout, expandPathsFromFilesPaths, extractPackage, snapshotZipContents } from './zip-test';
 
 const asyncExec = promisify(exec);
 
@@ -29,7 +29,6 @@ export const withTemporaryFolderDo =
   (...testFunctionArguments: Args) =>
   async (test: ExecutionContext) => {
     const temporaryFolder = await mkdtemp(path.join(tmpdir(), `compilation-test-${crypto.randomUUID()}`));
-
     try {
       await testFunction(...testFunctionArguments, test, temporaryFolder);
     } finally {
@@ -37,33 +36,61 @@ export const withTemporaryFolderDo =
     }
   };
 
+const doRunRustCompilationTest = async (
+  makeContract: MakeContract,
+  opts: GenericOptions,
+  testOptions: { snapshotResult: boolean },
+  test: ExecutionContext,
+  folderPath: string,
+) => {
+  test.timeout(3_000_000);
+
+  await mkdir(folderPath, { recursive: true });
+
+  const scaffoldContractName = contractOptionsToContractName(opts?.kind || 'contract');
+
+  const expectedZipFiles = [
+    `contracts/${scaffoldContractName}/src/contract.rs`,
+    `contracts/${scaffoldContractName}/src/test.rs`,
+    `contracts/${scaffoldContractName}/src/lib.rs`,
+    `contracts/${scaffoldContractName}/Cargo.toml`,
+    'Cargo.toml',
+    '.gitignore',
+    'README.md',
+  ];
+
+  const zip = await zipRustProject(makeContract(opts), opts);
+
+  assertLayout(test, zip, expandPathsFromFilesPaths(expectedZipFiles));
+  await extractPackage(zip, folderPath);
+  await runCargoTest(test, folderPath);
+
+  if (testOptions.snapshotResult) await snapshotZipContents(test, zip, expectedZipFiles);
+};
+
 export const runRustCompilationTest = withTemporaryFolderDo(
   async (
     makeContract: MakeContract,
     opts: GenericOptions,
-    testOptions: { snapshotResult: boolean },
+    testOptions: { snapshotResult: boolean; excludeExplicitTraitTest?: boolean },
     test: ExecutionContext,
     folderPath: string,
   ) => {
-    test.timeout(3_000_000);
+    await doRunRustCompilationTest(makeContract, opts, testOptions, test, `${folderPath}/default`);
 
-    const scaffoldContractName = contractOptionsToContractName(opts?.kind || 'contract');
+    const shouldBeExcludedOrHasAlreadyRun = testOptions.excludeExplicitTraitTest || opts.explicitImplementations;
+    if (shouldBeExcludedOrHasAlreadyRun) return;
 
-    const expectedZipFiles = [
-      `contracts/${scaffoldContractName}/src/contract.rs`,
-      `contracts/${scaffoldContractName}/src/test.rs`,
-      `contracts/${scaffoldContractName}/src/lib.rs`,
-      `contracts/${scaffoldContractName}/Cargo.toml`,
-      'Cargo.toml',
-      'README.md',
-    ];
-
-    const zip = await zipRustProject(makeContract(opts), opts);
-
-    assertLayout(test, zip, expandPathsFromFilesPaths(expectedZipFiles));
-    await extractPackage(zip, folderPath);
-    await runCargoTest(test, folderPath);
-
-    if (testOptions.snapshotResult) await snapshotZipContents(test, zip, expectedZipFiles);
+    try {
+      await doRunRustCompilationTest(
+        makeContract,
+        { ...opts, explicitImplementations: true },
+        testOptions,
+        test,
+        `${folderPath}/explicit`,
+      );
+    } catch (error) {
+      throw new Error(`EXPLICIT IMPLEMENTATION ERROR: ${error}`);
+    }
   },
 );

package/src/utils/version.ts

@@ -1,15 +1,15 @@
 /**
  * The actual latest version to use in links.
  */
-export const contractsVersion = '0.4.1';
+export const contractsVersion = '0.6.0';
 export const contractsVersionTag = `v${contractsVersion}`;
 
 /**
  * Semantic version string representing of the minimum compatible version of Contracts to display in output.
  */
-export const compatibleContractsSemver = '^0.4.1';
+export const compatibleContractsSemver = '^0.6.0';
 
 /**
  * The Soroban version for which compilation and testing have passing tests
  */
-export const compatibleSorobanVersion = '22.0.8';
+export const compatibleSorobanVersion = '23.4.0';

package/src/zip-rust.ts

@@ -25,6 +25,10 @@ Continue your development journey with [Stellar CLI](https://github.com/stellar/
 - See [Git installation guide](https://github.com/git-guides/install-git).
 `;
 
+const gitIgnore = `\
+target/
+`;
+
 export const createRustZipEnvironment = (c: Contract, opts: GenericOptions) => {
   const zip = new JSZip();
 
@@ -35,6 +39,7 @@ export const createRustZipEnvironment = (c: Contract, opts: GenericOptions) => {
   zip.file(`contracts/${contractName}/src/lib.rs`, createRustLibFile);
   zip.file(`contracts/${contractName}/Cargo.toml`, printContractCargo(contractName));
   zip.file('Cargo.toml', workspaceCargo);
+  zip.file('.gitignore', gitIgnore);
 
   return zip;
 };