@caatinga/client 0.2.4 → 2.0.0

package/dist/index.cjs

@@ -38,12 +38,38 @@ function resolveContractId(input) {
   if (contractId) {
     return contractId;
   }
+  const hint = formatMissingContractArtifactHint(input.artifacts, input.network, input.contract);
   throw new import_browser.CaatingaError(
     `No contract artifact found for "${input.contract}" on "${input.network}".`,
     import_browser.CaatingaErrorCode.CONTRACT_ARTIFACT_NOT_FOUND,
-    "Deploy the contract first or pass contractId explicitly."
+    hint
   );
 }
+function formatMissingContractArtifactHint(artifacts, network, contract) {
+  const deployCommand = `caatinga deploy ${contract} --network ${network} --source <identity>`;
+  const buildNote = "caatinga build does not register a contract ID.";
+  if (Object.keys(artifacts.networks).length === 0) {
+    return [
+      "caatinga.artifacts.json has no network scaffold.",
+      `Run caatinga doctor --network ${network} to inspect deploy readiness, then run: ${deployCommand}.`,
+      buildNote,
+      "Or pass contractId in the client registration."
+    ].join(" ");
+  }
+  if (!artifacts.networks[network]) {
+    return [
+      `No artifacts exist for network "${network}".`,
+      `Run: ${deployCommand}.`,
+      buildNote,
+      "Or pass contractId in the client registration."
+    ].join(" ");
+  }
+  return [
+    `Contract "${contract}" is not deployed on "${network}".`,
+    `Run: ${deployCommand}.`,
+    "Or pass contractId in the client registration."
+  ].join(" ");
+}
 
 // src/bindings/default-binding-adapter.ts
 var import_browser2 = require("@caatinga/core/browser");
@@ -80,10 +106,10 @@ function createDefaultBindingAdapter(binding) {
 }
 
 // src/client/create-caatinga-client.ts
-var import_browser5 = require("@caatinga/core/browser");
+var import_browser8 = require("@caatinga/core/browser");
 
 // src/client/caatinga-contract-client.ts
-var import_browser4 = require("@caatinga/core/browser");
+var import_browser7 = require("@caatinga/core/browser");
 
 // src/xdr/build-xdr.ts
 var import_browser3 = require("@caatinga/core/browser");
@@ -142,6 +168,188 @@ function readXdr(transaction) {
   return candidate.toXDR();
 }
 
