@interest-protocol/vortex-sdk 4.1.0 → 4.3.0

package/dist/utils/deposit.d.ts

@@ -1,8 +1,8 @@
 import { Transaction } from '@mysten/sui/transactions';
 import { Utxo } from '../entities/utxo';
+import { GetMerklePathFn } from '../vortex.types';
 import { Vortex } from '../vortex';
 import { VortexKeypair as VortexKeypairType } from '../entities/keypair';
-import { MerkleTree } from 'fixed-merkle-tree';
 import { VortexPool } from '../vortex.types';
 interface PrepareDepositProofArgs {
     tx: Transaction;
@@ -12,11 +12,12 @@ interface PrepareDepositProofArgs {
     vortexSdk: Vortex;
     vortexKeypair: VortexKeypairType;
     vortexPool: string | VortexPool;
-    merkleTree: MerkleTree;
+    root: bigint;
+    getMerklePathFn: GetMerklePathFn;
     relayer: string;
     relayerFee: bigint;
 }
-export declare const prepareDepositProof: ({ tx, amount, accountSecret, unspentUtxos, vortexSdk, vortexKeypair, vortexPool, merkleTree, relayer, relayerFee, }: PrepareDepositProofArgs) => Promise<{
+export declare const prepareDepositProof: ({ tx, amount, accountSecret, unspentUtxos, vortexSdk, vortexKeypair, vortexPool, root, getMerklePathFn, relayer, relayerFee, }: PrepareDepositProofArgs) => Promise<{
     extData: import("@mysten/sui/dist/cjs/transactions").TransactionResult;
     tx: Transaction;
     moveProof: import("@mysten/sui/dist/cjs/transactions").TransactionResult;

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

@@ -1 +1 @@
-{"version":3,"file":"deposit.d.ts","sourceRoot":"","sources":["../../src/utils/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIvD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAKxC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,UAAU,uBAAuB;IAC/B,EAAE,EAAE,WAAW,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,IAAI,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,iBAAiB,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;IAChC,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,mBAAmB,GAAU,qHAWvC,uBAAuB;;;;;;;;EAyHzB,CAAC"}
+{"version":3,"file":"deposit.d.ts","sourceRoot":"","sources":["../../src/utils/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAIvD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGxC,OAAO,EAAiB,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,aAAa,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAEzE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,UAAU,uBAAuB;IAC/B,EAAE,EAAE,WAAW,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,IAAI,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,iBAAiB,CAAC;IACjC,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,eAAe,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,mBAAmB,GAAU,gIAYvC,uBAAuB;;;;;;;;EA+HzB,CAAC"}

package/dist/utils/index.d.ts

@@ -2,10 +2,13 @@ import { MerkleTree } from 'fixed-merkle-tree';
 import { Utxo } from '../entities/utxo';
 import { VortexKeypair } from '../entities/keypair';
 import { SuiObjectData } from '@mysten/sui/client';
-export declare function getMerklePath(merkleTree: MerkleTree, utxo: Utxo | null): [string, string][];
+export type MerklePath = [string, string][];
+export declare function getMerklePath(merkleTree: MerkleTree, utxo: Utxo | null): MerklePath;
 interface ToProveInputArgs {
     vortexObjectId: string;
-    merkleTree: MerkleTree;
+    root: bigint;
+    merklePath0: MerklePath;
+    merklePath1: MerklePath;
     publicAmount: bigint;
     nullifier0: bigint;
     nullifier1: bigint;
@@ -18,7 +21,7 @@ interface ToProveInputArgs {
     outputUtxo1: Utxo;
     accountSecret: bigint;
 }
-export declare const toProveInput: ({ merkleTree, publicAmount, nullifier0, nullifier1, commitment0, commitment1, vortexKeypair, inputUtxo0, inputUtxo1, outputUtxo0, outputUtxo1, vortexObjectId, accountSecret, }: ToProveInputArgs) => {
+export declare const toProveInput: ({ root, merklePath0, merklePath1, publicAmount, nullifier0, nullifier1, commitment0, commitment1, vortexKeypair, inputUtxo0, inputUtxo1, outputUtxo0, outputUtxo1, vortexObjectId, accountSecret, }: ToProveInputArgs) => {
     vortex: bigint;
     root: bigint;
     publicAmount: bigint;
@@ -36,8 +39,8 @@ export declare const toProveInput: ({ merkleTree, publicAmount, nullifier0, null
     inBlinding1: bigint;
     inPathIndex0: bigint;
     inPathIndex1: bigint;
-    merklePath0: [string, string][];
-    merklePath1: [string, string][];
+    merklePath0: MerklePath;
+    merklePath1: MerklePath;
     outPublicKey0: string;
     outPublicKey1: string;
     outAmount0: bigint;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAKnD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,IAAI,GAAG,IAAI,GAChB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAkEpB;AAED,UAAU,gBAAgB;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,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;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,YAAY,GAAI,iLAc1B,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;CAiClB,CAAC;AAQF,eAAO,MAAM,eAAe,GAAI,MAAM,aAAa;;;;;;;CAelD,CAAC;AAEF,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;AAGpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAKnD,MAAM,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAE5C,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,IAAI,GAAG,IAAI,GAChB,UAAU,CAkEZ;AAED,UAAU,gBAAgB;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,UAAU,CAAC;IACxB,WAAW,EAAE,UAAU,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,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;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,YAAY,GAAI,qMAgB1B,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;CAiClB,CAAC;AAQF,eAAO,MAAM,eAAe,GAAI,MAAM,aAAa;;;;;;;CAelD,CAAC;AAEF,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC"}

package/dist/utils/withdraw.d.ts

@@ -1,22 +1,23 @@
 import { Transaction } from '@mysten/sui/transactions';
 import { Utxo } from '../entities/utxo';
 import { VortexKeypair } from '../entities/keypair';
+import { GetMerklePathFn } from '../vortex.types';
 import { Vortex } from '../vortex';
-import { MerkleTree } from 'fixed-merkle-tree';
 interface PrepareWithdrawArgs {
     tx?: Transaction;
     amount: bigint;
     unspentUtxos: Utxo[];
     vortexPool: string | any;
     vortexKeypair: VortexKeypair;
-    merkleTree: MerkleTree;
+    root: bigint;
+    getMerklePathFn: GetMerklePathFn;
     recipient: string;
     relayer: string;
     relayerFee: bigint;
     vortexSdk: Vortex;
     accountSecret: bigint;
 }
-export declare const prepareWithdraw: ({ tx, amount, unspentUtxos, vortexPool, vortexKeypair, merkleTree, recipient, relayer, relayerFee, vortexSdk, accountSecret, }: PrepareWithdrawArgs) => Promise<{
+export declare const prepareWithdraw: ({ tx, amount, unspentUtxos, vortexPool, vortexKeypair, root, getMerklePathFn, recipient, relayer, relayerFee, vortexSdk, accountSecret, }: PrepareWithdrawArgs) => Promise<{
     tx: Transaction;
     moveProof: import("@mysten/sui/dist/cjs/transactions").TransactionResult;
     extData: import("@mysten/sui/dist/cjs/transactions").TransactionResult;

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

@@ -1 +1 @@
-{"version":3,"file":"withdraw.d.ts","sourceRoot":"","sources":["../../src/utils/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAUpD,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,UAAU,mBAAmB;IAC3B,EAAE,CAAC,EAAE,WAAW,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,IAAI,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,eAAe,GAAU,gIAYnC,mBAAmB;;;;;EA2HrB,CAAC"}
+{"version":3,"file":"withdraw.d.ts","sourceRoot":"","sources":["../../src/utils/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AASpD,OAAO,EAAiB,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,UAAU,mBAAmB;IAC3B,EAAE,CAAC,EAAE,WAAW,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,IAAI,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,GAAG,GAAG,CAAC;IACzB,aAAa,EAAE,aAAa,CAAC;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,eAAO,MAAM,eAAe,GAAU,2IAanC,mBAAmB;;;;;EAiIrB,CAAC"}

package/dist/vortex.types.d.ts

@@ -2,13 +2,14 @@ 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 'fixed-merkle-tree';
 import { Utxo } from './entities/utxo';
-import { CoinStruct } from '@mysten/sui/dist/cjs/client';
+import { CoinStruct } from '@mysten/sui/client';
+import { MerklePath } from './utils';
 export declare enum Action {
     Deposit = 0,
     Withdraw = 1
 }
+export type GetMerklePathFn = (utxo: Utxo | null) => Promise<MerklePath>;
 export interface RegisterArgs extends MaybeTx {
     encryptionKey: string;
 }
@@ -82,7 +83,8 @@ export interface DepositArgs extends MaybeTx {
     vortexSdk: Vortex;
     vortexPool: string | VortexPool;
     vortexKeypair: VortexKeypair;
-    merkleTree: MerkleTree;
+    root: bigint;
+    getMerklePathFn: GetMerklePathFn;
     unspentUtxos?: Utxo[];
     relayer?: string;
     relayerFee?: bigint;
@@ -91,7 +93,8 @@ export interface DepositWithAccountArgs extends MaybeTx {
     vortexSdk: Vortex;
     vortexPool: string | VortexPool;
     vortexKeypair: VortexKeypair;
-    merkleTree: MerkleTree;
+    root: bigint;
+    getMerklePathFn: GetMerklePathFn;
     unspentUtxos?: Utxo[];
     account: string;
     accountSecret: bigint;
@@ -105,7 +108,8 @@ export interface WithdrawArgs extends MaybeTx {
     unspentUtxos: Utxo[];
     vortexSdk: Vortex;
     vortexKeypair: VortexKeypair;
-    merkleTree: MerkleTree;
+    root: bigint;
+    getMerklePathFn: GetMerklePathFn;
     recipient: string;
     relayer: string;
     relayerFee: bigint;
@@ -114,7 +118,8 @@ export interface WithdrawWithAccountArgs extends MaybeTx {
     vortexSdk: Vortex;
     vortexPool: string | VortexPool;
     vortexKeypair: VortexKeypair;
-    merkleTree: MerkleTree;
+    root: bigint;
+    getMerklePathFn: GetMerklePathFn;
     unspentUtxos?: Utxo[];
     account: string;
     accountSecret: bigint;

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

@@ -1 +1 @@
-{"version":3,"file":"vortex.types.d.ts","sourceRoot":"","sources":["../src/vortex.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,oBAAY,MAAM;IAChB,OAAO,IAAA;IACP,QAAQ,IAAA;CACT;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO;IAC3C,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,KAAK;IACpB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IACvE,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,cAAe,SAAQ,OAAO;IAC7C,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,UAAU,CAAC;IAC7B,gBAAgB,EAAE,UAAU,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO;IAC3C,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;IAChC,WAAW,EAAE,UAAU,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,UAAU,YAAY;IACpB,KAAK,EAAE,cAAc,CAAC;IACtB,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO;IAC3C,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;IAChC,KAAK,EAAE,iBAAiB,CAAC;IACzB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,iBAAiB,GAAG,YAAY,CAAC;CAC3C;AAED,MAAM,WAAW,uBAAwB,SAAQ,OAAO;IACtD,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,KAAK,EAAE,iBAAiB,CAAC;IACzB,OAAO,EAAE,iBAAiB,CAAC;CAC5B;AAED,MAAM,WAAW,OAAQ,SAAQ,OAAO;IACtC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAY,SAAQ,OAAO;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,sBAAuB,SAAQ,OAAO;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,YAAa,SAAQ,OAAO;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;IAChC,YAAY,EAAE,IAAI,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,uBAAwB,SAAQ,OAAO;IACtD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,CAAC,EAAE,IAAI,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;CACjC;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,GAAG,UAAU,CAAC;CACjC;AAED,MAAM,WAAW,cAAe,SAAQ,OAAO;IAC7C,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,MAAM;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAe,SAAQ,OAAO;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB"}
+{"version":3,"file":"vortex.types.d.ts","sourceRoot":"","sources":["../src/vortex.types.ts"],"names":[],"mappings":"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"}

package/dist/withdraw-with-account.d.ts

@@ -1,6 +1,6 @@
 import { Transaction } from '@mysten/sui/transactions';
 import { WithdrawWithAccountArgs } from './vortex.types';
-export declare const withdrawWithAccount: ({ tx, unspentUtxos, vortexPool, vortexKeypair, merkleTree, recipient, relayer, relayerFee, vortexSdk, account, accountSecret, amount, }: WithdrawWithAccountArgs) => Promise<{
+export declare const withdrawWithAccount: ({ tx, unspentUtxos, vortexPool, vortexKeypair, root, getMerklePathFn, recipient, relayer, relayerFee, vortexSdk, account, accountSecret, amount, }: WithdrawWithAccountArgs) => Promise<{
     tx: Transaction;
     coin: import("@mysten/sui/dist/cjs/transactions").TransactionResult;
 }>;

package/dist/withdraw-with-account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withdraw-with-account.d.ts","sourceRoot":"","sources":["../src/withdraw-with-account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAGzD,eAAO,MAAM,mBAAmB,GAAU,yIAavC,uBAAuB;;;EA4BzB,CAAC"}
+{"version":3,"file":"withdraw-with-account.d.ts","sourceRoot":"","sources":["../src/withdraw-with-account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAGzD,eAAO,MAAM,mBAAmB,GAAU,oJAcvC,uBAAuB;;;EA6BzB,CAAC"}

package/dist/withdraw.d.ts

@@ -1,6 +1,6 @@
 import { Transaction } from '@mysten/sui/transactions';
 import { WithdrawArgs } from './vortex.types';
-export declare const withdraw: ({ tx, amount, unspentUtxos, vortexPool, vortexKeypair, merkleTree, recipient, relayer, relayerFee, vortexSdk, }: WithdrawArgs) => Promise<{
+export declare const withdraw: ({ tx, amount, unspentUtxos, vortexPool, vortexKeypair, root, getMerklePathFn, recipient, relayer, relayerFee, vortexSdk, }: WithdrawArgs) => Promise<{
     tx: Transaction;
     coin: import("@mysten/sui/dist/cjs/transactions").TransactionResult;
 }>;

package/dist/withdraw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withdraw.d.ts","sourceRoot":"","sources":["../src/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,QAAQ,GAAU,iHAW5B,YAAY;;;EA6Bd,CAAC"}
+{"version":3,"file":"withdraw.d.ts","sourceRoot":"","sources":["../src/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,QAAQ,GAAU,4HAY5B,YAAY;;;EA8Bd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@interest-protocol/vortex-sdk",
-  "version": "4.1.0",
+  "version": "4.3.0",
   "description": "",
   "main": "index.js",
   "module": "./dist/index.mjs",

package/src/constants.ts

@@ -73,15 +73,15 @@ export const ERROR_CODES = {
 };
 
 export const VORTEX_PACKAGE_ID =
-  '0x866c91d28ee641d6a419e1431e9df918c701730fb45993883c75b107e7424bed';
+  '0x4d505443700db57e664f024b4cdfe315a6b80ddc4d6b9f1013c7b68682edd4ab';
 
 export const UPGRADE_CAP =
-  '0xea089918d682128c395e5ef469bfa091fb4c753ef9f24a4ce6dbaa1cbb4c16e6';
+  '0x6c4464ca68d4bcd0c0626dcbb7c2b7ec37cb65a6cc74ffb2c16cd8cff3184004';
 
 export const REGISTRY_OBJECT_ID =
-  '0x81b00cf5d31df30a5e01c9bfb179608746b29c856d1a5e4d50e83a0f6fa5ff45';
+  '0x58bde5ffed343073d012d28c6955a8ee50caaefd085196e837150bc810e996c0';
 
-export const INITIAL_SHARED_VERSION = '50';
+export const INITIAL_SHARED_VERSION = '4';
 
 export const LSK_FETCH_OFFSET = 'fetch_offset';
 
@@ -99,5 +99,5 @@ export const BASIS_POINTS = 10_000n;
 
 export const VORTEX_POOL_IDS = {
   [SUI_TYPE_ARG]:
-    '0x45a517f826fa18e2d9d189771feb5c5ba99d54448df35c926fbadc27f824f81b',
+    '0x1d8ddda4727146fd39f8181578ae71cd0f828039c68b4bfdba8a7499dda1d84d',
 };

package/src/deposit-with-account.ts

@@ -11,7 +11,8 @@ export const depositWithAccount = async ({
   vortexSdk,
   vortexKeypair,
   vortexPool,
-  merkleTree,
+  root,
+  getMerklePathFn,
   accountSecret,
   account,
   coinStructs,
@@ -31,7 +32,7 @@ export const depositWithAccount = async ({
 
   invariant(unspentUtxos.length <= 2, 'Unspent UTXOs must be at most 2');
   invariant(
-    BN254_FIELD_MODULUS > amount,
+    BN254_FIELD_MODULUS >= amount,
     'Amount must be less than field modulus'
   );
 
@@ -47,7 +48,8 @@ export const depositWithAccount = async ({
     vortexSdk,
     vortexKeypair,
     vortexPool,
-    merkleTree,
+    root,
+    getMerklePathFn,
     relayer,
     relayerFee,
   });

package/src/deposit.ts

@@ -12,7 +12,8 @@ export const deposit = async ({
   vortexSdk,
   vortexKeypair,
   vortexPool,
-  merkleTree,
+  root,
+  getMerklePathFn,
   relayer = normalizeSuiAddress('0x0'),
   relayerFee = 0n,
 }: DepositArgs) => {
@@ -36,7 +37,8 @@ export const deposit = async ({
     vortexSdk,
     vortexKeypair,
     vortexPool,
-    merkleTree,
+    root,
+    getMerklePathFn,
     relayer,
     relayerFee,
   });

package/src/entities/keypair.ts

@@ -197,6 +197,23 @@ export class VortexKeypair {
     };
   }
 
+  static encryptBigIntFor(
+    value: bigint,
+    recipientEncryptionKey: string
+  ): string {
+    // Convert BigInt to hex string, then to bytes
+    const hex = value.toString(16);
+    const hexPadded = hex.length % 2 === 0 ? hex : '0' + hex;
+    const bytes = Buffer.from(hexPadded, 'hex');
+    return VortexKeypair.encryptFor(bytes, recipientEncryptionKey);
+  }
+
+  decryptBigInt(encryptedData: string): bigint {
+    const decrypted = this.#decrypt(encryptedData);
+    const hex = decrypted.toString('hex');
+    return BigInt('0x' + hex);
+  }
+
   sign(commitment: bigint, merklePath: bigint): bigint {
     invariant(this.privateKey !== null, 'Cannot sign without private key');
     return poseidon3(this.privateKey, commitment, merklePath);

package/src/utils/deposit.ts

@@ -5,11 +5,11 @@ import { VortexKeypair } from '../entities/keypair';
 import { Utxo } from '../entities/utxo';
 import { fromHex, normalizeSuiAddress } from '@mysten/sui/utils';
 import { toProveInput } from '.';
-import { Proof, Action } from '../vortex.types';
+import { Proof, Action, GetMerklePathFn } from '../vortex.types';
 import { Ed25519Keypair } from '@mysten/sui/keypairs/ed25519';
 import { Vortex } from '../vortex';
 import { VortexKeypair as VortexKeypairType } from '../entities/keypair';
-import { MerkleTree } from 'fixed-merkle-tree';
+
 import { VortexPool } from '../vortex.types';
 
 interface PrepareDepositProofArgs {
@@ -20,7 +20,8 @@ interface PrepareDepositProofArgs {
   vortexSdk: Vortex;
   vortexKeypair: VortexKeypairType;
   vortexPool: string | VortexPool;
-  merkleTree: MerkleTree;
+  root: bigint;
+  getMerklePathFn: GetMerklePathFn;
   relayer: string;
   relayerFee: bigint;
 }
@@ -33,7 +34,8 @@ export const prepareDepositProof = async ({
   vortexSdk,
   vortexKeypair,
   vortexPool,
-  merkleTree,
+  root,
+  getMerklePathFn,
   relayer,
   relayerFee,
 }: PrepareDepositProofArgs) => {
@@ -65,7 +67,11 @@ export const prepareDepositProof = async ({
           vortexPool: vortexObjectId,
         });
 
-  const nextIndex = await vortexSdk.nextIndex(vortexPool);
+  const [nextIndex, merklePath0, merklePath1] = await Promise.all([
+    vortexSdk.nextIndex(vortexPool),
+    getMerklePathFn(inputUtxo0),
+    getMerklePathFn(inputUtxo1),
+  ]);
 
   // Calculate output UTXO0 amount: if using unspent UTXOs, include their amounts
   const outputUtxo0 = new Utxo({
@@ -105,7 +111,9 @@ export const prepareDepositProof = async ({
   const input = toProveInput({
     vortexObjectId,
     accountSecret,
-    merkleTree,
+    root,
+    merklePath0,
+    merklePath1,
     publicAmount: amount - relayerFee,
     nullifier0,
     nullifier1,
@@ -139,7 +147,7 @@ export const prepareDepositProof = async ({
     tx: tx2,
     vortexPool,
     proofPoints: fromHex('0x' + proof.proofSerializedHex),
-    root: BigInt(merkleTree.root),
+    root,
     publicValue: amount - relayerFee,
     action: Action.Deposit,
     inputNullifier0: nullifier0,

package/src/utils/index.ts

@@ -1,8 +1,4 @@
-import {
-  normalizeSuiAddress,
-  toHex,
-  normalizeStructTag,
-} from '@mysten/sui/utils';
+import { normalizeSuiAddress, normalizeStructTag } from '@mysten/sui/utils';
 import invariant from 'tiny-invariant';
 import { MerkleTree } from 'fixed-merkle-tree';
 import { Utxo } from '../entities/utxo';
@@ -14,10 +10,12 @@ import { pathOr } from 'ramda';
 import { poseidon1 } from '../crypto';
 import { BN254_FIELD_MODULUS } from '../constants';
 
+export type MerklePath = [string, string][];
+
 export function getMerklePath(
   merkleTree: MerkleTree,
   utxo: Utxo | null
-): [string, string][] {
+): MerklePath {
   // Handle zero-amount UTXOs
   if (!utxo || utxo.amount === 0n) {
     return Array(MERKLE_TREE_HEIGHT)
@@ -87,7 +85,9 @@ export function getMerklePath(
 
 interface ToProveInputArgs {
   vortexObjectId: string;
-  merkleTree: MerkleTree;
+  root: bigint;
+  merklePath0: MerklePath;
+  merklePath1: MerklePath;
   publicAmount: bigint;
   nullifier0: bigint;
   nullifier1: bigint;
@@ -102,7 +102,9 @@ interface ToProveInputArgs {
 }
 
 export const toProveInput = ({
-  merkleTree,
+  root,
+  merklePath0,
+  merklePath1,
   publicAmount,
   nullifier0,
   nullifier1,
@@ -121,7 +123,7 @@ export const toProveInput = ({
       BigInt(
         normalizeSuiAddress(vortexObjectId, !vortexObjectId.startsWith('0x'))
       ) % BN254_FIELD_MODULUS,
-    root: BigInt(merkleTree.root),
+    root,
     publicAmount,
     inputNullifier0: nullifier0,
     inputNullifier1: nullifier1,
@@ -138,8 +140,8 @@ export const toProveInput = ({
     inBlinding1: inputUtxo1.blinding,
     inPathIndex0: inputUtxo0.index,
     inPathIndex1: inputUtxo1.index,
-    merklePath0: getMerklePath(merkleTree, inputUtxo0),
-    merklePath1: getMerklePath(merkleTree, inputUtxo1),
+    merklePath0,
+    merklePath1,
 
     outPublicKey0: vortexKeypair.publicKey,
     outPublicKey1: vortexKeypair.publicKey,

package/src/utils/withdraw.ts

@@ -9,9 +9,8 @@ import { fromHex } from '@mysten/sui/utils';
 import { toProveInput } from '../utils';
 import { BN254_FIELD_MODULUS } from '../constants';
 import { prove, verify } from '../utils';
-import { Proof, Action } from '../vortex.types';
+import { Proof, Action, GetMerklePathFn } from '../vortex.types';
 import { Vortex } from '../vortex';
-import { MerkleTree } from 'fixed-merkle-tree';
 
 interface PrepareWithdrawArgs {
   tx?: Transaction;
@@ -19,7 +18,8 @@ interface PrepareWithdrawArgs {
   unspentUtxos: Utxo[];
   vortexPool: string | any;
   vortexKeypair: VortexKeypair;
-  merkleTree: MerkleTree;
+  root: bigint;
+  getMerklePathFn: GetMerklePathFn;
   recipient: string;
   relayer: string;
   relayerFee: bigint;
@@ -33,7 +33,8 @@ export const prepareWithdraw = async ({
   unspentUtxos = [],
   vortexPool,
   vortexKeypair,
-  merkleTree,
+  root,
+  getMerklePathFn,
   recipient,
   relayer,
   relayerFee,
@@ -73,7 +74,11 @@ export const prepareWithdraw = async ({
 
   const changeAmount = totalWithdrawAmount - amount;
 
-  const nextIndex = await vortexSdk.nextIndex(vortexPool);
+  const [nextIndex, merklePath0, merklePath1] = await Promise.all([
+    vortexSdk.nextIndex(vortexPool),
+    getMerklePathFn(inputUtxo0),
+    getMerklePathFn(inputUtxo1),
+  ]);
 
   const outputUtxo0 = new Utxo({
     amount: changeAmount,
@@ -113,7 +118,9 @@ export const prepareWithdraw = async ({
   const input = toProveInput({
     vortexObjectId,
     accountSecret,
-    merkleTree,
+    root,
+    merklePath0,
+    merklePath1,
     publicAmount: BN254_FIELD_MODULUS - amount,
     nullifier0,
     nullifier1,
@@ -147,7 +154,7 @@ export const prepareWithdraw = async ({
     vortexPool,
     tx: tx2,
     proofPoints: fromHex('0x' + proof.proofSerializedHex),
-    root: BigInt(merkleTree.root),
+    root,
     publicValue: amount,
     action: Action.Withdraw,
     inputNullifier0: nullifier0,

package/src/vortex.types.ts

@@ -2,14 +2,17 @@ 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 'fixed-merkle-tree';
 import { Utxo } from './entities/utxo';
-import { CoinStruct } from '@mysten/sui/dist/cjs/client';
+import { CoinStruct } from '@mysten/sui/client';
+import { MerklePath } from './utils';
+
 export enum Action {
   Deposit,
   Withdraw,
 }
 
+export type GetMerklePathFn = (utxo: Utxo | null) => Promise<MerklePath>;
+
 export interface RegisterArgs extends MaybeTx {
   encryptionKey: string;
 }
@@ -94,7 +97,8 @@ export interface DepositArgs extends MaybeTx {
   vortexSdk: Vortex;
   vortexPool: string | VortexPool;
   vortexKeypair: VortexKeypair;
-  merkleTree: MerkleTree;
+  root: bigint;
+  getMerklePathFn: GetMerklePathFn;
   unspentUtxos?: Utxo[];
   relayer?: string;
   relayerFee?: bigint;
@@ -104,7 +108,8 @@ export interface DepositWithAccountArgs extends MaybeTx {
   vortexSdk: Vortex;
   vortexPool: string | VortexPool;
   vortexKeypair: VortexKeypair;
-  merkleTree: MerkleTree;
+  root: bigint;
+  getMerklePathFn: GetMerklePathFn;
   unspentUtxos?: Utxo[];
   account: string;
   accountSecret: bigint;
@@ -119,7 +124,8 @@ export interface WithdrawArgs extends MaybeTx {
   unspentUtxos: Utxo[];
   vortexSdk: Vortex;
   vortexKeypair: VortexKeypair;
-  merkleTree: MerkleTree;
+  root: bigint;
+  getMerklePathFn: GetMerklePathFn;
   recipient: string;
   relayer: string;
   relayerFee: bigint;
@@ -129,7 +135,8 @@ export interface WithdrawWithAccountArgs extends MaybeTx {
   vortexSdk: Vortex;
   vortexPool: string | VortexPool;
   vortexKeypair: VortexKeypair;
-  merkleTree: MerkleTree;
+  root: bigint;
+  getMerklePathFn: GetMerklePathFn;
   unspentUtxos?: Utxo[];
   account: string;
   accountSecret: bigint;

package/src/withdraw-with-account.ts

@@ -7,7 +7,8 @@ export const withdrawWithAccount = async ({
   unspentUtxos = [],
   vortexPool,
   vortexKeypair,
-  merkleTree,
+  root,
+  getMerklePathFn,
   recipient,
   relayer,
   relayerFee,
@@ -27,7 +28,8 @@ export const withdrawWithAccount = async ({
     unspentUtxos,
     vortexPool,
     vortexKeypair,
-    merkleTree,
+    root,
+    getMerklePathFn,
     recipient,
     relayer,
     relayerFee,

package/src/withdraw.ts

@@ -8,7 +8,8 @@ export const withdraw = async ({
   unspentUtxos = [],
   vortexPool,
   vortexKeypair,
-  merkleTree,
+  root,
+  getMerklePathFn,
   recipient,
   relayer,
   relayerFee,
@@ -25,7 +26,8 @@ export const withdraw = async ({
     unspentUtxos,
     vortexPool,
     vortexKeypair,
-    merkleTree,
+    root,
+    getMerklePathFn,
     recipient,
     relayer,
     relayerFee,