@interest-protocol/vortex-sdk 2.0.0 → 3.0.1

package/dist/utils/index.d.ts

@@ -1,4 +1,4 @@
-import { MerkleTree } from '../entities/merkle-tree';
+import { MerkleTree } from 'fixed-merkle-tree';
 import { Utxo } from '../entities/utxo';
 import { VortexKeypair } from '../entities/keypair';
 export declare const reverseBytes: (bytes: Uint8Array) => Uint8Array;

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD,eAAO,MAAM,YAAY,GAAI,OAAO,UAAU,KAAG,UAMhD,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,OAAO,UAAU,KAAG,MAEjD,CAAC;AAEF,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,IAAI,GAAG,IAAI,GAChB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAkEpB;AAED,UAAU,gBAAgB;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;IACjB,WAAW,EAAE,IAAI,CAAC;IAClB,WAAW,EAAE,IAAI,CAAC;CACnB;AAED,eAAO,MAAM,YAAY,GAAI,+JAa1B,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;CA2BlB,CAAC;AAEF,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAIpD,eAAO,MAAM,YAAY,GAAI,OAAO,UAAU,KAAG,UAMhD,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,OAAO,UAAU,KAAG,MAEjD,CAAC;AAEF,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,IAAI,GAAG,IAAI,GAChB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAkEpB;AAED,UAAU,gBAAgB;IACxB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,IAAI,CAAC;IACjB,WAAW,EAAE,IAAI,CAAC;IAClB,WAAW,EAAE,IAAI,CAAC;CACnB;AAED,eAAO,MAAM,YAAY,GAAI,+JAa1B,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;CA2BlB,CAAC;AAEF,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}

package/dist/vortex.types.d.ts

@@ -2,7 +2,7 @@ import { MaybeTx } from '@interest-protocol/sui-core-sdk';
 import { TransactionResult } from '@mysten/sui/transactions';
 import { Vortex } from './vortex';
 import { VortexKeypair } from './entities/keypair';
