@interest-protocol/vortex-sdk 4.1.0 → 4.3.0

package/dist/constants.d.ts

@@ -26,10 +26,10 @@ export declare const ERROR_CODES: {
     13: string;
     14: string;
 };
-export declare const VORTEX_PACKAGE_ID = "0x866c91d28ee641d6a419e1431e9df918c701730fb45993883c75b107e7424bed";
-export declare const UPGRADE_CAP = "0xea089918d682128c395e5ef469bfa091fb4c753ef9f24a4ce6dbaa1cbb4c16e6";
-export declare const REGISTRY_OBJECT_ID = "0x81b00cf5d31df30a5e01c9bfb179608746b29c856d1a5e4d50e83a0f6fa5ff45";
-export declare const INITIAL_SHARED_VERSION = "50";
+export declare const VORTEX_PACKAGE_ID = "0x4d505443700db57e664f024b4cdfe315a6b80ddc4d6b9f1013c7b68682edd4ab";
+export declare const UPGRADE_CAP = "0x6c4464ca68d4bcd0c0626dcbb7c2b7ec37cb65a6cc74ffb2c16cd8cff3184004";
+export declare const REGISTRY_OBJECT_ID = "0x58bde5ffed343073d012d28c6955a8ee50caaefd085196e837150bc810e996c0";
+export declare const INITIAL_SHARED_VERSION = "4";
 export declare const LSK_FETCH_OFFSET = "fetch_offset";
 export declare const LSK_ENCRYPTED_OUTPUTS = "encrypted_outputs";
 export declare const VORTEX_SIGNATURE_DOMAIN = "VORTEXFI.XYZ";

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB,iFACgD,CAAC;AAGjF,eAAO,MAAM,UAAU,iFACyD,CAAC;AAEjF,eAAO,MAAM,gBAAgB,iFAAa,CAAC;AAE3C,eAAO,MAAM,oBAAoB,UAiChC,CAAC;AAEF,oBAAY,OAAO;IACjB,OAAO,oBAAoB;IAC3B,KAAK,iBAAiB;IACtB,MAAM,WAAW;CAClB;AAED,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;CAgBvB,CAAC;AAEF,eAAO,MAAM,iBAAiB,uEACwC,CAAC;AAEvE,eAAO,MAAM,WAAW,uEAC8C,CAAC;AAEvE,eAAO,MAAM,kBAAkB,uEACuC,CAAC;AAEvE,eAAO,MAAM,sBAAsB,OAAO,CAAC;AAE3C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,eAAO,MAAM,qBAAqB,sBAAsB,CAAC;AAEzD,eAAO,MAAM,uBAAuB,iBAAiB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,uEACyC,CAAC;AAGvE,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAE/C,eAAO,MAAM,YAAY,SAAU,CAAC;AAEpC,eAAO,MAAM,eAAe;;CAG3B,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,mBAAmB,iFACgD,CAAC;AAGjF,eAAO,MAAM,UAAU,iFACyD,CAAC;AAEjF,eAAO,MAAM,gBAAgB,iFAAa,CAAC;AAE3C,eAAO,MAAM,oBAAoB,UAiChC,CAAC;AAEF,oBAAY,OAAO;IACjB,OAAO,oBAAoB;IAC3B,KAAK,iBAAiB;IACtB,MAAM,WAAW;CAClB;AAED,eAAO,MAAM,iBAAiB,MAAM,CAAC;AAErC,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;CAgBvB,CAAC;AAEF,eAAO,MAAM,iBAAiB,uEACwC,CAAC;AAEvE,eAAO,MAAM,WAAW,uEAC8C,CAAC;AAEvE,eAAO,MAAM,kBAAkB,uEACuC,CAAC;AAEvE,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAE1C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,eAAO,MAAM,qBAAqB,sBAAsB,CAAC;AAEzD,eAAO,MAAM,uBAAuB,iBAAiB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,uEACyC,CAAC;AAGvE,eAAO,MAAM,2BAA2B,MAAM,CAAC;AAE/C,eAAO,MAAM,YAAY,SAAU,CAAC;AAEpC,eAAO,MAAM,eAAe;;CAG3B,CAAC"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"deposit-with-account.d.ts","sourceRoot":"","sources":["../src/deposit-with-account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAIxD,eAAO,MAAM,kBAAkB,GAAU,mIAYtC,sBAAsB;;;EA2CxB,CAAC"}
+{"version":3,"file":"deposit-with-account.d.ts","sourceRoot":"","sources":["../src/deposit-with-account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAIxD,eAAO,MAAM,kBAAkB,GAAU,8IAatC,sBAAsB;;;EA4CxB,CAAC"}

package/dist/deposit.d.ts

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

package/dist/deposit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deposit.d.ts","sourceRoot":"","sources":["../src/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,eAAO,MAAM,OAAO,GAAU,sGAU3B,WAAW;;;EAmCb,CAAC"}
+{"version":3,"file":"deposit.d.ts","sourceRoot":"","sources":["../src/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAI7C,eAAO,MAAM,OAAO,GAAU,iHAW3B,WAAW;;;EAoCb,CAAC"}

package/dist/entities/keypair.d.ts

@@ -22,6 +22,8 @@ export declare class VortexKeypair {
     static encryptFor(bytes: Buffer, recipientEncryptionKey: string): string;
     static encryptUtxoFor(utxo: UtxoPayload, recipientEncryptionKey: string): string;
     decryptUtxo(encryptedData: string): UtxoPayload;
+    static encryptBigIntFor(value: bigint, recipientEncryptionKey: string): string;
+    decryptBigInt(encryptedData: string): bigint;
     sign(commitment: bigint, merklePath: bigint): bigint;
     toString(): string;
     address(): string;

package/dist/entities/keypair.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keypair.d.ts","sourceRoot":"","sources":["../../src/entities/keypair.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAUD,KAAK,aAAa,GAAG,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AAwCH,qBAAa,aAAa;;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,gBAAgB,CAAoB;gBAEhC,UAAU,EAAE,MAAM;IAgB9B,MAAM,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa;IAM3D,MAAM,CAAC,QAAQ,IAAI,aAAa;IAUhC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;WAkBhC,aAAa,CACxB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,aAAa,GACzB,OAAO,CAAC,aAAa,CAAC;IAgBzB,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,GAAG,MAAM;IA8BxE,MAAM,CAAC,cAAc,CACnB,IAAI,EAAE,WAAW,EACjB,sBAAsB,EAAE,MAAM,GAC7B,MAAM;IAMT,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,WAAW;IAe/C,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAKpD,QAAQ,IAAI,MAAM;IAMlB,OAAO,IAAI,MAAM;CAsDlB"}
+{"version":3,"file":"keypair.d.ts","sourceRoot":"","sources":["../../src/entities/keypair.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AAUD,KAAK,aAAa,GAAG,CAAC,OAAO,EAAE,UAAU,KAAK,OAAO,CAAC;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC,CAAC;AAwCH,qBAAa,aAAa;;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,gBAAgB,CAAoB;gBAEhC,UAAU,EAAE,MAAM;IAgB9B,MAAM,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa;IAM3D,MAAM,CAAC,QAAQ,IAAI,aAAa;IAUhC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa;WAkBhC,aAAa,CACxB,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,aAAa,GACzB,OAAO,CAAC,aAAa,CAAC;IAgBzB,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE,MAAM,GAAG,MAAM;IA8BxE,MAAM,CAAC,cAAc,CACnB,IAAI,EAAE,WAAW,EACjB,sBAAsB,EAAE,MAAM,GAC7B,MAAM;IAMT,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,WAAW;IAe/C,MAAM,CAAC,gBAAgB,CACrB,KAAK,EAAE,MAAM,EACb,sBAAsB,EAAE,MAAM,GAC7B,MAAM;IAQT,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM;IAM5C,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAKpD,QAAQ,IAAI,MAAM;IAMlB,OAAO,IAAI,MAAM;CAsDlB"}

package/dist/index.js

@@ -3372,10 +3372,10 @@ const ERROR_CODES = {
     13: 'Invalid relayer',
     14: 'Invalid output flag',
 };
-const VORTEX_PACKAGE_ID = '0x866c91d28ee641d6a419e1431e9df918c701730fb45993883c75b107e7424bed';
-const UPGRADE_CAP = '0xea089918d682128c395e5ef469bfa091fb4c753ef9f24a4ce6dbaa1cbb4c16e6';
-const REGISTRY_OBJECT_ID = '0x81b00cf5d31df30a5e01c9bfb179608746b29c856d1a5e4d50e83a0f6fa5ff45';
-const INITIAL_SHARED_VERSION = '50';
+const VORTEX_PACKAGE_ID = '0x4d505443700db57e664f024b4cdfe315a6b80ddc4d6b9f1013c7b68682edd4ab';
+const UPGRADE_CAP = '0x6c4464ca68d4bcd0c0626dcbb7c2b7ec37cb65a6cc74ffb2c16cd8cff3184004';
+const REGISTRY_OBJECT_ID = '0x58bde5ffed343073d012d28c6955a8ee50caaefd085196e837150bc810e996c0';
+const INITIAL_SHARED_VERSION = '4';
 const LSK_FETCH_OFFSET = 'fetch_offset';
 const LSK_ENCRYPTED_OUTPUTS = 'encrypted_outputs';
 const VORTEX_SIGNATURE_DOMAIN = 'VORTEXFI.XYZ';
@@ -3384,7 +3384,7 @@ const TREASURY_ADDRESS = '0x894261575b948c035d002adc3ca4d73c683c01a1bfafac183870
 const DEPOSIT_FEE_IN_BASIS_POINTS = 50n;
 const BASIS_POINTS = 10000n;
 const VORTEX_POOL_IDS = {
-    [SUI_TYPE_ARG]: '0x45a517f826fa18e2d9d189771feb5c5ba99d54448df35c926fbadc27f824f81b',
+    [SUI_TYPE_ARG]: '0x1d8ddda4727146fd39f8181578ae71cd0f828039c68b4bfdba8a7499dda1d84d',
 };
 
 /******************************************************************************
@@ -39122,6 +39122,18 @@ class VortexKeypair {
             vortexPool: normalizeSuiAddress(parts[3]),
         };
     }
+    static encryptBigIntFor(value, recipientEncryptionKey) {
+        // 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) {
+        const decrypted = __classPrivateFieldGet(this, _VortexKeypair_instances, "m", _VortexKeypair_decrypt).call(this, encryptedData);
+        const hex = decrypted.toString('hex');
+        return BigInt('0x' + hex);
+    }
     sign(commitment, merklePath) {
         invariant(this.privateKey !== null, 'Cannot sign without private key');
         return poseidon3(this.privateKey, commitment, merklePath);
@@ -39258,10 +39270,10 @@ function getMerklePath(merkleTree, utxo) {
     invariant(calculatedRoot === expectedRoot, `Root mismatch: calculated ${calculatedRoot}, expected ${expectedRoot}`);
     return wasmPath;
 }
-const toProveInput = ({ merkleTree, publicAmount, nullifier0, nullifier1, commitment0, commitment1, vortexKeypair, inputUtxo0, inputUtxo1, outputUtxo0, outputUtxo1, vortexObjectId, accountSecret, }) => {
+const toProveInput = ({ root, merklePath0, merklePath1, publicAmount, nullifier0, nullifier1, commitment0, commitment1, vortexKeypair, inputUtxo0, inputUtxo1, outputUtxo0, outputUtxo1, vortexObjectId, accountSecret, }) => {
     return {
         vortex: BigInt(normalizeSuiAddress(vortexObjectId, !vortexObjectId.startsWith('0x'))) % BN254_FIELD_MODULUS,
-        root: BigInt(merkleTree.root),
+        root,
         publicAmount,
         inputNullifier0: nullifier0,
         inputNullifier1: nullifier1,
@@ -39277,8 +39289,8 @@ const toProveInput = ({ merkleTree, publicAmount, nullifier0, nullifier1, commit
         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,
         outAmount0: outputUtxo0.amount,
@@ -39596,7 +39608,7 @@ const buildMerkleTree = () => new fixedMerkleTree.MerkleTree(MERKLE_TREE_HEIGHT,
     zeroElement: ZERO_VALUE.toString(),
 });
 
-const prepareDepositProof = async ({ tx, amount, accountSecret, unspentUtxos, vortexSdk, vortexKeypair, vortexPool, merkleTree, relayer, relayerFee, }) => {
+const prepareDepositProof = async ({ tx, amount, accountSecret, unspentUtxos, vortexSdk, vortexKeypair, vortexPool, root, getMerklePathFn, relayer, relayerFee, }) => {
     const vortexObjectId = typeof vortexPool === 'string' ? vortexPool : vortexPool.objectId;
     // Deposits we do not need a recipient, so we use a random one.
     const randomRecipient = normalizeSuiAddress(Ed25519Keypair.generate().toSuiAddress());
@@ -39616,7 +39628,11 @@ const prepareDepositProof = async ({ tx, amount, accountSecret, unspentUtxos, vo
             keypair: vortexKeypair,
             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({
         amount: amount + inputUtxo0.amount + inputUtxo1.amount - relayerFee,
@@ -39644,7 +39660,9 @@ const prepareDepositProof = async ({ tx, amount, accountSecret, unspentUtxos, vo
     const input = toProveInput({
         vortexObjectId,
         accountSecret,
-        merkleTree,
+        root,
+        merklePath0,
+        merklePath1,
         publicAmount: amount - relayerFee,
         nullifier0,
         nullifier1,
@@ -39673,7 +39691,7 @@ const prepareDepositProof = async ({ tx, amount, accountSecret, unspentUtxos, vo
         tx: tx2,
         vortexPool,
         proofPoints: fromHex('0x' + proof.proofSerializedHex),
-        root: BigInt(merkleTree.root),
+        root,
         publicValue: amount - relayerFee,
         action: exports.Action.Deposit,
         inputNullifier0: nullifier0,
@@ -39692,7 +39710,7 @@ const prepareDepositProof = async ({ tx, amount, accountSecret, unspentUtxos, vo
     };
 };
 
-const deposit = async ({ tx = new Transaction(), amount, unspentUtxos = [], vortexSdk, vortexKeypair, vortexPool, merkleTree, relayer = normalizeSuiAddress('0x0'), relayerFee = 0n, }) => {
+const deposit = async ({ tx = new Transaction(), amount, unspentUtxos = [], vortexSdk, vortexKeypair, vortexPool, root, getMerklePathFn, relayer = normalizeSuiAddress('0x0'), relayerFee = 0n, }) => {
     invariant(unspentUtxos.length <= 2, 'Unspent UTXOs must be at most 2');
     invariant(BN254_FIELD_MODULUS > amount, 'Amount must be less than field modulus');
     const accountSecret = 0n;
@@ -39704,7 +39722,8 @@ const deposit = async ({ tx = new Transaction(), amount, unspentUtxos = [], vort
         vortexSdk,
         vortexKeypair,
         vortexPool,
-        merkleTree,
+        root,
+        getMerklePathFn,
         relayer,
         relayerFee,
     });
@@ -39718,7 +39737,7 @@ const deposit = async ({ tx = new Transaction(), amount, unspentUtxos = [], vort
     });
 };
 
-const prepareWithdraw = async ({ tx = new Transaction(), amount, unspentUtxos = [], vortexPool, vortexKeypair, merkleTree, recipient, relayer, relayerFee, vortexSdk, accountSecret, }) => {
+const prepareWithdraw = async ({ tx = new Transaction(), amount, unspentUtxos = [], vortexPool, vortexKeypair, root, getMerklePathFn, recipient, relayer, relayerFee, vortexSdk, accountSecret, }) => {
     invariant(unspentUtxos.length >= 1, 'Must have at least 1 unspent UTXO');
     unspentUtxos.sort((a, b) => new bn_js.BN(b.amount).cmp(new bn_js.BN(a.amount)));
     const totalUnspentUtxosAmount = unspentUtxos
@@ -39737,7 +39756,11 @@ const prepareWithdraw = async ({ tx = new Transaction(), amount, unspentUtxos =
         });
     const totalWithdrawAmount = inputUtxo0.amount + inputUtxo1.amount;
     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,
         index: nextIndex,
@@ -39765,7 +39788,9 @@ const prepareWithdraw = async ({ tx = new Transaction(), amount, unspentUtxos =
     const input = toProveInput({
         vortexObjectId,
         accountSecret,
-        merkleTree,
+        root,
+        merklePath0,
+        merklePath1,
         publicAmount: BN254_FIELD_MODULUS - amount,
         nullifier0,
         nullifier1,
@@ -39794,7 +39819,7 @@ const prepareWithdraw = async ({ tx = new Transaction(), amount, unspentUtxos =
         vortexPool,
         tx: tx2,
         proofPoints: fromHex('0x' + proof.proofSerializedHex),
-        root: BigInt(merkleTree.root),
+        root,
         publicValue: amount,
         action: exports.Action.Withdraw,
         inputNullifier0: nullifier0,
@@ -39810,14 +39835,15 @@ const prepareWithdraw = async ({ tx = new Transaction(), amount, unspentUtxos =
     };
 };
 
-const withdraw = async ({ tx = new Transaction(), amount, unspentUtxos = [], vortexPool, vortexKeypair, merkleTree, recipient, relayer, relayerFee, vortexSdk, }) => {
+const withdraw = async ({ tx = new Transaction(), amount, unspentUtxos = [], vortexPool, vortexKeypair, root, getMerklePathFn, recipient, relayer, relayerFee, vortexSdk, }) => {
     const { tx: tx3, moveProof, extData, vortexPool: pool, } = await prepareWithdraw({
         tx,
         amount,
         unspentUtxos,
         vortexPool,
         vortexKeypair,
-        merkleTree,
+        root,
+        getMerklePathFn,
         recipient,
         relayer,
         relayerFee,
@@ -39834,7 +39860,7 @@ const withdraw = async ({ tx = new Transaction(), amount, unspentUtxos = [], vor
     });
 };
 
-const depositWithAccount = async ({ tx = new Transaction(), unspentUtxos = [], vortexSdk, vortexKeypair, vortexPool, merkleTree, accountSecret, account, coinStructs, relayer = normalizeSuiAddress('0x0'), relayerFee = 0n, }) => {
+const depositWithAccount = async ({ tx = new Transaction(), unspentUtxos = [], vortexSdk, vortexKeypair, vortexPool, root, getMerklePathFn, accountSecret, account, coinStructs, relayer = normalizeSuiAddress('0x0'), relayerFee = 0n, }) => {
     const coins = coinStructs.map((coin) => ({
         objectId: coin.coinObjectId,
         version: coin.version,
@@ -39842,7 +39868,7 @@ const depositWithAccount = async ({ tx = new Transaction(), unspentUtxos = [], v
     }));
     let amount = coinStructs.reduce((acc, coin) => acc + BigInt(coin.balance), 0n);
     invariant(unspentUtxos.length <= 2, 'Unspent UTXOs must be at most 2');
-    invariant(BN254_FIELD_MODULUS > amount, 'Amount must be less than field modulus');
+    invariant(BN254_FIELD_MODULUS >= amount, 'Amount must be less than field modulus');
     const { extData, moveProof, tx: tx3, } = await prepareDepositProof({
         tx,
         amount,
@@ -39851,7 +39877,8 @@ const depositWithAccount = async ({ tx = new Transaction(), unspentUtxos = [], v
         vortexSdk,
         vortexKeypair,
         vortexPool,
-        merkleTree,
+        root,
+        getMerklePathFn,
         relayer,
         relayerFee,
     });
@@ -39865,14 +39892,15 @@ const depositWithAccount = async ({ tx = new Transaction(), unspentUtxos = [], v
     });
 };
 
-const withdrawWithAccount = async ({ tx = new Transaction(), unspentUtxos = [], vortexPool, vortexKeypair, merkleTree, recipient, relayer, relayerFee, vortexSdk, account, accountSecret, amount, }) => {
+const withdrawWithAccount = async ({ tx = new Transaction(), unspentUtxos = [], vortexPool, vortexKeypair, root, getMerklePathFn, recipient, relayer, relayerFee, vortexSdk, account, accountSecret, amount, }) => {
     const { tx: tx3, moveProof, extData, vortexPool: pool, } = await prepareWithdraw({
         tx,
         amount,
         unspentUtxos,
         vortexPool,
         vortexKeypair,
-        merkleTree,
+        root,
+        getMerklePathFn,
         recipient,
         relayer,
         relayerFee,