@cloak.ag/sdk 1.0.2 → 1.0.4

package/dist/index.js

@@ -8,7 +8,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 // src/core/CloakSDK.ts
 import {
   Keypair,
-  PublicKey as PublicKey5,
+  PublicKey as PublicKey4,
   Transaction
 } from "@solana/web3.js";
 
@@ -28,7 +28,6 @@ import { blake3 } from "@noble/hashes/blake3.js";
 import nacl from "tweetnacl";
 
 // src/utils/crypto.ts
-import { PublicKey } from "@solana/web3.js";
 import { buildPoseidon } from "circomlibjs";
 var poseidon = null;
 async function getPoseidon() {
@@ -49,7 +48,7 @@ function splitTo2Limbs(value) {
   return [lo, hi];
 }
 function pubkeyToLimbs(pubkey) {
-  const bytes = pubkey instanceof PublicKey ? pubkey.toBytes() : pubkey;
+  const bytes = typeof pubkey.toBytes === "function" ? pubkey.toBytes() : pubkey;
   const value = BigInt("0x" + Buffer.from(bytes).toString("hex"));
   return splitTo2Limbs(value);
 }
@@ -677,10 +676,10 @@ var LocalStorageAdapter = class {
 };
 
 // src/utils/validation.ts
-import { PublicKey as PublicKey2 } from "@solana/web3.js";
+import { PublicKey } from "@solana/web3.js";
 function isValidSolanaAddress(address) {
   try {
-    new PublicKey2(address);
+    new PublicKey(address);
     return true;
   } catch {
     return false;
@@ -779,8 +778,9 @@ function validateTransfers(recipients, totalAmount) {
   }
   for (let i = 0; i < recipients.length; i++) {
     const transfer = recipients[i];
-    if (!transfer.recipient || !(transfer.recipient instanceof PublicKey2)) {
-      throw new Error(`Recipient ${i} must be a PublicKey`);
+    const isPublicKeyLike = transfer.recipient && typeof transfer.recipient.toBase58 === "function" && typeof transfer.recipient.toBuffer === "function";
+    if (!isPublicKeyLike) {
+      throw new Error(`Recipient ${i} must be a PublicKey (got ${typeof transfer.recipient})`);
     }
     if (typeof transfer.amount !== "number" || transfer.amount <= 0) {
       throw new Error(`Recipient ${i} amount must be a positive number`);
@@ -1025,254 +1025,6 @@ var IndexerService = class {
   }
 };
 
-// src/services/ArtifactProverService.ts
-var ArtifactProverService = class {
-  /**
-   * Create a new Artifact Prover Service client
-   *
-   * @param indexerUrl - Indexer service base URL
-   * @param timeout - Proof generation timeout in ms (default: 5 minutes)
-   * @param pollInterval - Polling interval for status checks (default: 2 seconds)
-   */
-  constructor(indexerUrl, timeout = 5 * 60 * 1e3, pollInterval = 2e3) {
-    this.indexerUrl = indexerUrl.replace(/\/$/, "");
-    this.timeout = timeout;
-    this.pollInterval = pollInterval;
-  }
-  /**
-   * Generate a zero-knowledge proof using artifact-based flow
-   *
-   * This process typically takes 30-180 seconds depending on the TEE.
-   * Private inputs are uploaded directly to TEE, never passing through backend.
-   *
-   * @param inputs - Circuit inputs (private + public + outputs)
-   * @param options - Optional progress tracking and callbacks
-   * @returns Proof result with hex-encoded proof and public inputs
-   *
-   * @example
-   * ```typescript
-   * const result = await prover.generateProof(inputs);
-   * if (result.success) {
-   *   console.log(`Proof: ${result.proof}`);
-   * }
-   * ```
-   */
-  async generateProof(inputs, options) {
-    const startTime = Date.now();
-    const actualTimeout = options?.timeout || this.timeout;
-    const pollInterval = options?.pollInterval || this.pollInterval;
-    options?.onStart?.();
-    options?.onProgress?.(5);
-    try {
-      options?.onProgress?.(10);
-      const artifactResponse = await fetch(`${this.indexerUrl}/api/v1/tee/artifact`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({
-          program_id: null
-          // Optional, can be null
-        })
-      });
-      if (!artifactResponse.ok) {
-        const errorText = await artifactResponse.text();
-        const errorMessage2 = `Failed to create artifact: ${errorText}`;
-        options?.onError?.(errorMessage2);
-        return {
-          success: false,
-          generationTimeMs: Date.now() - startTime,
-          error: errorMessage2
-        };
-      }
-      const artifactData = await artifactResponse.json();
-      const { artifact_id, upload_url } = artifactData;
-      if (!artifact_id || !upload_url) {
-        const errorMessage2 = "Invalid artifact response: missing artifact_id or upload_url";
-        options?.onError?.(errorMessage2);
-        return {
-          success: false,
-          generationTimeMs: Date.now() - startTime,
-          error: errorMessage2
-        };
-      }
-      const fullUploadUrl = upload_url.startsWith("http") ? upload_url : `${this.indexerUrl}${upload_url}`;
-      options?.onProgress?.(20);
-      const stdinPayload = JSON.stringify({
-        private: inputs.privateInputs,
-        public: inputs.publicInputs,
-        outputs: inputs.outputs,
-        // Include swap_params if present (for swap transactions)
-        ...inputs.swapParams && { swap_params: inputs.swapParams }
-      });
-      const uploadResponse = await fetch(fullUploadUrl, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: stdinPayload
-      });
-      if (!uploadResponse.ok) {
-        const errorText = await uploadResponse.text();
-        const errorMessage2 = `Failed to upload stdin to TEE: ${errorText}`;
-        options?.onError?.(errorMessage2);
-        return {
-          success: false,
-          generationTimeMs: Date.now() - startTime,
-          error: errorMessage2
-        };
-      }
-      options?.onProgress?.(30);
-      const requestProofBody = {
-        artifact_id,
-        program_id: null,
-        public_inputs: JSON.stringify(inputs.publicInputs)
-      };
-      const requestProofResponse = await fetch(
-        `${this.indexerUrl}/api/v1/tee/request-proof`,
-        {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify(requestProofBody)
-        }
-      );
-      if (!requestProofResponse.ok) {
-        const errorText = await requestProofResponse.text();
-        const errorMessage2 = `Failed to request proof: ${errorText}`;
-        options?.onError?.(errorMessage2);
-        return {
-          success: false,
-          generationTimeMs: Date.now() - startTime,
-          error: errorMessage2
-        };
-      }
-      const requestProofData = await requestProofResponse.json();
-      const { request_id } = requestProofData;
-      if (!request_id) {
-        const errorMessage2 = "Invalid proof request response: missing request_id";
-        options?.onError?.(errorMessage2);
-        return {
-          success: false,
-          generationTimeMs: Date.now() - startTime,
-          error: errorMessage2
-        };
-      }
-      options?.onProgress?.(40);
-      const pollStartTime = Date.now();
-      let lastProgress = 40;
-      while (Date.now() - pollStartTime < actualTimeout) {
-        const statusResponse = await fetch(
-          `${this.indexerUrl}/api/v1/tee/proof-status?request_id=${request_id}`,
-          {
-            method: "GET"
-          }
-        );
-        if (!statusResponse.ok) {
-          const errorText = await statusResponse.text();
-          const errorMessage2 = `Failed to check proof status: ${errorText}`;
-          options?.onError?.(errorMessage2);
-          return {
-            success: false,
-            generationTimeMs: Date.now() - startTime,
-            error: errorMessage2
-          };
-        }
-        const statusData = await statusResponse.json();
-        const { status, proof, public_inputs, generation_time_ms, error } = statusData;
-        if (status === "ready") {
-          options?.onProgress?.(100);
-          if (!proof || !public_inputs) {
-            const errorMessage2 = "Proof status is 'ready' but proof or public_inputs is missing";
-            options?.onError?.(errorMessage2);
-            return {
-              success: false,
-              generationTimeMs: Date.now() - startTime,
-              error: errorMessage2
-            };
-          }
-          const result = {
-            success: true,
-            proof,
-            publicInputs: public_inputs,
-            generationTimeMs: generation_time_ms || Date.now() - startTime
-          };
-          options?.onSuccess?.(result);
-          return result;
-        }
-        if (status === "failed") {
-          const errorMessage2 = error || "Proof generation failed";
-          options?.onError?.(errorMessage2);
-          return {
-            success: false,
-            generationTimeMs: Date.now() - startTime,
-            error: errorMessage2
-          };
-        }
-        const elapsed = Date.now() - pollStartTime;
-        const progress = Math.min(90, 40 + Math.floor(elapsed / actualTimeout * 50));
-        if (progress > lastProgress) {
-          lastProgress = progress;
-          options?.onProgress?.(progress);
-        }
-        await new Promise((resolve) => setTimeout(resolve, pollInterval));
-      }
-      const errorMessage = `Proof generation timed out after ${actualTimeout}ms`;
-      options?.onError?.(errorMessage);
-      return {
-        success: false,
-        generationTimeMs: Date.now() - startTime,
-        error: errorMessage
-      };
-    } catch (error) {
-      const totalTime = Date.now() - startTime;
-      let errorMessage;
-      if (error instanceof Error && error.name === "AbortError") {
-        errorMessage = `Proof generation timed out after ${actualTimeout}ms`;
-      } else {
-        errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-      }
-      options?.onError?.(errorMessage);
-      return {
-        success: false,
-        generationTimeMs: totalTime,
-        error: errorMessage
-      };
-    }
-  }
-  /**
-   * Check if the artifact prover service is available
-   *
-   * @returns True if service is healthy
-   */
-  async healthCheck() {
-    try {
-      const response = await fetch(`${this.indexerUrl}/health`, {
-        method: "GET"
-      });
-      return response.ok;
-    } catch {
-      return false;
-    }
-  }
-  /**
-   * Get the configured timeout
-   */
-  getTimeout() {
-    return this.timeout;
-  }
-  /**
-   * Set a new timeout
-   */
-  setTimeout(timeout) {
-    if (timeout <= 0) {
-      throw new Error("Timeout must be positive");
-    }
-    this.timeout = timeout;
-  }
-};
-
 // src/services/RelayService.ts
 var RelayService = class {
   /**
@@ -1769,7 +1521,7 @@ var DepositRecoveryService = class {
 
 // src/solana/instructions.ts
 import {
-  PublicKey as PublicKey3,
+  PublicKey as PublicKey2,
   SystemProgram,
   TransactionInstruction
 } from "@solana/web3.js";
@@ -1810,16 +1562,16 @@ function createDepositInstruction(params) {
   });
 }
 function validateDepositParams(params) {
-  if (!(params.programId instanceof PublicKey3)) {
+  if (!(params.programId instanceof PublicKey2)) {
     throw new Error("programId must be a PublicKey");
   }
-  if (!(params.payer instanceof PublicKey3)) {
+  if (!(params.payer instanceof PublicKey2)) {
     throw new Error("payer must be a PublicKey");
   }
-  if (!(params.pool instanceof PublicKey3)) {
+  if (!(params.pool instanceof PublicKey2)) {
     throw new Error("pool must be a PublicKey");
   }
-  if (!(params.merkleTree instanceof PublicKey3)) {
+  if (!(params.merkleTree instanceof PublicKey2)) {
     throw new Error("merkleTree must be a PublicKey");
   }
   if (typeof params.amount !== "number" || params.amount <= 0) {
@@ -1836,34 +1588,34 @@ function validateDepositParams(params) {
 }
 
 // src/utils/pda.ts
-import { PublicKey as PublicKey4 } from "@solana/web3.js";
+import { PublicKey as PublicKey3 } from "@solana/web3.js";
 function getShieldPoolPDAs(programId, mint) {
   const pid = programId || CLOAK_PROGRAM_ID;
-  const mintKey = mint ?? new PublicKey4(
+  const mintKey = mint ?? new PublicKey3(
     // 32 zero bytes, matching Rust `Pubkey::default()`
     new Uint8Array(32)
   );
-  const [pool] = PublicKey4.findProgramAddressSync(
+  const [pool] = PublicKey3.findProgramAddressSync(
     [Buffer.from("pool"), mintKey.toBytes()],
     pid
   );
-  const [merkleTree] = PublicKey4.findProgramAddressSync(
+  const [merkleTree] = PublicKey3.findProgramAddressSync(
     [Buffer.from("merkle_tree"), mintKey.toBytes()],
     pid
   );
-  const [commitments] = PublicKey4.findProgramAddressSync(
+  const [commitments] = PublicKey3.findProgramAddressSync(
     [Buffer.from("commitments"), mintKey.toBytes()],
     pid
   );
-  const [rootsRing] = PublicKey4.findProgramAddressSync(
+  const [rootsRing] = PublicKey3.findProgramAddressSync(
     [Buffer.from("roots_ring"), mintKey.toBytes()],
     pid
   );
-  const [nullifierShard] = PublicKey4.findProgramAddressSync(
+  const [nullifierShard] = PublicKey3.findProgramAddressSync(
     [Buffer.from("nullifier_shard"), mintKey.toBytes()],
     pid
   );
-  const [treasury] = PublicKey4.findProgramAddressSync(
+  const [treasury] = PublicKey3.findProgramAddressSync(
     [Buffer.from("treasury"), mintKey.toBytes()],
     pid
   );
@@ -1910,6 +1662,15 @@ async function fileExists(filePath) {
       return false;
     }
   }
+  const isBrowser = typeof window !== "undefined" || typeof globalThis !== "undefined" && globalThis.window;
+  if (isBrowser) {
+    try {
+      const response = await fetch(filePath, { method: "HEAD" });
+      return response.ok;
+    } catch {
+      return false;
+    }
+  }
   return false;
 }
 async function generateWithdrawRegularProof(inputs, circuitsPath) {
@@ -1953,11 +1714,7 @@ async function generateWithdrawRegularProof(inputs, circuitsPath) {
     var_fee: inputs.var_fee.toString(),
     rem: inputs.rem.toString()
   };
-  const { proof, publicSignals } = await snarkjs.groth16.fullProve(
-    circuitInputs,
-    wasmPath,
-    zkeyPath
-  );
+  const { proof, publicSignals } = await snarkjs.groth16.fullProve(circuitInputs, wasmPath, zkeyPath);
   const proofBytes = proofToBytes(proof);
   return {
     proof,
@@ -2026,6 +1783,10 @@ async function generateWithdrawSwapProof(inputs, circuitsPath) {
   };
 }
 async function areCircuitsAvailable(circuitsPath) {
+  const isBrowser = typeof window !== "undefined" || typeof globalThis !== "undefined" && globalThis.window;
+  if (isBrowser) {
+    return Boolean(circuitsPath && circuitsPath !== "");
+  }
   const wasmPath = joinPath(circuitsPath, "build", "withdraw_regular_js", "withdraw_regular.wasm");
   const zkeyPath = joinPath(circuitsPath, "build", "withdraw_regular_final.zkey");
   const wasmExists = await fileExists(wasmPath);
@@ -2057,11 +1818,11 @@ async function getDefaultCircuitsPath() {
 }
 
 // src/core/CloakSDK.ts
-var CLOAK_PROGRAM_ID = new PublicKey5("c1oak6tetxYnNfvXKFkpn1d98FxtK7B68vBQLYQpWKp");
+var CLOAK_PROGRAM_ID = new PublicKey4("c1oak6tetxYnNfvXKFkpn1d98FxtK7B68vBQLYQpWKp");
 var CLOAK_API_URL = "https://api.cloak.ag";
 var CloakSDK = class {
   /**
-   * Create a new Cloak SDK client
+  * Create a new Cloak SDK client
    *
    * @param config - Client configuration
    * 
@@ -2094,7 +1855,6 @@ var CloakSDK = class {
     const indexerUrl = config.indexerUrl || typeof process !== "undefined" && process.env?.CLOAK_INDEXER_URL || CLOAK_API_URL;
     const relayUrl = config.relayUrl || typeof process !== "undefined" && process.env?.CLOAK_RELAY_URL || CLOAK_API_URL;
     this.indexer = new IndexerService(indexerUrl);
-    this.artifactProver = new ArtifactProverService(indexerUrl, 5 * 60 * 1e3, 2e3);
     this.relay = new RelayService(relayUrl);
     this.depositRecovery = new DepositRecoveryService(this.indexer, indexerUrl);
     if (!this.cloakKeys) {
@@ -2199,27 +1959,48 @@ var CloakSDK = class {
       const { blockhash, lastValidBlockHeight } = await connection.getLatestBlockhash();
       const transaction = new Transaction({
         feePayer: payerPubkey,
-        blockhash,
-        lastValidBlockHeight
+        recentBlockhash: blockhash
       }).add(depositIx);
-      if (!options?.skipPreflight) {
-        const simulation = await connection.simulateTransaction(transaction);
-        if (simulation.value.err) {
-          const logs = simulation.value.logs?.join("\n") || "No logs";
-          throw new Error(
-            `Transaction simulation failed: ${JSON.stringify(simulation.value.err)}
-Logs:
-${logs}`
-          );
-        }
+      if (!transaction.feePayer) {
+        throw new Error("Transaction feePayer is not set");
+      }
+      if (!transaction.recentBlockhash) {
+        throw new Error("Transaction recentBlockhash is not set");
       }
       let signature;
-      if (this.wallet?.sendTransaction) {
-        signature = await this.wallet.sendTransaction(transaction, connection, {
-          skipPreflight: options?.skipPreflight || false,
-          preflightCommitment: "confirmed",
-          maxRetries: 3
-        });
+      if (this.wallet) {
+        if (!this.wallet.publicKey) {
+          throw new Error("Wallet not connected - publicKey is null");
+        }
+        if (this.wallet.signTransaction) {
+          try {
+            const signedTransaction = await this.wallet.signTransaction(transaction);
+            const rawTransaction = signedTransaction.serialize();
+            signature = await connection.sendRawTransaction(rawTransaction, {
+              skipPreflight: options?.skipPreflight || false,
+              preflightCommitment: "confirmed",
+              maxRetries: 3
+            });
+          } catch (signError) {
+            if (this.wallet.sendTransaction) {
+              signature = await this.wallet.sendTransaction(transaction, connection, {
+                skipPreflight: options?.skipPreflight || false,
+                preflightCommitment: "confirmed",
+                maxRetries: 3
+              });
+            } else {
+              throw signError;
+            }
+          }
+        } else if (this.wallet.sendTransaction) {
+          signature = await this.wallet.sendTransaction(transaction, connection, {
+            skipPreflight: options?.skipPreflight || false,
+            preflightCommitment: "confirmed",
+            maxRetries: 3
+          });
+        } else {
+          throw new Error("Wallet adapter must provide either sendTransaction or signTransaction");
+        }
       } else if (this.keypair) {
         signature = await connection.sendTransaction(transaction, [this.keypair], {
           skipPreflight: options?.skipPreflight || false,
@@ -2304,7 +2085,7 @@ ${logs}`
       }
       if (leafIndex === null) {
         const programId2 = this.config.programId || CLOAK_PROGRAM_ID;
-        const mintForSOL = new PublicKey5(new Uint8Array(32));
+        const mintForSOL = new PublicKey4(new Uint8Array(32));
         const { merkleTree } = getShieldPoolPDAs(programId2, mintForSOL);
         const merkleTreeAccount = await connection.getAccountInfo(merkleTree);
         if (!merkleTreeAccount) {
@@ -2409,17 +2190,10 @@ ${logs}`
     const feeBps = Math.ceil(protocolFee * 1e4 / note.amount);
     const distributableAmount = getDistributableAmount2(note.amount);
     validateTransfers(recipients, distributableAmount);
-    let merkleProof;
-    let merkleRoot;
-    if (note.merkleProof && note.root) {
-      merkleProof = {
-        pathElements: note.merkleProof.pathElements,
-        pathIndices: note.merkleProof.pathIndices
-      };
-      merkleRoot = note.root;
-    } else {
-      merkleProof = await this.indexer.getMerkleProof(note.leafIndex);
-      merkleRoot = merkleProof.root || (await this.indexer.getMerkleRoot()).root;
+    const merkleProof = await this.indexer.getMerkleProof(note.leafIndex);
+    const merkleRoot = merkleProof.root || (await this.indexer.getMerkleRoot()).root;
+    if (!merkleRoot) {
+      throw new Error("Failed to get Merkle root from indexer");
     }
     const nullifier = await computeNullifierAsync(note.sk_spend, note.leafIndex);
     const nullifierHex = nullifier.toString(16).padStart(64, "0");
@@ -2455,7 +2229,8 @@ ${logs}`
         throw new Error(`Merkle proof path element at position ${i} must be 64 hex characters (32 bytes)`);
       }
     }
-    const circuitsPath = typeof process !== "undefined" && process.env?.CIRCUITS_PATH || await getDefaultCircuitsPath();
+    const isBrowser = typeof window !== "undefined" || typeof globalThis !== "undefined" && globalThis.window;
+    const circuitsPath = isBrowser ? "/circuits" : typeof process !== "undefined" && process.env?.CIRCUITS_PATH || await getDefaultCircuitsPath();
     const useDirectProof = await areCircuitsAvailable(circuitsPath);
     let proofHex;
     let finalPublicInputs;
@@ -2492,6 +2267,13 @@ ${logs}`
       }
       const sk = splitTo2Limbs(sk_spend_bigint);
       const r = splitTo2Limbs(r_bigint);
+      const computedCommitment = await computeCommitment(amount_bigint, r_bigint, sk_spend_bigint);
+      const noteCommitment = BigInt("0x" + note.commitment);
+      if (computedCommitment !== noteCommitment) {
+        throw new Error(
+          `Commitment mismatch! Computed: ${computedCommitment.toString(16)}, Note: ${note.commitment}. This means the note's sk_spend, r, or amount doesn't match what was deposited.`
+        );
+      }
       const proofInputs = {
         root: root_bigint,
         nullifier: nullifier_bigint,
@@ -2510,7 +2292,9 @@ ${logs}`
         var_fee: varFee,
         rem
       };
+      options?.onProgress?.("proof_generating");
       const proofResult = await generateWithdrawRegularProof(proofInputs, circuitsPath);
+      options?.onProgress?.("proof_complete");
       proofHex = Buffer.from(proofResult.proofBytes).toString("hex");
       finalPublicInputs = {
         root: merkleRoot,
@@ -2519,43 +2303,9 @@ ${logs}`
         amount: note.amount
       };
     } else {
-      const proofInputs = {
-        privateInputs: {
-          amount: note.amount,
-          r: note.r,
-          sk_spend: note.sk_spend,
-          leaf_index: note.leafIndex,
-          merkle_path: {
-            path_elements: merkleProof.pathElements,
-            path_indices: merkleProof.pathIndices
-          }
-        },
-        publicInputs: {
-          root: merkleRoot,
-          nf: nullifierHex,
-          outputs_hash: outputsHashHex,
-          amount: note.amount
-        },
-        outputs: recipients.map((r) => ({
-          address: r.recipient.toBase58(),
-          amount: r.amount
-        }))
-      };
-      const proofResult = await this.artifactProver.generateProof(proofInputs, {
-        onProgress: options?.onProofProgress,
-        onError: options?.onProgress ? (error) => options.onProgress?.(`Proof generation error: ${error}`) : void 0
-      });
-      if (!proofResult.success || !proofResult.proof) {
-        let errorMessage = proofResult.error || "Proof generation failed";
-        if (errorMessage.startsWith("Proof generation failed: ")) {
-          errorMessage = errorMessage.substring("Proof generation failed: ".length);
-        }
-        errorMessage += `
-Note details: leafIndex=${note.leafIndex}, root=${merkleRoot.slice(0, 16)}..., nullifier=${nullifierHex.slice(0, 16)}...`;
-        throw new Error(errorMessage);
-      }
-      proofHex = proofResult.proof;
-      finalPublicInputs = proofInputs.publicInputs;
+      throw new Error(
+        `Circuits not available at ${circuitsPath}. Make sure circuits are built and accessible. In browser, circuits should be served from /circuits. In Node.js, set CIRCUITS_PATH environment variable or ensure circuits are in the expected location.`
+      );
     }
     const signature = await this.relay.submitWithdraw(
       {
@@ -2710,35 +2460,32 @@ Note details: leafIndex=${note.leafIndex}, root=${merkleRoot.slice(0, 16)}..., n
         );
       }
       let recipientAta;
-      try {
-        const splTokenModule = await import("@solana/spl-token");
-        const getAssociatedTokenAddress = splTokenModule.getAssociatedTokenAddress;
-        if (!getAssociatedTokenAddress) {
-          throw new Error("getAssociatedTokenAddress not found");
+      if (options.recipientAta) {
+        recipientAta = new PublicKey4(options.recipientAta);
+      } else {
+        try {
+          const splTokenModule = await import("@solana/spl-token");
+          const getAssociatedTokenAddress = splTokenModule.getAssociatedTokenAddress;
+          if (!getAssociatedTokenAddress) {
+            throw new Error("getAssociatedTokenAddress not found");
+          }
+          const outputMint2 = new PublicKey4(options.outputMint);
+          recipientAta = await getAssociatedTokenAddress(outputMint2, recipient);
+        } catch (error) {
+          throw new Error(
+            `Failed to get associated token account: ${error instanceof Error ? error.message : String(error)}. Please install @solana/spl-token or provide recipientAta in options.`
+          );
         }
-        const outputMint2 = new PublicKey5(options.outputMint);
-        recipientAta = await getAssociatedTokenAddress(outputMint2, recipient);
-      } catch (error) {
-        throw new Error(
-          `Failed to get associated token account: ${error instanceof Error ? error.message : String(error)}. Please install @solana/spl-token or provide recipientAta in options.`
-        );
       }
-      let merkleProof;
-      let merkleRoot;
-      if (note.merkleProof && note.root) {
-        merkleProof = {
-          pathElements: note.merkleProof.pathElements,
-          pathIndices: note.merkleProof.pathIndices
-        };
-        merkleRoot = note.root;
-      } else {
-        merkleProof = await this.indexer.getMerkleProof(note.leafIndex);
-        merkleRoot = merkleProof.root || (await this.indexer.getMerkleRoot()).root;
+      const merkleProof = await this.indexer.getMerkleProof(note.leafIndex);
+      const merkleRoot = merkleProof.root || (await this.indexer.getMerkleRoot()).root;
+      if (!merkleRoot) {
+        throw new Error("Failed to get Merkle root from indexer");
       }
       const nullifier = await computeNullifierAsync(note.sk_spend, note.leafIndex);
       const nullifierHex = nullifier.toString(16).padStart(64, "0");
-      const inputMint = new PublicKey5("11111111111111111111111111111111");
-      const outputMint = new PublicKey5(options.outputMint);
+      const inputMint = new PublicKey4("11111111111111111111111111111111");
+      const outputMint = new PublicKey4(options.outputMint);
       const outputsHash = await computeSwapOutputsHashAsync(
         inputMint,
         outputMint,
@@ -2753,7 +2500,8 @@ Note details: leafIndex=${note.leafIndex}, root=${merkleRoot.slice(0, 16)}..., n
       if (!merkleProof.pathElements || merkleProof.pathElements.length === 0) {
         throw new Error("Merkle proof is invalid: missing path elements");
       }
-      const circuitsPath = typeof process !== "undefined" && process.env?.CIRCUITS_PATH || await getDefaultCircuitsPath();
+      const envCircuitsPath = typeof window !== "undefined" ? typeof process !== "undefined" && process.env?.NEXT_PUBLIC_CIRCUITS_PATH || void 0 : typeof process !== "undefined" && process.env?.CIRCUITS_PATH || void 0;
+      const circuitsPath = envCircuitsPath || await getDefaultCircuitsPath();
       const useDirectProof = await areCircuitsAvailable(circuitsPath);
       let proofHex;
       let finalPublicInputs;
@@ -2768,6 +2516,13 @@ Note details: leafIndex=${note.leafIndex}, root=${merkleRoot.slice(0, 16)}..., n
         const inputMintLimbs = pubkeyToLimbs(inputMint.toBytes());
         const outputMintLimbs = pubkeyToLimbs(outputMint.toBytes());
         const recipientAtaLimbs = pubkeyToLimbs(recipientAta.toBytes());
+        const computedCommitment = await computeCommitment(amount_bigint, r_bigint, sk_spend_bigint);
+        const noteCommitment = BigInt("0x" + note.commitment);
+        if (computedCommitment !== noteCommitment) {
+          throw new Error(
+            `Commitment mismatch! Computed: ${computedCommitment.toString(16)}, Note: ${note.commitment}. This means the note's sk_spend, r, or amount doesn't match what was deposited.`
+          );
+        }
         const t = amount_bigint * 5n;
         const varFee = t / 1000n;
         const rem = t % 1000n;
@@ -2789,7 +2544,9 @@ Note details: leafIndex=${note.leafIndex}, root=${merkleRoot.slice(0, 16)}..., n
           var_fee: varFee,
           rem
         };
+        options?.onProgress?.("proof_generating");
         const proofResult = await generateWithdrawSwapProof(proofInputs, circuitsPath);
+        options?.onProgress?.("proof_complete");
         proofHex = Buffer.from(proofResult.proofBytes).toString("hex");
         finalPublicInputs = {
           root: merkleRoot,
@@ -2798,46 +2555,9 @@ Note details: leafIndex=${note.leafIndex}, root=${merkleRoot.slice(0, 16)}..., n
           amount: note.amount
         };
       } else {
-        const proofInputs = {
-          privateInputs: {
-            amount: note.amount,
-            r: note.r,
-            sk_spend: note.sk_spend,
-            leaf_index: note.leafIndex,
-            merkle_path: {
-              path_elements: merkleProof.pathElements,
-              path_indices: merkleProof.pathIndices
-            }
-          },
-          publicInputs: {
-            root: merkleRoot,
-            nf: nullifierHex,
-            outputs_hash: outputsHashHex,
-            amount: note.amount
-          },
-          outputs: [],
-          // Empty for swaps
-          swapParams: {
-            output_mint: options.outputMint,
-            recipient_ata: recipientAta.toBase58(),
-            min_output_amount: minOutputAmount
-          }
-        };
-        const proofResult = await this.artifactProver.generateProof(proofInputs, {
-          onProgress: options.onProofProgress,
-          onError: options.onProgress ? (error) => options.onProgress?.(`Proof generation error: ${error}`) : void 0
-        });
-        if (!proofResult.success || !proofResult.proof) {
-          let errorMessage = proofResult.error || "Proof generation failed";
-          if (errorMessage.startsWith("Proof generation failed: ")) {
-            errorMessage = errorMessage.substring("Proof generation failed: ".length);
-          }
-          errorMessage += `
-Note details: leafIndex=${note.leafIndex}, root=${merkleRoot.slice(0, 16)}..., nullifier=${nullifierHex.slice(0, 16)}...`;
-          throw new Error(errorMessage);
-        }
-        proofHex = proofResult.proof;
-        finalPublicInputs = proofInputs.publicInputs;
+        throw new Error(
+          `Circuits not available at ${circuitsPath}. Make sure circuits are built and accessible. In browser, circuits should be served from /circuits. In Node.js, set CIRCUITS_PATH environment variable or ensure circuits are in the expected location.`
+        );
       }
       const signature = await this.relay.submitSwap(
         {
@@ -3346,188 +3066,6 @@ function formatErrorForLogging(error) {
   return String(error);
 }
 
-// src/services/ProverService.ts
-var ProverService = class {
-  /**
-   * Create a new Prover Service client
-   *
-   * @param indexerUrl - Indexer/Prover service base URL
-   * @param timeout - Proof generation timeout in ms (default: 5 minutes)
-   */
-  constructor(indexerUrl, timeout = 5 * 60 * 1e3) {
-    this.indexerUrl = indexerUrl.replace(/\/$/, "");
-    this.timeout = timeout;
-  }
-  /**
-   * Generate a zero-knowledge proof for withdrawal
-   *
-   * This process typically takes 30-180 seconds depending on the backend.
-   *
-   * @param inputs - Circuit inputs (private + public + outputs)
-   * @param options - Optional progress tracking and callbacks
-   * @returns Proof result with hex-encoded proof and public inputs
-   *
-   * @example
-   * ```typescript
-   * const result = await prover.generateProof(inputs);
-   * if (result.success) {
-   *   console.log(`Proof: ${result.proof}`);
-   * }
-   * ```
-   * 
-   * @example
-   * ```typescript
-   * // With progress tracking
-   * const result = await prover.generateProof(inputs, {
-   *   onProgress: (progress) => console.log(`Progress: ${progress}%`),
-   *   onStart: () => console.log("Starting proof generation..."),
-   *   onSuccess: (result) => console.log("Proof generated!"),
-   *   onError: (error) => console.error("Failed:", error)
-   * });
-   * ```
-   */
-  async generateProof(inputs, options) {
-    const startTime = Date.now();
-    const actualTimeout = options?.timeout || this.timeout;
-    options?.onStart?.();
-    let progressInterval;
-    try {
-      const requestBody = {
-        private_inputs: JSON.stringify(inputs.privateInputs),
-        public_inputs: JSON.stringify(inputs.publicInputs),
-        outputs: JSON.stringify(inputs.outputs)
-      };
-      if (inputs.swapParams) {
-        requestBody.swap_params = inputs.swapParams;
-      }
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), actualTimeout);
-      if (options?.onProgress) {
-        let progress = 0;
-        progressInterval = setInterval(() => {
-          progress = Math.min(90, progress + Math.random() * 10);
-          options.onProgress(Math.floor(progress));
-        }, 2e3);
-      }
-      const response = await fetch(`${this.indexerUrl}/api/v1/prove`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(requestBody),
-        signal: controller.signal
-      });
-      clearTimeout(timeoutId);
-      if (progressInterval) clearInterval(progressInterval);
-      if (!response.ok) {
-        let errorMessage = `${response.status} ${response.statusText}`;
-        try {
-          const errorText = await response.text();
-          try {
-            const errorJson = JSON.parse(errorText);
-            errorMessage = errorJson.error || errorJson.message || errorText;
-          } catch {
-            errorMessage = errorText || errorMessage;
-          }
-        } catch {
-        }
-        options?.onError?.(errorMessage);
-        return {
-          success: false,
-          generationTimeMs: Date.now() - startTime,
-          error: errorMessage
-        };
-      }
-      options?.onProgress?.(100);
-      const rawData = await response.json();
-      const result = {
-        success: rawData.success,
-        proof: rawData.proof,
-        publicInputs: rawData.public_inputs,
-        // Map snake_case
-        generationTimeMs: rawData.generation_time_ms || Date.now() - startTime,
-        error: rawData.error
-      };
-      if (!result.success && rawData.execution_report) {
-      }
-      if (!result.success && result.error) {
-        try {
-          const errorObj = typeof result.error === "string" ? JSON.parse(result.error) : result.error;
-          if (errorObj?.error && typeof errorObj.error === "string") {
-            result.error = errorObj.error;
-          } else if (typeof errorObj === "string") {
-            result.error = errorObj;
-          }
-          if (errorObj?.execution_report && typeof errorObj.execution_report === "string") {
-            result.error += `
-Execution report: ${errorObj.execution_report}`;
-          }
-          if (errorObj?.total_cycles !== void 0) {
-            result.error += `
-Total cycles: ${errorObj.total_cycles}`;
-          }
-          if (errorObj?.total_syscalls !== void 0) {
-            result.error += `
-Total syscalls: ${errorObj.total_syscalls}`;
-          }
-        } catch {
-        }
-      }
-      if (result.success) {
-        options?.onSuccess?.(result);
-      } else if (result.error) {
-        options?.onError?.(result.error);
-      }
-      return result;
-    } catch (error) {
-      const totalTime = Date.now() - startTime;
-      if (progressInterval) clearInterval(progressInterval);
-      let errorMessage;
-      if (error instanceof Error && error.name === "AbortError") {
-        errorMessage = `Proof generation timed out after ${actualTimeout}ms`;
-      } else {
-        errorMessage = error instanceof Error ? error.message : "Unknown error occurred";
-      }
-      options?.onError?.(errorMessage);
-      return {
-        success: false,
-        generationTimeMs: totalTime,
-        error: errorMessage
-      };
-    }
-  }
-  /**
-   * Check if the prover service is available
-   *
-   * @returns True if service is healthy
-   */
-  async healthCheck() {
-    try {
-      const response = await fetch(`${this.indexerUrl}/health`, {
-        method: "GET"
-      });
-      return response.ok;
-    } catch {
-      return false;
-    }
-  }
-  /**
-   * Get the configured timeout
-   */
-  getTimeout() {
-    return this.timeout;
-  }
-  /**
-   * Set a new timeout
-   */
-  setTimeout(timeout) {
-    if (timeout <= 0) {
-      throw new Error("Timeout must be positive");
-    }
-    this.timeout = timeout;
-  }
-};
-
 // src/helpers/wallet-integration.ts
 import {
   Keypair as Keypair2
@@ -3605,7 +3143,6 @@ function keypairToAdapter(keypair) {
 // src/index.ts
 var VERSION = "1.0.0";
 export {
-  ArtifactProverService,
   CLOAK_PROGRAM_ID,
   CloakError,
   CloakSDK,
@@ -3615,7 +3152,6 @@ export {
   LAMPORTS_PER_SOL,
   LocalStorageAdapter,
   MemoryStorageAdapter,
-  ProverService,
   RelayService,
   VARIABLE_FEE_RATE,
   VERSION,