@caatinga/core 2.4.0 → 2.4.2

package/dist/index.cjs

@@ -195,7 +195,7 @@ function formatCause(cause) {
 }
 
 // src/version.ts
-var CAATINGA_CORE_VERSION = "2.4.0";
+var CAATINGA_CORE_VERSION = "2.4.1";
 
 // src/config/config.schema.ts
 var import_zod = require("zod");
@@ -1017,37 +1017,89 @@ function toCurrentWasmTargetPath(wasmPath) {
 }
 function wasmNotFoundError(configuredWasmPath, options) {
   const migratedPath = options?.migratedPath;
-  const hint = migratedPath === void 0 ? "Run caatinga build before deploy or generate." : [
-    "Run caatinga build before deploy or generate.",
-    `Soroban builds use the "${CURRENT_RUST_WASM_TARGET}" target.`,
-    `Update wasm in caatinga.config.ts to "${toConfigRelativeWasmPath(migratedPath)}" or an equivalent path under target/${CURRENT_RUST_WASM_TARGET}/release/.`
-  ].join(" ");
+  const cargoTargetDir = process.env.CARGO_TARGET_DIR;
+  const hintParts = ["Run caatinga build before deploy or generate."];
+  if (migratedPath !== void 0) {
+    hintParts.push(
+      `Soroban builds use the "${CURRENT_RUST_WASM_TARGET}" target.`,
+      `Update wasm in caatinga.config.ts to "${toConfigRelativeWasmPath(migratedPath)}" or an equivalent path under target/${CURRENT_RUST_WASM_TARGET}/release/.`
+    );
+  }
+  if (cargoTargetDir) {
+    hintParts.push(
+      `CARGO_TARGET_DIR is set to "${cargoTargetDir}"; the WASM may be under that directory instead of the configured path. Unset CARGO_TARGET_DIR or update wasm in caatinga.config.ts.`
+    );
+  }
   return new CaatingaError(
     `WASM output was not found at ${configuredWasmPath}.`,
     CaatingaErrorCode.ARTIFACT_NOT_FOUND,
-    hint
+    hintParts.join(" ")
   );
 }
 function toConfigRelativeWasmPath(absoluteWasmPath) {
   const relative = import_node_path8.default.relative(process.cwd(), absoluteWasmPath);
   return relative.startsWith("..") ? absoluteWasmPath : `./${relative.split(import_node_path8.default.sep).join("/")}`;
 }