+// src/wallet/with-wallet-timeout.ts
+var import_browser4 = require("@caatinga/core/browser");
+function withWalletTimeout(label, timeoutMs, fn) {
+  if (timeoutMs === void 0 || timeoutMs <= 0) {
+    return fn();
+  }
+  let timedOut = false;
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      timedOut = true;
+      reject(
+        new import_browser4.CaatingaError(
+          `Wallet "${label}" timed out after ${timeoutMs}ms.`,
+          import_browser4.CaatingaErrorCode.WALLET_TIMEOUT,
+          "Ensure the wallet adapter rejects on user dismissal, or increase walletTimeout."
+        )
+      );
+    }, timeoutMs);
+    fn().then(
+      (value) => {
+        if (timedOut) {
+          return;
+        }
+        clearTimeout(timer);
+        resolve(value);
+      },
+      (error) => {
+        if (timedOut) {
+          return;
+        }
+        clearTimeout(timer);
+        reject(error);
+      }
+    );
+  });
+}
+
+// src/client/invoke-args.ts
+function splitArgsAndOptions(argsOrOptions, maybeOptions) {
+  return {
+    args: argsOrOptions,
+    debugRaw: maybeOptions?.debugRaw ?? false
+  };
+}
+function splitInvokeArgsAndOptions(argsOrOptions, maybeOptions) {
+  const looksLikeOptions = argsOrOptions !== void 0 && ("debugXdr" in argsOrOptions || "debugRaw" in argsOrOptions) && maybeOptions === void 0;
+  if (looksLikeOptions) {
+    const options = argsOrOptions;
+    return {
+      args: void 0,
+      debugXdr: options.debugXdr ?? false,
+      debugRaw: options.debugRaw ?? false
+    };
+  }
+  return {
+    args: argsOrOptions,
+    debugXdr: maybeOptions?.debugXdr ?? false,
+    debugRaw: maybeOptions?.debugRaw ?? false
+  };
+}
+function splitReadArgsAndOptions(argsOrOptions, maybeOptions) {
+  const looksLikeOptions = argsOrOptions !== void 0 && "debugRaw" in argsOrOptions && maybeOptions === void 0;
+  if (looksLikeOptions) {
+    const options = argsOrOptions;
+    return {
+      args: void 0,
+      debugRaw: options.debugRaw ?? false
+    };
+  }
+  return {
+    args: argsOrOptions,
+    debugRaw: maybeOptions?.debugRaw ?? false
+  };
+}
+
+// src/client/transaction-simulate.ts
+var import_browser5 = require("@caatinga/core/browser");
+async function prepareReadTransaction(transaction, contractName, method, rpcUrl) {
+  const candidate = transaction;
+  if (typeof candidate.prepare !== "function") {
+    return transaction;
+  }
+  try {
+    return await candidate.prepare.call(transaction);
+  } catch (error) {
+    if (error instanceof import_browser5.CaatingaError) {
+      throw error;
+    }
+    throw new import_browser5.CaatingaError(
+      `Failed to prepare XDR for "${contractName}.${method}".`,
+      import_browser5.CaatingaErrorCode.XDR_PREPARE_FAILED,
+      `RPC: ${rpcUrl}. Check connectivity, simulation errors, and binding compatibility.`,
+      error
+    );
+  }
+}
+function readSimulationResult(raw, contractName, method) {
+  if (raw !== null && typeof raw === "object" && "result" in raw) {
+    const result = raw.result;
+    if (result !== void 0) {
+      return result;
+    }
+  }
+  throw new import_browser5.CaatingaError(
+    `Simulation for "${contractName}.${method}" did not return a result.`,
+    import_browser5.CaatingaErrorCode.READ_RESULT_MISSING,
+    `Expected "${contractName}.${method}" to expose a simulation result. Use debugRaw to inspect the generated binding output.`
+  );
+}
+
+// src/client/transaction-submit.ts
+var import_browser6 = require("@caatinga/core/browser");
+async function submitTransaction(transaction, signTransaction, contractName, method, rpcUrl) {
+  const candidate = transaction;
+  if (typeof candidate.signAndSend === "function") {
+    try {
+      const raw = await candidate.signAndSend.call(transaction, { signTransaction });
+      assertSubmitResultRecognized(raw, contractName, method);
+      return raw;
+    } catch (error) {
+      if (error instanceof import_browser6.CaatingaError) {
+        throw error;
+      }
+      throw new import_browser6.CaatingaError(
+        `Failed to submit XDR for "${contractName}.${method}".`,
+        import_browser6.CaatingaErrorCode.XDR_SUBMIT_FAILED,
+        `RPC: ${rpcUrl}. Check wallet signature and RPC connectivity.`,
+        error
+      );
+    }
+  }
+  if (typeof candidate.send === "function") {
+    try {
+      const raw = await candidate.send.call(transaction);
+      assertSubmitResultRecognized(raw, contractName, method);
+      return raw;
+    } catch (error) {
+      if (error instanceof import_browser6.CaatingaError) {
+        throw error;
+      }
+      throw new import_browser6.CaatingaError(
+        `Failed to submit XDR for "${contractName}.${method}".`,
+        import_browser6.CaatingaErrorCode.XDR_SUBMIT_FAILED,
+        `RPC: ${rpcUrl}. Check wallet signature and RPC connectivity.`,
+        error
+      );
+    }
+  }
+  throw new import_browser6.CaatingaError(
+    `Binding transaction for "${contractName}.${method}" cannot be submitted.`,
+    import_browser6.CaatingaErrorCode.XDR_SUBMIT_FAILED,
+    "Regenerate bindings or provide a compatible binding adapter."
+  );
+}
+function assertSubmitResultRecognized(raw, contractName, method) {
+  if (raw === null || typeof raw !== "object") {
+    return;
+  }
+  const record = raw;
+  const hasTransactionId = "txHash" in record || "transactionHash" in record || "hash" in record || hasNestedSendTransactionResponseHash(record);
+  const hasResult = "result" in record;
+  if (hasTransactionId || hasResult) {
+    return;
+  }
+  throw new import_browser6.CaatingaError(
+    `Submit returned an unrecognized payload for "${contractName}.${method}".`,
+    import_browser6.CaatingaErrorCode.XDR_RESULT_FAILED,
+    "Expected txHash, transactionHash, hash, sendTransactionResponse.hash, or result on the submit response. Use debugRaw to inspect the binding output."
+  );
+}
+function hasNestedSendTransactionResponseHash(record) {
+  const response = record.sendTransactionResponse;
+  return response !== null && typeof response === "object" && "hash" in response;
+}
+function normalizeSubmitResult(raw) {
+  const candidate = raw;
+  return {
+    transactionHash: candidate.txHash ?? candidate.transactionHash ?? candidate.hash ?? candidate.sendTransactionResponse?.hash,
+    result: candidate.result
+  };
+}
+
 // src/client/caatinga-contract-client.ts
 var CaatingaContractClient = class {
   constructor(config, contractName, registration, bindingAdapter = createDefaultBindingAdapter(
@@ -182,28 +390,29 @@ var CaatingaContractClient = class {
     let signedXdr;
     const signTransaction = async (xdr2) => {
       try {
-        signedXdr = await this.withWalletTimeout(
+        signedXdr = await withWalletTimeout(
           "signTransaction",
+          this.config.walletTimeout,
           () => this.config.wallet.signTransaction({
             xdr: xdr2,
             networkPassphrase: this.config.network.networkPassphrase
           })
         );
       } catch (error) {
-        if (error instanceof import_browser4.CaatingaError) {
+        if (error instanceof import_browser7.CaatingaError) {
           throw error;
         }
-        throw new import_browser4.CaatingaError(
+        throw new import_browser7.CaatingaError(
           `Failed to sign XDR for "${this.contractName}.${method}".`,
-          import_browser4.CaatingaErrorCode.XDR_SIGN_FAILED,
+          import_browser7.CaatingaErrorCode.XDR_SIGN_FAILED,
           "Connect a wallet and approve the transaction.",
           error
         );
       }
       if (typeof signedXdr !== "string" || signedXdr.trim().length === 0) {
-        throw new import_browser4.CaatingaError(
+        throw new import_browser7.CaatingaError(
           `Failed to sign XDR for "${this.contractName}.${method}".`,
-          import_browser4.CaatingaErrorCode.XDR_SIGN_FAILED,
+          import_browser7.CaatingaErrorCode.XDR_SIGN_FAILED,
           "Wallet returned an empty or invalid signed XDR. The user may have dismissed the signing prompt.",
           signedXdr
         );
@@ -218,9 +427,9 @@ var CaatingaContractClient = class {
       this.config.network.rpcUrl
     );
     if (typeof transaction.signAndSend === "function" && signedXdr === void 0) {
-      throw new import_browser4.CaatingaError(
+      throw new import_browser7.CaatingaError(
         `Failed to sign XDR for "${this.contractName}.${method}".`,
-        import_browser4.CaatingaErrorCode.XDR_SIGN_FAILED,
+        import_browser7.CaatingaErrorCode.XDR_SIGN_FAILED,
         "Wallet returned an empty or invalid signed XDR. The generated transaction did not request a wallet signature."
       );
     }
@@ -274,17 +483,18 @@ var CaatingaContractClient = class {
     });
     let publicKey;
     try {
-      publicKey = await this.withWalletTimeout(
+      publicKey = await withWalletTimeout(
         "getPublicKey",
+        this.config.walletTimeout,
         () => this.config.wallet.getPublicKey()
       );
     } catch (error) {
-      if (error instanceof import_browser4.CaatingaError) {
+      if (error instanceof import_browser7.CaatingaError) {
         throw error;
       }
-      throw new import_browser4.CaatingaError(
+      throw new import_browser7.CaatingaError(
         `Wallet is not connected or the public key is unavailable for "${this.contractName}".`,
-        import_browser4.CaatingaErrorCode.WALLET_NOT_CONNECTED,
+        import_browser7.CaatingaErrorCode.WALLET_NOT_CONNECTED,
         "Connect the wallet and grant account access, then retry.",
         error
       );
@@ -298,179 +508,7 @@ var CaatingaContractClient = class {
     const transaction = await this.bindingAdapter.callMethod({ client, method, args });
     return { contractId, transaction };
   }
-  withWalletTimeout(label, fn) {
-    const timeoutMs = this.config.walletTimeout;
-    if (timeoutMs === void 0 || timeoutMs <= 0) {
-      return fn();
-    }
-    let timedOut = false;
-    return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        timedOut = true;
-        reject(
-          new import_browser4.CaatingaError(
-            `Wallet "${label}" timed out after ${timeoutMs}ms.`,
-            import_browser4.CaatingaErrorCode.WALLET_TIMEOUT,
-            "Ensure the wallet adapter rejects on user dismissal, or increase walletTimeout."
-          )
-        );
-      }, timeoutMs);
-      fn().then(
-        (value) => {
-          if (timedOut) {
-            return;
-          }
-          clearTimeout(timer);
-          resolve(value);
-        },
-        (error) => {
-          if (timedOut) {
-            return;
-          }
-          clearTimeout(timer);
-          reject(error);
-        }
-      );
-    });
-  }
 };
-function splitArgsAndOptions(argsOrOptions, maybeOptions) {
-  return {
-    args: argsOrOptions,
-    debugRaw: maybeOptions?.debugRaw ?? false
-  };
-}
-function splitInvokeArgsAndOptions(argsOrOptions, maybeOptions) {
-  const looksLikeOptions = argsOrOptions !== void 0 && ("debugXdr" in argsOrOptions || "debugRaw" in argsOrOptions) && maybeOptions === void 0;
-  if (looksLikeOptions) {
-    const options = argsOrOptions;
-    return {
-      args: void 0,
-      debugXdr: options.debugXdr ?? false,
-      debugRaw: options.debugRaw ?? false
-    };
-  }
-  return {
-    args: argsOrOptions,
-    debugXdr: maybeOptions?.debugXdr ?? false,
-    debugRaw: maybeOptions?.debugRaw ?? false
-  };
-}
-function splitReadArgsAndOptions(argsOrOptions, maybeOptions) {
-  const looksLikeOptions = argsOrOptions !== void 0 && "debugRaw" in argsOrOptions && maybeOptions === void 0;
-  if (looksLikeOptions) {
-    const options = argsOrOptions;
-    return {
-      args: void 0,
-      debugRaw: options.debugRaw ?? false
-    };
-  }
-  return {
-    args: argsOrOptions,
-    debugRaw: maybeOptions?.debugRaw ?? false
-  };
-}
-async function submitTransaction(transaction, signTransaction, contractName, method, rpcUrl) {
-  const candidate = transaction;
-  if (typeof candidate.signAndSend === "function") {
-    try {
-      const raw = await candidate.signAndSend.call(transaction, { signTransaction });
-      assertSubmitResultRecognized(raw, contractName, method);
-      return raw;
-    } catch (error) {
-      if (error instanceof import_browser4.CaatingaError) {
-        throw error;
-      }
-      throw new import_browser4.CaatingaError(
-        `Failed to submit XDR for "${contractName}.${method}".`,
-        import_browser4.CaatingaErrorCode.XDR_SUBMIT_FAILED,
-        `RPC: ${rpcUrl}. Check wallet signature and RPC connectivity.`,
-        error
-      );
-    }
-  }
-  if (typeof candidate.send === "function") {
-    try {
-      const raw = await candidate.send.call(transaction);
-      assertSubmitResultRecognized(raw, contractName, method);
-      return raw;
-    } catch (error) {
-      if (error instanceof import_browser4.CaatingaError) {
-        throw error;
-      }
-      throw new import_browser4.CaatingaError(
-        `Failed to submit XDR for "${contractName}.${method}".`,
-        import_browser4.CaatingaErrorCode.XDR_SUBMIT_FAILED,
-        `RPC: ${rpcUrl}. Check wallet signature and RPC connectivity.`,
-        error
-      );
-    }
-  }
-  throw new import_browser4.CaatingaError(
-    `Binding transaction for "${contractName}.${method}" cannot be submitted.`,
-    import_browser4.CaatingaErrorCode.XDR_SUBMIT_FAILED,
-    "Regenerate bindings or provide a compatible binding adapter."
-  );
-}
-async function prepareReadTransaction(transaction, contractName, method, rpcUrl) {
-  const candidate = transaction;
-  if (typeof candidate.prepare !== "function") {
-    return transaction;
-  }
-  try {
-    return await candidate.prepare.call(transaction);
-  } catch (error) {
-    if (error instanceof import_browser4.CaatingaError) {
-      throw error;
-    }
-    throw new import_browser4.CaatingaError(
-      `Failed to prepare XDR for "${contractName}.${method}".`,
-      import_browser4.CaatingaErrorCode.XDR_PREPARE_FAILED,
-      `RPC: ${rpcUrl}. Check connectivity, simulation errors, and binding compatibility.`,
-      error
-    );
-  }
-}
-function readSimulationResult(raw, contractName, method) {
-  if (raw !== null && typeof raw === "object" && "result" in raw) {
-    const result = raw.result;
-    if (result !== void 0) {
-      return result;
-    }
-  }
-  throw new import_browser4.CaatingaError(
-    `Simulation for "${contractName}.${method}" did not return a result.`,
-    import_browser4.CaatingaErrorCode.READ_RESULT_MISSING,
-    `Expected "${contractName}.${method}" to expose a simulation result. Use debugRaw to inspect the generated binding output.`
-  );
-}
-function assertSubmitResultRecognized(raw, contractName, method) {
-  if (raw === null || typeof raw !== "object") {
-    return;
-  }
-  const record = raw;
-  const hasTransactionId = "txHash" in record || "transactionHash" in record || "hash" in record || hasNestedSendTransactionResponseHash(record);
-  const hasResult = "result" in record;
-  if (hasTransactionId || hasResult) {
-    return;
-  }
-  throw new import_browser4.CaatingaError(
-    `Submit returned an unrecognized payload for "${contractName}.${method}".`,
-    import_browser4.CaatingaErrorCode.XDR_RESULT_FAILED,
-    "Expected txHash, transactionHash, hash, sendTransactionResponse.hash, or result on the submit response. Use debugRaw to inspect the binding output."
-  );
-}
-function hasNestedSendTransactionResponseHash(record) {
-  const response = record.sendTransactionResponse;
-  return response !== null && typeof response === "object" && "hash" in response;
-}
-function normalizeSubmitResult(raw) {
-  const candidate = raw;
-  return {
-    transactionHash: candidate.txHash ?? candidate.transactionHash ?? candidate.hash ?? candidate.sendTransactionResponse?.hash,
-    result: candidate.result
-  };
-}
 
 // src/client/create-caatinga-client.ts
 function createCaatingaClient(config) {
@@ -478,9 +516,9 @@ function createCaatingaClient(config) {
     contract(contractName) {
       const registration = config.contracts[contractName];
       if (!registration) {
-        throw new import_browser5.CaatingaError(
+        throw new import_browser8.CaatingaError(
           `Contract "${contractName}" is not registered.`,
-          import_browser5.CaatingaErrorCode.CONTRACT_NOT_FOUND,
+          import_browser8.CaatingaErrorCode.CONTRACT_NOT_FOUND,
           "Add the contract binding to createCaatingaClient()."
         );
       }

package/dist/index.d.cts

@@ -32,7 +32,6 @@ declare class CaatingaContractClient {
     simulate<T = unknown>(method: string, argsOrOptions?: Record<string, unknown> | CaatingaReadOptions, maybeOptions?: CaatingaReadOptions): Promise<CaatingaReadResult<T>>;
     read<T = unknown>(method: string, argsOrOptions?: Record<string, unknown> | CaatingaReadOptions, maybeOptions?: CaatingaReadOptions): Promise<T>;
     private createTransaction;
-    private withWalletTimeout;
 }
 
 declare function createCaatingaClient(config: CaatingaClientConfig): {

package/dist/index.d.ts

@@ -32,7 +32,6 @@ declare class CaatingaContractClient {
     simulate<T = unknown>(method: string, argsOrOptions?: Record<string, unknown> | CaatingaReadOptions, maybeOptions?: CaatingaReadOptions): Promise<CaatingaReadResult<T>>;
     read<T = unknown>(method: string, argsOrOptions?: Record<string, unknown> | CaatingaReadOptions, maybeOptions?: CaatingaReadOptions): Promise<T>;
     private createTransaction;
-    private withWalletTimeout;
 }
 
 declare function createCaatingaClient(config: CaatingaClientConfig): {

package/dist/index.js

@@ -8,12 +8,38 @@ function resolveContractId(input) {
   if (contractId) {
     return contractId;
   }
+  const hint = formatMissingContractArtifactHint(input.artifacts, input.network, input.contract);
   throw new CaatingaError(
     `No contract artifact found for "${input.contract}" on "${input.network}".`,
     CaatingaErrorCode.CONTRACT_ARTIFACT_NOT_FOUND,
-    "Deploy the contract first or pass contractId explicitly."
+    hint
   );
 }
+function formatMissingContractArtifactHint(artifacts, network, contract) {
+  const deployCommand = `caatinga deploy ${contract} --network ${network} --source <identity>`;
+  const buildNote = "caatinga build does not register a contract ID.";
+  if (Object.keys(artifacts.networks).length === 0) {
+    return [
+      "caatinga.artifacts.json has no network scaffold.",
+      `Run caatinga doctor --network ${network} to inspect deploy readiness, then run: ${deployCommand}.`,
+      buildNote,
+      "Or pass contractId in the client registration."
+    ].join(" ");
+  }
+  if (!artifacts.networks[network]) {
+    return [
+      `No artifacts exist for network "${network}".`,
+      `Run: ${deployCommand}.`,
+      buildNote,
+      "Or pass contractId in the client registration."
+    ].join(" ");
+  }
+  return [
+    `Contract "${contract}" is not deployed on "${network}".`,
+    `Run: ${deployCommand}.`,
+    "Or pass contractId in the client registration."
+  ].join(" ");
+}
 
 // src/bindings/default-binding-adapter.ts
 import { CaatingaError as CaatingaError2, CaatingaErrorCode as CaatingaErrorCode2 } from "@caatinga/core/browser";
@@ -50,10 +76,10 @@ function createDefaultBindingAdapter(binding) {
 }
 
 // src/client/create-caatinga-client.ts
-import { CaatingaError as CaatingaError5, CaatingaErrorCode as CaatingaErrorCode5 } from "@caatinga/core/browser";
+import { CaatingaError as CaatingaError8, CaatingaErrorCode as CaatingaErrorCode8 } from "@caatinga/core/browser";
 
 // src/client/caatinga-contract-client.ts
-import { CaatingaError as CaatingaError4, CaatingaErrorCode as CaatingaErrorCode4 } from "@caatinga/core/browser";
+import { CaatingaError as CaatingaError7, CaatingaErrorCode as CaatingaErrorCode7 } from "@caatinga/core/browser";
 
 // src/xdr/build-xdr.ts
 import { CaatingaError as CaatingaError3, CaatingaErrorCode as CaatingaErrorCode3 } from "@caatinga/core/browser";
@@ -112,6 +138,188 @@ function readXdr(transaction) {
   return candidate.toXDR();
 }
 
+// src/wallet/with-wallet-timeout.ts
+import { CaatingaError as CaatingaError4, CaatingaErrorCode as CaatingaErrorCode4 } from "@caatinga/core/browser";
+function withWalletTimeout(label, timeoutMs, fn) {
+  if (timeoutMs === void 0 || timeoutMs <= 0) {
+    return fn();
+  }
+  let timedOut = false;
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => {
+      timedOut = true;
+      reject(
+        new CaatingaError4(
+          `Wallet "${label}" timed out after ${timeoutMs}ms.`,
+          CaatingaErrorCode4.WALLET_TIMEOUT,
+          "Ensure the wallet adapter rejects on user dismissal, or increase walletTimeout."
+        )
+      );
+    }, timeoutMs);
+    fn().then(
+      (value) => {
+        if (timedOut) {
+          return;
+        }
+        clearTimeout(timer);
+        resolve(value);
+      },
+      (error) => {
+        if (timedOut) {
+          return;
+        }
+        clearTimeout(timer);
+        reject(error);
+      }
+    );
+  });
+}
+
+// src/client/invoke-args.ts
+function splitArgsAndOptions(argsOrOptions, maybeOptions) {
+  return {
+    args: argsOrOptions,
+    debugRaw: maybeOptions?.debugRaw ?? false
+  };
+}
+function splitInvokeArgsAndOptions(argsOrOptions, maybeOptions) {
+  const looksLikeOptions = argsOrOptions !== void 0 && ("debugXdr" in argsOrOptions || "debugRaw" in argsOrOptions) && maybeOptions === void 0;
+  if (looksLikeOptions) {
+    const options = argsOrOptions;
+    return {
+      args: void 0,
+      debugXdr: options.debugXdr ?? false,
+      debugRaw: options.debugRaw ?? false
+    };
+  }
+  return {
+    args: argsOrOptions,
+    debugXdr: maybeOptions?.debugXdr ?? false,
+    debugRaw: maybeOptions?.debugRaw ?? false
+  };
+}
+function splitReadArgsAndOptions(argsOrOptions, maybeOptions) {
+  const looksLikeOptions = argsOrOptions !== void 0 && "debugRaw" in argsOrOptions && maybeOptions === void 0;
+  if (looksLikeOptions) {
+    const options = argsOrOptions;
+    return {
+      args: void 0,
+      debugRaw: options.debugRaw ?? false
+    };
+  }
+  return {
+    args: argsOrOptions,
+    debugRaw: maybeOptions?.debugRaw ?? false
+  };
+}
+
+// src/client/transaction-simulate.ts
+import { CaatingaError as CaatingaError5, CaatingaErrorCode as CaatingaErrorCode5 } from "@caatinga/core/browser";
+async function prepareReadTransaction(transaction, contractName, method, rpcUrl) {
+  const candidate = transaction;
+  if (typeof candidate.prepare !== "function") {
+    return transaction;
+  }
+  try {
+    return await candidate.prepare.call(transaction);
+  } catch (error) {
+    if (error instanceof CaatingaError5) {
+      throw error;
+    }
+    throw new CaatingaError5(
+      `Failed to prepare XDR for "${contractName}.${method}".`,
+      CaatingaErrorCode5.XDR_PREPARE_FAILED,
+      `RPC: ${rpcUrl}. Check connectivity, simulation errors, and binding compatibility.`,
+      error
+    );
+  }
+}
+function readSimulationResult(raw, contractName, method) {
+  if (raw !== null && typeof raw === "object" && "result" in raw) {
+    const result = raw.result;
+    if (result !== void 0) {
+      return result;
+    }
+  }
+  throw new CaatingaError5(
+    `Simulation for "${contractName}.${method}" did not return a result.`,
+    CaatingaErrorCode5.READ_RESULT_MISSING,
+    `Expected "${contractName}.${method}" to expose a simulation result. Use debugRaw to inspect the generated binding output.`
+  );
+}
+
+// src/client/transaction-submit.ts
+import { CaatingaError as CaatingaError6, CaatingaErrorCode as CaatingaErrorCode6 } from "@caatinga/core/browser";
+async function submitTransaction(transaction, signTransaction, contractName, method, rpcUrl) {
+  const candidate = transaction;
+  if (typeof candidate.signAndSend === "function") {
+    try {
+      const raw = await candidate.signAndSend.call(transaction, { signTransaction });
+      assertSubmitResultRecognized(raw, contractName, method);
+      return raw;
+    } catch (error) {
+      if (error instanceof CaatingaError6) {
+        throw error;
+      }
+      throw new CaatingaError6(
+        `Failed to submit XDR for "${contractName}.${method}".`,
+        CaatingaErrorCode6.XDR_SUBMIT_FAILED,
+        `RPC: ${rpcUrl}. Check wallet signature and RPC connectivity.`,
+        error
+      );
+    }
+  }
+  if (typeof candidate.send === "function") {
+    try {
+      const raw = await candidate.send.call(transaction);
+      assertSubmitResultRecognized(raw, contractName, method);
+      return raw;
+    } catch (error) {
+      if (error instanceof CaatingaError6) {
+        throw error;
+      }
+      throw new CaatingaError6(
+        `Failed to submit XDR for "${contractName}.${method}".`,
+        CaatingaErrorCode6.XDR_SUBMIT_FAILED,
+        `RPC: ${rpcUrl}. Check wallet signature and RPC connectivity.`,
+        error
+      );
+    }
+  }
+  throw new CaatingaError6(
+    `Binding transaction for "${contractName}.${method}" cannot be submitted.`,
+    CaatingaErrorCode6.XDR_SUBMIT_FAILED,
+    "Regenerate bindings or provide a compatible binding adapter."
+  );
+}
+function assertSubmitResultRecognized(raw, contractName, method) {
+  if (raw === null || typeof raw !== "object") {
+    return;
+  }
+  const record = raw;
+  const hasTransactionId = "txHash" in record || "transactionHash" in record || "hash" in record || hasNestedSendTransactionResponseHash(record);
+  const hasResult = "result" in record;
+  if (hasTransactionId || hasResult) {
+    return;
+  }
+  throw new CaatingaError6(
+    `Submit returned an unrecognized payload for "${contractName}.${method}".`,
+    CaatingaErrorCode6.XDR_RESULT_FAILED,
+    "Expected txHash, transactionHash, hash, sendTransactionResponse.hash, or result on the submit response. Use debugRaw to inspect the binding output."
+  );
+}
+function hasNestedSendTransactionResponseHash(record) {
+  const response = record.sendTransactionResponse;
+  return response !== null && typeof response === "object" && "hash" in response;
+}
+function normalizeSubmitResult(raw) {
+  const candidate = raw;
+  return {
+    transactionHash: candidate.txHash ?? candidate.transactionHash ?? candidate.hash ?? candidate.sendTransactionResponse?.hash,
+    result: candidate.result
+  };
+}
+
 // src/client/caatinga-contract-client.ts
 var CaatingaContractClient = class {
   constructor(config, contractName, registration, bindingAdapter = createDefaultBindingAdapter(
@@ -152,28 +360,29 @@ var CaatingaContractClient = class {
     let signedXdr;
     const signTransaction = async (xdr2) => {
       try {
-        signedXdr = await this.withWalletTimeout(
+        signedXdr = await withWalletTimeout(
           "signTransaction",
+          this.config.walletTimeout,
           () => this.config.wallet.signTransaction({
             xdr: xdr2,
             networkPassphrase: this.config.network.networkPassphrase
           })
         );
       } catch (error) {
-        if (error instanceof CaatingaError4) {
+        if (error instanceof CaatingaError7) {
           throw error;
         }
-        throw new CaatingaError4(
+        throw new CaatingaError7(
           `Failed to sign XDR for "${this.contractName}.${method}".`,
-          CaatingaErrorCode4.XDR_SIGN_FAILED,
+          CaatingaErrorCode7.XDR_SIGN_FAILED,
           "Connect a wallet and approve the transaction.",
           error
         );
       }
       if (typeof signedXdr !== "string" || signedXdr.trim().length === 0) {
-        throw new CaatingaError4(
+        throw new CaatingaError7(
           `Failed to sign XDR for "${this.contractName}.${method}".`,
-          CaatingaErrorCode4.XDR_SIGN_FAILED,
+          CaatingaErrorCode7.XDR_SIGN_FAILED,
           "Wallet returned an empty or invalid signed XDR. The user may have dismissed the signing prompt.",
           signedXdr
         );
@@ -188,9 +397,9 @@ var CaatingaContractClient = class {
       this.config.network.rpcUrl
     );
     if (typeof transaction.signAndSend === "function" && signedXdr === void 0) {
-      throw new CaatingaError4(
+      throw new CaatingaError7(
         `Failed to sign XDR for "${this.contractName}.${method}".`,
-        CaatingaErrorCode4.XDR_SIGN_FAILED,
+        CaatingaErrorCode7.XDR_SIGN_FAILED,
         "Wallet returned an empty or invalid signed XDR. The generated transaction did not request a wallet signature."
       );
     }
@@ -244,17 +453,18 @@ var CaatingaContractClient = class {
     });
     let publicKey;
     try {
-      publicKey = await this.withWalletTimeout(
+      publicKey = await withWalletTimeout(
         "getPublicKey",
+        this.config.walletTimeout,
         () => this.config.wallet.getPublicKey()
       );
     } catch (error) {
-      if (error instanceof CaatingaError4) {
+      if (error instanceof CaatingaError7) {
         throw error;
       }
-      throw new CaatingaError4(
+      throw new CaatingaError7(
         `Wallet is not connected or the public key is unavailable for "${this.contractName}".`,
-        CaatingaErrorCode4.WALLET_NOT_CONNECTED,
+        CaatingaErrorCode7.WALLET_NOT_CONNECTED,
         "Connect the wallet and grant account access, then retry.",
         error
       );
@@ -268,179 +478,7 @@ var CaatingaContractClient = class {
     const transaction = await this.bindingAdapter.callMethod({ client, method, args });
     return { contractId, transaction };
   }
-  withWalletTimeout(label, fn) {
-    const timeoutMs = this.config.walletTimeout;
-    if (timeoutMs === void 0 || timeoutMs <= 0) {
-      return fn();
-    }
-    let timedOut = false;
-    return new Promise((resolve, reject) => {
-      const timer = setTimeout(() => {
-        timedOut = true;
-        reject(
-          new CaatingaError4(
-            `Wallet "${label}" timed out after ${timeoutMs}ms.`,
-            CaatingaErrorCode4.WALLET_TIMEOUT,
-            "Ensure the wallet adapter rejects on user dismissal, or increase walletTimeout."
-          )
-        );
-      }, timeoutMs);
-      fn().then(
-        (value) => {
-          if (timedOut) {
-            return;
-          }
-          clearTimeout(timer);
-          resolve(value);
-        },
-        (error) => {
-          if (timedOut) {
-            return;
-          }
-          clearTimeout(timer);
-          reject(error);
-        }
-      );
-    });
-  }
 };
-function splitArgsAndOptions(argsOrOptions, maybeOptions) {
-  return {
-    args: argsOrOptions,
-    debugRaw: maybeOptions?.debugRaw ?? false
-  };
-}
-function splitInvokeArgsAndOptions(argsOrOptions, maybeOptions) {
-  const looksLikeOptions = argsOrOptions !== void 0 && ("debugXdr" in argsOrOptions || "debugRaw" in argsOrOptions) && maybeOptions === void 0;
-  if (looksLikeOptions) {
-    const options = argsOrOptions;
-    return {
-      args: void 0,
-      debugXdr: options.debugXdr ?? false,
-      debugRaw: options.debugRaw ?? false
-    };
-  }
-  return {
-    args: argsOrOptions,
-    debugXdr: maybeOptions?.debugXdr ?? false,
-    debugRaw: maybeOptions?.debugRaw ?? false
-  };
-}
-function splitReadArgsAndOptions(argsOrOptions, maybeOptions) {
-  const looksLikeOptions = argsOrOptions !== void 0 && "debugRaw" in argsOrOptions && maybeOptions === void 0;
-  if (looksLikeOptions) {
-    const options = argsOrOptions;
-    return {
-      args: void 0,
-      debugRaw: options.debugRaw ?? false
-    };
-  }
-  return {
-    args: argsOrOptions,
-    debugRaw: maybeOptions?.debugRaw ?? false
-  };
-}
-async function submitTransaction(transaction, signTransaction, contractName, method, rpcUrl) {
-  const candidate = transaction;
-  if (typeof candidate.signAndSend === "function") {
-    try {
-      const raw = await candidate.signAndSend.call(transaction, { signTransaction });
-      assertSubmitResultRecognized(raw, contractName, method);
-      return raw;
-    } catch (error) {
-      if (error instanceof CaatingaError4) {
-        throw error;
-      }
-      throw new CaatingaError4(
-        `Failed to submit XDR for "${contractName}.${method}".`,
-        CaatingaErrorCode4.XDR_SUBMIT_FAILED,
-        `RPC: ${rpcUrl}. Check wallet signature and RPC connectivity.`,
-        error
-      );
-    }
-  }
-  if (typeof candidate.send === "function") {
-    try {
-      const raw = await candidate.send.call(transaction);
-      assertSubmitResultRecognized(raw, contractName, method);
-      return raw;
-    } catch (error) {
-      if (error instanceof CaatingaError4) {
-        throw error;
-      }
-      throw new CaatingaError4(
-        `Failed to submit XDR for "${contractName}.${method}".`,
-        CaatingaErrorCode4.XDR_SUBMIT_FAILED,
-        `RPC: ${rpcUrl}. Check wallet signature and RPC connectivity.`,
-        error
-      );
-    }
-  }
-  throw new CaatingaError4(
-    `Binding transaction for "${contractName}.${method}" cannot be submitted.`,
-    CaatingaErrorCode4.XDR_SUBMIT_FAILED,
-    "Regenerate bindings or provide a compatible binding adapter."
-  );
-}
-async function prepareReadTransaction(transaction, contractName, method, rpcUrl) {
-  const candidate = transaction;
-  if (typeof candidate.prepare !== "function") {
-    return transaction;
-  }
-  try {
-    return await candidate.prepare.call(transaction);
-  } catch (error) {
-    if (error instanceof CaatingaError4) {
-      throw error;
-    }
-    throw new CaatingaError4(
-      `Failed to prepare XDR for "${contractName}.${method}".`,
-      CaatingaErrorCode4.XDR_PREPARE_FAILED,
-      `RPC: ${rpcUrl}. Check connectivity, simulation errors, and binding compatibility.`,
-      error
-    );
-  }
-}
-function readSimulationResult(raw, contractName, method) {
-  if (raw !== null && typeof raw === "object" && "result" in raw) {
-    const result = raw.result;
-    if (result !== void 0) {
-      return result;
-    }
-  }
-  throw new CaatingaError4(
-    `Simulation for "${contractName}.${method}" did not return a result.`,
-    CaatingaErrorCode4.READ_RESULT_MISSING,
-    `Expected "${contractName}.${method}" to expose a simulation result. Use debugRaw to inspect the generated binding output.`
-  );
-}
-function assertSubmitResultRecognized(raw, contractName, method) {
-  if (raw === null || typeof raw !== "object") {
-    return;
-  }
-  const record = raw;
-  const hasTransactionId = "txHash" in record || "transactionHash" in record || "hash" in record || hasNestedSendTransactionResponseHash(record);
-  const hasResult = "result" in record;
-  if (hasTransactionId || hasResult) {
-    return;
-  }
-  throw new CaatingaError4(
-    `Submit returned an unrecognized payload for "${contractName}.${method}".`,
-    CaatingaErrorCode4.XDR_RESULT_FAILED,
-    "Expected txHash, transactionHash, hash, sendTransactionResponse.hash, or result on the submit response. Use debugRaw to inspect the binding output."
-  );
-}
-function hasNestedSendTransactionResponseHash(record) {
-  const response = record.sendTransactionResponse;
-  return response !== null && typeof response === "object" && "hash" in response;
-}
-function normalizeSubmitResult(raw) {
-  const candidate = raw;
-  return {
-    transactionHash: candidate.txHash ?? candidate.transactionHash ?? candidate.hash ?? candidate.sendTransactionResponse?.hash,
-    result: candidate.result
-  };
-}
 
 // src/client/create-caatinga-client.ts
 function createCaatingaClient(config) {
@@ -448,9 +486,9 @@ function createCaatingaClient(config) {
     contract(contractName) {
       const registration = config.contracts[contractName];
       if (!registration) {
-        throw new CaatingaError5(
+        throw new CaatingaError8(
           `Contract "${contractName}" is not registered.`,
-          CaatingaErrorCode5.CONTRACT_NOT_FOUND,
+          CaatingaErrorCode8.CONTRACT_NOT_FOUND,
           "Add the contract binding to createCaatingaClient()."
         );
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caatinga/client",
-  "version": "0.2.4",
+  "version": "2.0.0",
   "description": "Browser and Node client for Soroban smart contracts — connects generated bindings, Caatinga artifacts, and wallet adapters",
   "keywords": [
     "stellar",
@@ -51,7 +51,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@caatinga/core": "^0.2.4"
+    "@caatinga/core": "^2.0.0"
   },
   "devDependencies": {
     "tsup": "^8.3.5",