@ocash/sdk 0.1.2 → 0.1.4-rc.0

package/dist/node.cjs

@@ -7258,15 +7258,17 @@ var MerkleEngine = class _MerkleEngine {
         for (let i = 0; i < sorted.length; i++) {
           if (sorted[i].cid !== i) throw new Error(`Non-contiguous persisted merkle leaves: expected cid=${i}, got cid=${sorted[i].cid}`);
         }
-        const totalElements = BigInt(sorted.length);
-        const mergedElements = _MerkleEngine.totalElementsInTree(totalElements);
+        const storedTree = await this.storage?.getMerkleTree?.(chainId);
+        const leafCount = sorted.length;
+        const mergedFromLeaves = _MerkleEngine.totalElementsInTree(BigInt(leafCount));
+        const mergedFromTree = typeof storedTree?.totalElements === "number" && storedTree.totalElements > 0 ? storedTree.totalElements : 0;
+        const mergedElements = Math.max(mergedFromLeaves, mergedFromTree);
         const pending = this.ensurePendingLeaves(chainId);
         pending.length = 0;
         state.mergedElements = mergedElements;
-        if (sorted.length > mergedElements) {
+        if (leafCount > mergedElements) {
           pending.push(...sorted.slice(mergedElements).map((l) => l.commitment));
         }
-        const storedTree = await this.storage?.getMerkleTree?.(chainId);
         if (storedTree?.root) {
           state.root = _MerkleEngine.normalizeHex32(storedTree.root, "merkleTree.root");
         } else {
@@ -7316,7 +7318,10 @@ var MerkleEngine = class _MerkleEngine {
     if (!leaves.length) return;
     const sorted = [...leaves].sort((a, b) => a.index - b.index);
     const persistLeaves = sorted.map((l) => ({ cid: l.index, commitment: l.commitment }));
-    void this.storage?.appendMerkleLeaves?.(chainId, persistLeaves).catch(() => void 0);
+    try {
+      await this.storage?.appendMerkleLeaves?.(chainId, persistLeaves);
+    } catch {
+    }
     try {
       let expected = state.mergedElements + pending.length;
       for (const leaf of sorted) {