@ocash/sdk 0.1.4-rc.2 → 0.1.4-rc.4

package/dist/index.cjs

@@ -3419,7 +3419,7 @@ var MemoryStore = class {
   async getMerkleLeaf(chainId, cid) {
     const rows = this.merkleLeavesByChain.get(chainId);
     const row = rows?.[cid];
-    if (!row) return void 0;
+    if (!row || row.cid !== cid) return void 0;
     return { chainId, cid: row.cid, commitment: row.commitment };
   }
   /**
@@ -4436,7 +4436,7 @@ var KeyValueStore = class {
     if (!this.merkleLeafCids[String(chainId)]?.has(cid)) return void 0;
     const raw = await this.options.client.get(this.sharedRecordKey("merkleLeaves", chainId, cid));
     const row = this.parseJson(raw, null);
-    if (!row) return void 0;
+    if (!row || row.cid !== cid) return void 0;
     return { chainId, cid: row.cid, commitment: row.commitment };
   }
   async appendMerkleLeaves(chainId, leaves) {
@@ -5198,10 +5198,10 @@ var ProofEngine = class {
         merkle_root_index: parsed.merkle_root_index ?? context.merkle_root_index,
         relayer: parsed.relayer ?? context.relayer,
         recipient: parsed.recipient ?? context.recipient,
-        withdraw_amount: parsed.withdraw_amount ? BigInt(parsed.withdraw_amount) : context.withdraw_amount,
+        withdraw_amount: parsed.withdraw_amount != null ? BigInt(parsed.withdraw_amount) : context.withdraw_amount,
         extra_data: parsed.extra_data ?? context.extra_data,
-        relayer_fee: parsed.relayer_fee ? BigInt(parsed.relayer_fee) : context.relayer_fee,
-        gas_drop_value: parsed.gas_drop_value ? BigInt(parsed.gas_drop_value) : context.gas_drop_value,
+        relayer_fee: parsed.relayer_fee != null ? BigInt(parsed.relayer_fee) : context.relayer_fee,
+        gas_drop_value: parsed.gas_drop_value != null ? BigInt(parsed.gas_drop_value) : context.gas_drop_value,
         array_hash_digest: parsed.array_hash_digest ?? context.array_hash_digest,
         gnark_output: parsed.gnark_output,
         witness_json: parsed.witness_json,
@@ -6324,11 +6324,32 @@ var SyncEngine = class {
 };
 
 // src/planner/planner.ts
+var import_viem8 = require("viem");
+
+// src/utils/validators.ts
 var import_viem7 = require("viem");
 var requireHex = (value, name) => {
   if (isHexStrict(value, { minBytes: 1 })) return value;
   throw new SdkError("CONFIG", `${name} must be a hex string starting with 0x`);
 };
+var requireNumber = (value, name) => {
+  if (typeof value === "number" && Number.isFinite(value)) return value;
+  throw new SdkError("CONFIG", `${name} must be a finite number`);
+};
+var requireAddress = (value, name) => {
+  if (typeof value !== "string") {
+    throw new SdkError("CONFIG", `${name} must be a string address`);
+  }
+  return (0, import_viem7.getAddress)(value);
+};
+var requireBigint = (value, name) => {
+  if (typeof value === "bigint") return value;
+  if (typeof value === "string" && value.length) return BigInt(value);
+  if (typeof value === "number" && Number.isSafeInteger(value)) return BigInt(value);
+  throw new SdkError("CONFIG", `${name} must be a bigint-compatible value`);
+};
+
+// src/planner/planner.ts
 var parsePlanInput = (input) => {
   const action = input.action;
   if (action !== "transfer" && action !== "withdraw") {
@@ -6357,7 +6378,7 @@ var parsePlanInput = (input) => {
   if (gasDropValue != null && typeof gasDropValue !== "bigint") throw new SdkError("CONFIG", "gasDropValue must be bigint");
   return { action, chainId, assetId, amount, recipient, gasDropValue, payIncludesFee, relayerUrl: relayerUrl ?? void 0 };
 };
-var tokenFeeKey = (token) => (0, import_viem7.toHex)(BigInt(token.id), { size: 32 }).toLowerCase();
+var tokenFeeKey = (token) => (0, import_viem8.toHex)(BigInt(token.id), { size: 32 }).toLowerCase();
 var selectTransferInputs = (utxos, required, maxInputs = 3) => {
   const sorted = [...utxos].sort((a, b) => b.amount > a.amount ? 1 : b.amount < a.amount ? -1 : 0);
   const selected = [];
@@ -6397,7 +6418,7 @@ var recordsFee = (input, _records, expectedOutput, action, relayerFee, expectedI
       total = records.reduce((acc, cur) => acc + cur, 0n);
       fee = BigInt(feeCount) * relayerFee.transfer;
       relayFee = fee;
-      if (import_viem7.maxUint256 === expectedOutput) {
+      if (import_viem8.maxUint256 === expectedOutput) {
         cost = total;
         outputAmount = total - fee;
         if (outputAmount < 0n) {
@@ -6406,9 +6427,12 @@ var recordsFee = (input, _records, expectedOutput, action, relayerFee, expectedI
         }
       } else {
         cost = expectedIsWithFee ? expectedOutput : expectedOutput + fee;
+        outputAmount = expectedIsWithFee ? expectedOutput - fee : expectedOutput;
+        if (outputAmount < 0n) outputAmount = 0n;
       }
       if (total < cost) {
         cost = 0n;
+        outputAmount = 0n;
       }
       break;
     }
@@ -6419,7 +6443,7 @@ var recordsFee = (input, _records, expectedOutput, action, relayerFee, expectedI
       const withdrawFeeDenominator = bpsBase + withdrawFeeBps;
       total = records.reduce((acc, cur) => acc + cur, 0n);
       fee = BigInt(feeCount - 1) * relayerFee.transfer;
-      if (import_viem7.maxUint256 === expectedOutput) {
+      if (import_viem8.maxUint256 === expectedOutput) {
         const withdrawBase = (total - fee) * bpsBase / withdrawFeeDenominator;
         outputAmount = withdrawBase - relayFeePay;
         relayFee = fee + relayFeePay;
@@ -6490,7 +6514,7 @@ var estimateRecords = (input) => {
   const payRecords = [];
   let payInfo = recordsFee({ withdrawFeeBps: input.withdrawFeeBps }, [...payRecords], input.expectedOutput, input.action, input.relayerFee, input.expectedIsWithFee);
   const maxRecords = [];
-  let maxInfo = recordsFee({ withdrawFeeBps: input.withdrawFeeBps }, [...maxRecords], import_viem7.maxUint256, input.action, input.relayerFee, input.expectedIsWithFee);
+  let maxInfo = recordsFee({ withdrawFeeBps: input.withdrawFeeBps }, [...maxRecords], import_viem8.maxUint256, input.action, input.relayerFee, input.expectedIsWithFee);
   for (const record of sorted) {
     const isExceedPay = input.expectedIsWithFee ? payInfo.cost >= input.expectedOutput : payInfo.outputAmount >= input.expectedOutput;
     if (payInfo.cost === 0n || !isExceedPay) {
@@ -6498,7 +6522,7 @@ var estimateRecords = (input) => {
       payInfo = recordsFee({ withdrawFeeBps: input.withdrawFeeBps }, [...payRecords], input.expectedOutput, input.action, input.relayerFee, input.expectedIsWithFee);
     }
     maxRecords.push(record);
-    const tempMax = recordsFee({ withdrawFeeBps: input.withdrawFeeBps }, [...maxRecords], import_viem7.maxUint256, input.action, input.relayerFee, input.expectedIsWithFee);
+    const tempMax = recordsFee({ withdrawFeeBps: input.withdrawFeeBps }, [...maxRecords], import_viem8.maxUint256, input.action, input.relayerFee, input.expectedIsWithFee);
     if (maxInfo.cost === 0n || tempMax.outputAmount > maxInfo.outputAmount) {
       maxInfo = tempMax;
     }
@@ -6663,7 +6687,7 @@ var Planner = class {
     const records = utxos.map((u) => u.amount).filter((v) => v > 0n);
     const estimates = estimateRecords({
       records,
-      expectedOutput: import_viem7.maxUint256,
+      expectedOutput: import_viem8.maxUint256,
       action: input.action,
       relayerFee: { transfer: transferFee, withdraw: relayerFee },
       withdrawFeeBps: token.withdrawFeeBps,
@@ -6894,27 +6918,6 @@ var Planner = class {
 };
 
 // src/tx/txBuilder.ts
-var import_viem8 = require("viem");
-var requireNumber = (value, name) => {
-  if (typeof value === "number" && Number.isFinite(value)) return value;
-  throw new SdkError("CONFIG", `Missing ${name}`);
-};
-var requireHex2 = (value, name) => {
-  if (isHexStrict(value, { minBytes: 1 })) return value;
-  throw new SdkError("CONFIG", `Missing ${name}`);
-};
-var requireAddress = (value, name) => {
-  if (typeof value !== "string") {
-    throw new SdkError("CONFIG", `Missing ${name}`);
-  }
-  return (0, import_viem8.getAddress)(value);
-};
-var requireBigint = (value, name) => {
-  if (typeof value === "bigint") return value;
-  if (typeof value === "string" && value.length) return BigInt(value);
-  if (typeof value === "number" && Number.isSafeInteger(value)) return BigInt(value);
-  throw new SdkError("CONFIG", `Missing ${name}`);
-};
 var TxBuilder = class {
   /**
    * Build relayer request for transfer proofs.
@@ -6928,7 +6931,7 @@ var TxBuilder = class {
     if (!Array.isArray(extraData) || extraData.length !== 3) {
       throw new SdkError("CONFIG", "Transfer requires extra_data as bytes[3]");
     }
-    extraData.forEach((entry, idx) => requireHex2(entry, `extra_data[${idx}]`));
+    extraData.forEach((entry, idx) => requireHex(entry, `extra_data[${idx}]`));
     const request = {
       kind: "relayer",
       method: "POST",
@@ -6961,7 +6964,7 @@ var TxBuilder = class {
     if (Array.isArray(extraData)) {
       throw new SdkError("CONFIG", "Withdraw requires extra_data as bytes");
     }
-    const extraDataHex = requireHex2(extraData, "extra_data");
+    const extraDataHex = requireHex(extraData, "extra_data");
     const request = {
       kind: "relayer",
       method: "POST",
@@ -7362,7 +7365,7 @@ var MerkleEngine = class _MerkleEngine {
               const isZero = BigInt(onChainNorm) === 0n;
               if (!isZero && onChainNorm !== result.rootHash) {
                 const target = state.mergedElements;
-                await this.rollback(chainId, target);
+                await this._rollback(chainId, target);
                 throw new SdkError("MERKLE", "Local merkle root mismatch with on-chain root \u2014 rolled back", {
                   chainId,
                   rootIndex,
@@ -7395,21 +7398,31 @@ var MerkleEngine = class _MerkleEngine {
   }
   // ── Rollback (tree O(1) + sync cursor reset) ──
   /**
-   * Unified rollback: rewind tree to a previous batch boundary AND reset the
-   * sync cursor so memo sync restarts from the same point.
+   * Public rollback: step back one batch (32 elements) from the current position.
+   * Upper-layer code calls this on any error to reset and retry.
    *
    * What gets rolled back:
    * - ChairmanMerkle tree version pointer (O(1) — old nodes still in storage)
    * - Pending leaves buffer (cleared)
    * - Sync cursor: memo + merkle fields (nullifier left unchanged — independent)
    *
+   * @returns true if rollback succeeded, false if already at 0 or target version doesn't exist.
+   */
+  async rollback(chainId) {
+    const state = this.ensureChainState(chainId);
+    const target = Math.max(0, state.mergedElements - SUBTREE_SIZE);
+    return this._rollback(chainId, target);
+  }
+  /**
+   * Internal rollback to an exact batch boundary.
+   *
    * @param targetMergedElements Must be a non-negative multiple of 32.
    *   Pass 0 to reset to the empty tree.
    * @returns true if rollback succeeded, false if the target version doesn't exist.
    */
-  async rollback(chainId, targetMergedElements) {
+  async _rollback(chainId, targetMergedElements) {
     if (targetMergedElements < 0 || targetMergedElements % SUBTREE_SIZE !== 0) {
-      throw new SdkError("MERKLE", "rollback target must be a non-negative multiple of 32", { targetMergedElements });
+      throw new SdkError("MERKLE", "_rollback target must be a non-negative multiple of 32", { targetMergedElements });
     }
     const state = this.ensureChainState(chainId);
     const pending = this.ensurePendingLeaves(chainId);
@@ -7460,44 +7473,64 @@ var MerkleEngine = class _MerkleEngine {
     await this.hydrateFromStorage(input.chainId);
     const canUseLocal = this.mode !== "remote";
     if (canUseLocal) {
-      const version = contractTreeElements > 0 ? await this.storage?.getChairmanMerkleVersion?.(input.chainId, contractTreeElements) : void 0;
-      const hasDb = typeof this.storage?.getMerkleLeaf === "function" && typeof this.storage?.getChairmanMerkleNode === "function" && (contractTreeElements === 0 || !!version);
-      if (hasDb) {
+      const hasMerkleLeaf = typeof this.storage?.getMerkleLeaf === "function";
+      const hasChairmanNode = typeof this.storage?.getChairmanMerkleNode === "function";
+      if (hasMerkleLeaf && hasChairmanNode) {
         const state = this.ensureChainState(input.chainId);
-        if (contractTreeElements > 0 && state.mergedElements < contractTreeElements) {
-          if (this.mode === "local") {
-            throw new SdkError("MERKLE", "Local merkle db is behind contract", {
-              chainId: input.chainId,
-              cids,
-              localMergedElements: state.mergedElements,
-              contractTreeElements
-            });
-          }
-        } else {
-          try {
-            const proof = [];
-            for (const cid of cids) {
-              if (cid >= contractTreeElements) {
-                proof.push({ leaf_index: cid, path: new Array(this.treeDepth + 1).fill("0") });
-                continue;
-              }
-              const path = await this.buildLocalProofPath(input.chainId, cid, version);
-              proof.push({ leaf_index: cid, path });
+        let version = contractTreeElements > 0 ? await this.storage?.getChairmanMerkleVersion?.(input.chainId, contractTreeElements) : void 0;
+        let effectiveTreeElements = contractTreeElements;
+        if (!version && contractTreeElements > 0 && state.mergedElements > 0) {
+          const latest = await this.storage?.getLatestChairmanMerkleVersion?.(input.chainId);
+          if (latest && latest.version > 0) {
+            const allCovered = needsTreeProof.every((cid) => cid < latest.version);
+            if (allCovered) {
+              version = latest;
+              effectiveTreeElements = latest.version;
             }
-            const effectiveRoot = contractTreeElements > 0 ? _MerkleEngine.normalizeHex32(version.rootHash, "version.rootHash") : getZeroHash(this.treeDepth);
-            return {
-              proof,
-              merkle_root: effectiveRoot,
-              latest_cid: totalElements > 0n ? Number(totalElements - 1n) : -1
-            };
-          } catch (error) {
+          }
+        }
+        const hasDb = contractTreeElements === 0 || !!version;
+        if (hasDb) {
+          if (effectiveTreeElements > 0 && state.mergedElements < effectiveTreeElements) {
             if (this.mode === "local") {
-              throw new SdkError("MERKLE", "Local merkle proof build failed", { chainId: input.chainId, cids }, error);
+              throw new SdkError("MERKLE", "Local merkle db is behind contract", {
+                chainId: input.chainId,
+                cids,
+                localMergedElements: state.mergedElements,
+                contractTreeElements: effectiveTreeElements
+              });
+            }
+          } else {
+            try {
+              const proof = [];
+              for (const cid of cids) {
+                if (cid >= effectiveTreeElements) {
+                  proof.push({ leaf_index: cid, path: new Array(this.treeDepth + 1).fill("0") });
+                  continue;
+                }
+                const path = await this.buildLocalProofPath(input.chainId, cid, version);
+                proof.push({ leaf_index: cid, path });
+              }
+              const effectiveRoot = effectiveTreeElements > 0 ? _MerkleEngine.normalizeHex32(version.rootHash, "version.rootHash") : getZeroHash(this.treeDepth);
+              const effectiveLatestCid = effectiveTreeElements > 0 ? effectiveTreeElements - 1 : -1;
+              return {
+                proof,
+                merkle_root: effectiveRoot,
+                latest_cid: effectiveLatestCid
+              };
+            } catch (error) {
+              if (this.mode === "local") {
+                throw new SdkError("MERKLE", "Local merkle proof build failed", { chainId: input.chainId, cids }, error);
+              }
             }
           }
+        } else {
+          if (this.mode === "local" && needsTreeProof.length) {
+            throw new SdkError("MERKLE", "Local merkle db unavailable", { chainId: input.chainId, cids, reason: "missing_adapter_or_version" });
+          }
         }
       } else if (this.mode === "local" && needsTreeProof.length) {
-        throw new SdkError("MERKLE", "Local merkle db unavailable", { chainId: input.chainId, cids, reason: "missing_adapter_or_version" });
+        throw new SdkError("MERKLE", "Local merkle db unavailable", { chainId: input.chainId, cids, reason: "missing_adapter" });
       }
     }
     if (needsTreeProof.length === 0) {