-import { MerkleTree } from './entities/merkle-tree';
+import { MerkleTree } from 'fixed-merkle-tree';
 import { Utxo } from './entities/utxo';
 export declare enum Action {
     Deposit = 0,

package/dist/vortex.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vortex.types.d.ts","sourceRoot":"","sources":["../src/vortex.types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"vortex.types.d.ts","sourceRoot":"","sources":["../src/vortex.types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interest-protocol/vortex-sdk",
-  "version": "2.0.0",
+  "version": "3.0.1",
   "description": "",
   "main": "index.js",
   "module": "./dist/index.mjs",
@@ -23,6 +23,7 @@
     "@noble/hashes": "^2.0.1",
     "@polymedia/suitcase-core": "^0.0.67",
     "bn.js": "^5.2.2",
+    "fixed-merkle-tree": "^0.7.3",
     "ramda": "^0.30.1",
     "tiny-invariant": "^1.3.3",
     "@interest-protocol/sui-core-sdk": "1.0.0"

package/src/deposit.ts

@@ -140,7 +140,7 @@ export const deposit = async ({
   const { proof: moveProof, tx: tx3 } = vortex.newProof({
     tx: tx2,
     proofPoints: fromHex('0x' + proof.proofSerializedHex),
-    root: merkleTree.root(),
+    root: BigInt(merkleTree.root),
     publicValue: amountMinusFrontendFee,
     action: Action.Deposit,
     extDataHash: extDataHashBigInt,

package/src/entities/merkle-tree.ts

@@ -1,256 +1,14 @@
 // packages/vortex/src/entities/merkle-tree.ts
 
-import {
-  ZERO_VALUE,
-  EMPTY_SUBTREE_HASHES,
-  MERKLE_TREE_HEIGHT,
-} from '../constants';
+import { ZERO_VALUE, MERKLE_TREE_HEIGHT } from '../constants';
 import { poseidon2 } from '../crypto';
+import { Element, MerkleTree as FixedMerkleTree } from 'fixed-merkle-tree';
 
-/**
- * Sparse Merkle tree using Tornado Cash Nova's paired insertion strategy.
- * Inserts two leaves at once for better efficiency and privacy.
- */
-export class MerkleTree {
-  levels: number;
-  capacity: number;
-  zeroElement: bigint;
+export const buildMerkleTree = () =>
+  new FixedMerkleTree(MERKLE_TREE_HEIGHT, [], {
+    hashFunction: (left: Element, right: Element) =>
+      poseidon2(BigInt(left), BigInt(right)).toString(),
+    zeroElement: ZERO_VALUE.toString(),
+  });
 
-  private zeros: bigint[];
-  private subtrees: bigint[]; // filledSubtrees in Tornado Nova (indices 0..levels-1)
-  private _nextIndex: number;
-  private leaves: bigint[];
-  private _root: bigint;
-
-  constructor(levels: number) {
-    this.levels = levels;
-    this.capacity = 2 ** levels;
-    this.zeroElement = ZERO_VALUE;
-    this.zeros = [];
-    this.subtrees = [];
-    this._nextIndex = 0;
-    this.leaves = [];
-
-    // Initialize zero hashes (0 to levels, inclusive)
-    // We need levels+1 elements: zeros[0] through zeros[levels]
-    for (let i = 0; i <= levels; i++) {
-      this.zeros[i] = EMPTY_SUBTREE_HASHES[i];
-    }
-
-    // Initialize subtrees[0..levels-1] (matching Nova's filledSubtrees)
-    // subtrees[0] is initialized but never used (Nova quirk)
-    for (let i = 0; i < levels; i++) {
-      this.subtrees[i] = this.zeros[i];
-    }
-
-    // Empty root is zeros[levels]
-    this._root = this.zeros[levels];
-  }
-
-  /**
-   * Returns the current Merkle root
-   */
-  root(): bigint {
-    return this._root;
-  }
-
-  /**
-   * Insert elements in bulk (must be even number for pairing)
-   */
-  bulkInsert(elements: bigint[]) {
-    if (elements.length % 2 !== 0) {
-      throw new Error('Must insert even number of elements (pairs)');
-    }
-
-    for (let i = 0; i < elements.length; i += 2) {
-      this.insertPair(elements[i], elements[i + 1]);
-    }
-  }
-
-  /**
-   * Insert a pair of leaves (Nova style)
-   * This is the primary insertion method
-   */
-  insertPair(leaf1: bigint, leaf2: bigint) {
-    if (this._nextIndex >= this.capacity) {
-      throw new Error('Merkle tree is full. No more leaves can be added');
-    }
-
-    // Store both leaves
-    this.leaves.push(leaf1, leaf2);
-
-    // Start by hashing the pair (level 0)
-    let currentIndex = Math.floor(this._nextIndex / 2);
-    let currentLevelHash = poseidon2(leaf1, leaf2);
-
-    // Increment by 2 since we're inserting a pair
-    this._nextIndex += 2;
-
-    // Process levels 1 to levels-1 (matching Nova: for i = 1; i < levels)
-    for (let i = 1; i < this.levels; i++) {
-      let left: bigint;
-      let right: bigint;
-
-      if (currentIndex % 2 === 0) {
-        // Current is left child
-        left = currentLevelHash;
-        right = this.zeros[i];
-        this.subtrees[i] = currentLevelHash; // Cache left subtree
-      } else {
-        // Current is right child
-        left = this.subtrees[i]; // Get cached left subtree
-        right = currentLevelHash;
-      }
-
-      currentLevelHash = poseidon2(left, right);
-      currentIndex = Math.floor(currentIndex / 2);
-    }
-
-    // Update root
-    this._root = currentLevelHash;
-  }
-
-  /**
-   * Insert a single leaf (for backward compatibility)
-   * Pairs it with a zero leaf
-   */
-  insert(leaf: bigint) {
-    this.insertPair(leaf, this.zeros[0]);
-  }
-
-  /**
-   * Generate Merkle path for a leaf at given index
-   * Returns sibling hashes and indices for verification
-   */
-  path(index: number): { pathElements: bigint[]; pathIndices: number[] } {
-    if (index < 0 || index >= this._nextIndex) {
-      throw new Error(
-        `Index out of bounds: ${index} (tree has ${this._nextIndex} leaves)`
-      );
-    }
-
-    const pathElements: bigint[] = [];
-    const pathIndices: number[] = [];
-
-    // Level 0: Get sibling leaf
-    const isLeftAtLevel0 = index % 2 === 0;
-    pathIndices.push(isLeftAtLevel0 ? 0 : 1);
-
-    const siblingIndex = isLeftAtLevel0 ? index + 1 : index - 1;
-    const sibling =
-      siblingIndex < this._nextIndex
-        ? this.leaves[siblingIndex]
-        : this.zeros[0];
-    pathElements.push(sibling);
-
-    // Levels 1 to levels-1 (matching Nova's loop structure)
-    let currentIndex = Math.floor(index / 2);
-    for (let i = 1; i < this.levels; i++) {
-      const isLeft = currentIndex % 2 === 0;
-      pathIndices.push(isLeft ? 0 : 1);
-
-      if (isLeft) {
-        // We're left child, sibling is right (zero hash)
-        pathElements.push(this.zeros[i]);
-      } else {
-        // We're right child, sibling is the cached left subtree
-        pathElements.push(this.subtrees[i]);
-      }
-
-      currentIndex = Math.floor(currentIndex / 2);
-    }
-
-    return { pathElements, pathIndices };
-  }
-
-  /**
-   * Get all leaves in the tree
-   */
-  elements(): bigint[] {
-    return this.leaves;
-  }
-
-  /**
-   * Find the index of a specific leaf
-   */
-  indexOf(element: bigint, comparator: Function | null = null): number {
-    if (comparator) {
-      return this.leaves.findIndex((leaf) => comparator(element, leaf));
-    }
-    return this.leaves.findIndex((leaf) => leaf === element);
-  }
-
-  /**
-   * Serialize tree state
-   */
-  serialize() {
-    return {
-      levels: this.levels,
-      zeros: this.zeros,
-      subtrees: this.subtrees,
-      nextIndex: this._nextIndex,
-      leaves: this.leaves,
-      root: this._root,
-    };
-  }
-
-  /**
-   * Verify a Merkle path is valid for a given leaf and root
-   */
-  verify(
-    leaf: bigint,
-    pathElements: bigint[],
-    pathIndices: number[],
-    root: bigint
-  ): boolean {
-    if (
-      pathElements.length !== this.levels ||
-      pathIndices.length !== this.levels
-    ) {
-      return false;
-    }
-
-    let currentHash = leaf;
-
-    for (let i = 0; i < this.levels; i++) {
-      const sibling = pathElements[i];
-      const isLeft = pathIndices[i] === 0;
-
-      if (isLeft) {
-        currentHash = poseidon2(currentHash, sibling);
-      } else {
-        currentHash = poseidon2(sibling, currentHash);
-      }
-    }
-
-    return currentHash === root;
-  }
-
-  /**
-   * Get the current number of leaves in the tree
-   */
-  get nextIndex(): number {
-    return this._nextIndex;
-  }
-
-  /**
-   * Check if the tree is full
-   */
-  isFull(): boolean {
-    return this._nextIndex >= this.capacity;
-  }
-
-  /**
-   * Get the maximum capacity of the tree
-   */
-  getCapacity(): number {
-    return this.capacity;
-  }
-
-  /**
-   * Get the current fill percentage
-   */
-  getFillPercentage(): number {
-    return (this._nextIndex / this.capacity) * 100;
-  }
-}
+export type MerkleTree = FixedMerkleTree;

package/src/utils/index.ts

@@ -1,6 +1,6 @@
 import { toHex } from '@mysten/sui/utils';
 import invariant from 'tiny-invariant';
-import { MerkleTree } from '../entities/merkle-tree';
+import { MerkleTree } from 'fixed-merkle-tree';
 import { Utxo } from '../entities/utxo';
 import { VortexKeypair } from '../entities/keypair';
 import { ZERO_VALUE, MERKLE_TREE_HEIGHT } from '../constants';
@@ -30,7 +30,7 @@ export function getMerklePath(
   }
 
   const utxoIndex = Number(utxo.index);
-  const treeSize = merkleTree.elements().length;
+  const treeSize = merkleTree.elements.length;
 
   // For deposits, input UTXOs don't exist yet
   if (utxoIndex < 0 || utxoIndex >= treeSize) {
@@ -44,7 +44,7 @@ export function getMerklePath(
   const commitment = utxo.commitment();
 
   // Verify commitment matches what's in the tree
-  const storedCommitment = merkleTree.elements()[utxoIndex]!;
+  const storedCommitment = BigInt(merkleTree.elements[utxoIndex]!);
 
   invariant(
     storedCommitment === commitment,
@@ -56,7 +56,7 @@ export function getMerklePath(
   let currentHash = commitment;
 
   for (let i = 0; i < MERKLE_TREE_HEIGHT; i++) {
-    const sibling = pathElements[i];
+    const sibling = BigInt(pathElements[i]!);
     const isLeft = pathIndices[i] === 0;
 
     invariant(sibling !== undefined, `Sibling undefined at level ${i}`);
@@ -79,7 +79,7 @@ export function getMerklePath(
   }
 
   const calculatedRoot = currentHash;
-  const expectedRoot = merkleTree.root();
+  const expectedRoot = BigInt(merkleTree.root);
 
   invariant(
     calculatedRoot === expectedRoot,
@@ -119,7 +119,7 @@ export const toProveInput = ({
   outputUtxo1,
 }: ToProveInputArgs) => {
   return {
-    root: merkleTree.root(),
+    root: BigInt(merkleTree.root),
     publicAmount,
     extDataHash,
     inputNullifier0: nullifier0,

package/src/vortex.types.ts

@@ -2,7 +2,7 @@ import { MaybeTx } from '@interest-protocol/sui-core-sdk';
 import { TransactionResult } from '@mysten/sui/transactions';
 import { Vortex } from './vortex';
 import { VortexKeypair } from './entities/keypair';
-import { MerkleTree } from './entities/merkle-tree';
+import { MerkleTree } from 'fixed-merkle-tree';
 import { Utxo } from './entities/utxo';
 
 export enum Action {

package/src/withdraw.ts

@@ -136,7 +136,7 @@ export const withdraw = async ({
   const { proof: moveProof, tx: tx3 } = vortex.newProof({
     tx: tx2,
     proofPoints: fromHex('0x' + proof.proofSerializedHex),
-    root: merkleTree.root(),
+    root: BigInt(merkleTree.root),
     publicValue: amount + relayerFee,
     action: Action.Withdraw,
     extDataHash: extDataHashBigInt,

package/dist/__tests__/vortex.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=vortex.test.d.ts.map

package/dist/__tests__/vortex.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"vortex.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/vortex.test.ts"],"names":[],"mappings":""}

package/src/__tests__/vortex.test.ts

@@ -1,25 +0,0 @@
-import { testVortex } from './test-utils';
-import { MERKLE_TREE_HEIGHT, EMPTY_SUBTREE_HASHES } from '../constants';
-
-describe('Vortex', () => {
-  it('should get the TVL', async () => {
-    const tvl = await testVortex.tvl();
-    expect(tvl).toBe(0n);
-  });
-
-  it('should get the root', async () => {
-    const root = await testVortex.root();
-    expect(root).toBe(String(EMPTY_SUBTREE_HASHES[MERKLE_TREE_HEIGHT]));
-  });
-
-  it('should get the next index', async () => {
-    const nextIndex = await testVortex.nextIndex();
-    expect(nextIndex).toBe('0');
-  });
-
-  it('should check if a nullifier is spent', async () => {
-    const nullifier = 12345n;
-    const isNullifierSpent = await testVortex.isNullifierSpent(nullifier);
-    expect(isNullifierSpent).toBe(false);
-  });
-});