-async function resolveWasmArtifactPath(configuredWasmPath) {
-  try {
-    await (0, import_promises6.access)(configuredWasmPath);
-    return configuredWasmPath;
-  } catch {
-    const currentTargetPath = toCurrentWasmTargetPath(configuredWasmPath);
-    if (currentTargetPath === configuredWasmPath) {
-      throw wasmNotFoundError(configuredWasmPath);
+function wasmFileName(configuredWasmPath) {
+  return import_node_path8.default.basename(configuredWasmPath);
+}
+function buildAlternateWasmCandidates(configuredWasmPath, options) {
+  const fileName = wasmFileName(configuredWasmPath);
+  const candidates = [];
+  const seen = /* @__PURE__ */ new Set();
+  function addCandidate(candidate) {
+    const resolved = import_node_path8.default.resolve(candidate);
+    if (seen.has(resolved)) {
+      return;
     }
+    seen.add(resolved);
+    candidates.push(resolved);
+  }
+  const cargoTargetDir = process.env.CARGO_TARGET_DIR;
+  if (cargoTargetDir) {
+    addCandidate(import_node_path8.default.join(cargoTargetDir, CURRENT_RUST_WASM_TARGET, "release", fileName));
+    addCandidate(import_node_path8.default.join(cargoTargetDir, LEGACY_RUST_WASM_TARGET, "release", fileName));
+  }
+  if (options?.sourcePath) {
+    addCandidate(import_node_path8.default.join(options.sourcePath, "target", CURRENT_RUST_WASM_TARGET, "release", fileName));
+    addCandidate(import_node_path8.default.join(options.sourcePath, "target", LEGACY_RUST_WASM_TARGET, "release", fileName));
+  }
+  return candidates;
+}
+async function firstExistingPath(paths) {
+  for (const candidate of paths) {
     try {
-      await (0, import_promises6.access)(currentTargetPath);
-      return currentTargetPath;
+      await (0, import_promises6.access)(candidate);
+      return candidate;
     } catch {
-      throw wasmNotFoundError(configuredWasmPath, { migratedPath: currentTargetPath });
+      continue;
     }
   }
+  return void 0;
+}
+async function resolveWasmArtifactPath(configuredWasmPath, options) {
+  const resolvedConfiguredPath = import_node_path8.default.resolve(configuredWasmPath);
+  try {
+    await (0, import_promises6.access)(resolvedConfiguredPath);
+    return resolvedConfiguredPath;
+  } catch {
+    const currentTargetPath = toCurrentWasmTargetPath(resolvedConfiguredPath);
+    if (currentTargetPath !== resolvedConfiguredPath) {
+      const migratedPath = await firstExistingPath([currentTargetPath]);
+      if (migratedPath) {
+        return migratedPath;
+      }
+    }
+    const alternatePath = await firstExistingPath(
+      buildAlternateWasmCandidates(resolvedConfiguredPath, options)
+    );
+    if (alternatePath) {
+      return alternatePath;
+    }
+    throw wasmNotFoundError(resolvedConfiguredPath, {
+      migratedPath: currentTargetPath !== resolvedConfiguredPath ? currentTargetPath : void 0
+    });
+  }
 }
 async function hashWasm(wasmPath) {
   const bytes = await (0, import_promises6.readFile)(wasmPath);
@@ -1141,7 +1193,9 @@ async function buildContract(options) {
     }
     throw error;
   }
-  const wasmPath = await resolveWasmArtifactPath(contract.wasmPath);
+  const wasmPath = await resolveWasmArtifactPath(contract.wasmPath, {
+    sourcePath: contract.sourcePath
+  });
   return {
     contract: {
       ...contract,
@@ -1234,7 +1288,9 @@ async function deployContract(options) {
   const network = resolveNetwork(options.config, options.networkName);
   const source = assertSafeSourceAccount(options.source);
   await checkBinary("stellar", "Install Stellar CLI before running caatinga deploy.");
-  const wasmPath = await resolveWasmArtifactPath(contract.wasmPath);
+  const wasmPath = await resolveWasmArtifactPath(contract.wasmPath, {
+    sourcePath: contract.sourcePath
+  });
   const contractWithWasm = {
     ...contract,
     wasmPath
@@ -2030,7 +2086,8 @@ function packageJsonSource(projectName) {
       "zk:build": "caatinga zk build main",
       "zk:prove": "caatinga zk prove main",
       build: "caatinga build verifier",
-      deploy: "caatinga deploy verifier"
+      deploy: "caatinga deploy verifier --network testnet --source ${CAATINGA_SOURCE:-alice}",
+      doctor: "caatinga doctor --network testnet"
     },
     devDependencies: {
       "@caatinga/cli": `^${CAATINGA_CORE_VERSION}`,
@@ -2050,7 +2107,7 @@ Minimal Caatinga ZK project.
 npm install
 npx caatinga zk build main
 npx caatinga build verifier
-npx caatinga deploy verifier --network testnet
+npx caatinga deploy verifier --network testnet --source <identity>
 npx caatinga zk prove main
 \`\`\`
 
@@ -2132,7 +2189,7 @@ function packageJsonSource2(projectName) {
     scripts: {
       build: "caatinga build app",
       deploy: "caatinga deploy app --network testnet --source ${CAATINGA_SOURCE:-alice}",
-      doctor: "caatinga doctor",
+      doctor: "caatinga doctor --network testnet",
       "read:hello": "caatinga read app.hello --network testnet --source ${CAATINGA_SOURCE:-alice}",
       "read:version": "caatinga read app.version --network testnet --source ${CAATINGA_SOURCE:-alice}"
     },

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import { C as CaatingaArtifacts, c as ContractArtifact, d as CaatingaErrorCodeVa
 export { e as CaatingaArtifactsSchema, b as CaatingaErrorCode, f as formatCaatingaError, t as toCaatingaError } from './artifact.schema-BH5K-IiZ.cjs';
 import { z } from 'zod';
 
-declare const CAATINGA_CORE_VERSION = "2.4.0";
+declare const CAATINGA_CORE_VERSION = "2.4.1";
 
 declare const ContractConfigSchema: z.ZodObject<{
     path: z.ZodString;

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { C as CaatingaArtifacts, c as ContractArtifact, d as CaatingaErrorCodeVa
 export { e as CaatingaArtifactsSchema, b as CaatingaErrorCode, f as formatCaatingaError, t as toCaatingaError } from './artifact.schema-BH5K-IiZ.js';
 import { z } from 'zod';
 
-declare const CAATINGA_CORE_VERSION = "2.4.0";
+declare const CAATINGA_CORE_VERSION = "2.4.1";
 
 declare const ContractConfigSchema: z.ZodObject<{
     path: z.ZodString;

package/dist/index.js

@@ -106,7 +106,7 @@ function formatCause(cause) {
 }
 
 // src/version.ts
-var CAATINGA_CORE_VERSION = "2.4.0";
+var CAATINGA_CORE_VERSION = "2.4.1";
 
 // src/config/config.schema.ts
 import { z } from "zod";
@@ -927,37 +927,89 @@ function toCurrentWasmTargetPath(wasmPath) {
 }
 function wasmNotFoundError(configuredWasmPath, options) {
   const migratedPath = options?.migratedPath;
-  const hint = migratedPath === void 0 ? "Run caatinga build before deploy or generate." : [
-    "Run caatinga build before deploy or generate.",
-    `Soroban builds use the "${CURRENT_RUST_WASM_TARGET}" target.`,
-    `Update wasm in caatinga.config.ts to "${toConfigRelativeWasmPath(migratedPath)}" or an equivalent path under target/${CURRENT_RUST_WASM_TARGET}/release/.`
-  ].join(" ");
+  const cargoTargetDir = process.env.CARGO_TARGET_DIR;
+  const hintParts = ["Run caatinga build before deploy or generate."];
+  if (migratedPath !== void 0) {
+    hintParts.push(
+      `Soroban builds use the "${CURRENT_RUST_WASM_TARGET}" target.`,
+      `Update wasm in caatinga.config.ts to "${toConfigRelativeWasmPath(migratedPath)}" or an equivalent path under target/${CURRENT_RUST_WASM_TARGET}/release/.`
+    );
+  }
+  if (cargoTargetDir) {
+    hintParts.push(
+      `CARGO_TARGET_DIR is set to "${cargoTargetDir}"; the WASM may be under that directory instead of the configured path. Unset CARGO_TARGET_DIR or update wasm in caatinga.config.ts.`
+    );
+  }
   return new CaatingaError(
     `WASM output was not found at ${configuredWasmPath}.`,
     CaatingaErrorCode.ARTIFACT_NOT_FOUND,
-    hint
+    hintParts.join(" ")
   );
 }
 function toConfigRelativeWasmPath(absoluteWasmPath) {
   const relative = path8.relative(process.cwd(), absoluteWasmPath);
   return relative.startsWith("..") ? absoluteWasmPath : `./${relative.split(path8.sep).join("/")}`;
 }
-async function resolveWasmArtifactPath(configuredWasmPath) {
-  try {
-    await access2(configuredWasmPath);
-    return configuredWasmPath;
-  } catch {
-    const currentTargetPath = toCurrentWasmTargetPath(configuredWasmPath);
-    if (currentTargetPath === configuredWasmPath) {
-      throw wasmNotFoundError(configuredWasmPath);
+function wasmFileName(configuredWasmPath) {
+  return path8.basename(configuredWasmPath);
+}
+function buildAlternateWasmCandidates(configuredWasmPath, options) {
+  const fileName = wasmFileName(configuredWasmPath);
+  const candidates = [];
+  const seen = /* @__PURE__ */ new Set();
+  function addCandidate(candidate) {
+    const resolved = path8.resolve(candidate);
+    if (seen.has(resolved)) {
+      return;
     }
+    seen.add(resolved);
+    candidates.push(resolved);
+  }
+  const cargoTargetDir = process.env.CARGO_TARGET_DIR;
+  if (cargoTargetDir) {
+    addCandidate(path8.join(cargoTargetDir, CURRENT_RUST_WASM_TARGET, "release", fileName));
+    addCandidate(path8.join(cargoTargetDir, LEGACY_RUST_WASM_TARGET, "release", fileName));
+  }
+  if (options?.sourcePath) {
+    addCandidate(path8.join(options.sourcePath, "target", CURRENT_RUST_WASM_TARGET, "release", fileName));
+    addCandidate(path8.join(options.sourcePath, "target", LEGACY_RUST_WASM_TARGET, "release", fileName));
+  }
+  return candidates;
+}
+async function firstExistingPath(paths) {
+  for (const candidate of paths) {
     try {
-      await access2(currentTargetPath);
-      return currentTargetPath;
+      await access2(candidate);
+      return candidate;
     } catch {
-      throw wasmNotFoundError(configuredWasmPath, { migratedPath: currentTargetPath });
+      continue;
     }
   }
+  return void 0;
+}
+async function resolveWasmArtifactPath(configuredWasmPath, options) {
+  const resolvedConfiguredPath = path8.resolve(configuredWasmPath);
+  try {
+    await access2(resolvedConfiguredPath);
+    return resolvedConfiguredPath;
+  } catch {
+    const currentTargetPath = toCurrentWasmTargetPath(resolvedConfiguredPath);
+    if (currentTargetPath !== resolvedConfiguredPath) {
+      const migratedPath = await firstExistingPath([currentTargetPath]);
+      if (migratedPath) {
+        return migratedPath;
+      }
+    }
+    const alternatePath = await firstExistingPath(
+      buildAlternateWasmCandidates(resolvedConfiguredPath, options)
+    );
+    if (alternatePath) {
+      return alternatePath;
+    }
+    throw wasmNotFoundError(resolvedConfiguredPath, {
+      migratedPath: currentTargetPath !== resolvedConfiguredPath ? currentTargetPath : void 0
+    });
+  }
 }
 async function hashWasm(wasmPath) {
   const bytes = await readFile3(wasmPath);
@@ -1051,7 +1103,9 @@ async function buildContract(options) {
     }
     throw error;
   }
-  const wasmPath = await resolveWasmArtifactPath(contract.wasmPath);
+  const wasmPath = await resolveWasmArtifactPath(contract.wasmPath, {
+    sourcePath: contract.sourcePath
+  });
   return {
     contract: {
       ...contract,
@@ -1144,7 +1198,9 @@ async function deployContract(options) {
   const network = resolveNetwork(options.config, options.networkName);
   const source = assertSafeSourceAccount(options.source);
   await checkBinary("stellar", "Install Stellar CLI before running caatinga deploy.");
-  const wasmPath = await resolveWasmArtifactPath(contract.wasmPath);
+  const wasmPath = await resolveWasmArtifactPath(contract.wasmPath, {
+    sourcePath: contract.sourcePath
+  });
   const contractWithWasm = {
     ...contract,
     wasmPath
@@ -1939,7 +1995,8 @@ function packageJsonSource(projectName) {
       "zk:build": "caatinga zk build main",
       "zk:prove": "caatinga zk prove main",
       build: "caatinga build verifier",
-      deploy: "caatinga deploy verifier"
+      deploy: "caatinga deploy verifier --network testnet --source ${CAATINGA_SOURCE:-alice}",
+      doctor: "caatinga doctor --network testnet"
     },
     devDependencies: {
       "@caatinga/cli": `^${CAATINGA_CORE_VERSION}`,
@@ -1959,7 +2016,7 @@ Minimal Caatinga ZK project.
 npm install
 npx caatinga zk build main
 npx caatinga build verifier
-npx caatinga deploy verifier --network testnet
+npx caatinga deploy verifier --network testnet --source <identity>
 npx caatinga zk prove main
 \`\`\`
 
@@ -2040,7 +2097,7 @@ function packageJsonSource2(projectName) {
     scripts: {
       build: "caatinga build app",
       deploy: "caatinga deploy app --network testnet --source ${CAATINGA_SOURCE:-alice}",
-      doctor: "caatinga doctor",
+      doctor: "caatinga doctor --network testnet",
       "read:hello": "caatinga read app.hello --network testnet --source ${CAATINGA_SOURCE:-alice}",
       "read:version": "caatinga read app.version --network testnet --source ${CAATINGA_SOURCE:-alice}"
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caatinga/core",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "Core config, artifacts, command orchestration, and error primitives for Caatinga/Soroban toolkit",
   "keywords": [
     "stellar",