@jup-ag/lend 0.1.10-beta.2 → 0.1.10-beta.4

package/dist/borrow/index.d.mts

@@ -17,10 +17,11 @@ type GetCurrentPositionStateParams = {
     vaultId: number;
     position: PositionData;
     program: Program<Vaults>;
+    market: "main" | "ethena";
 };
 declare const getVaultsProgram: ({ connection, signer, market, }: {
     connection: Connection;
-    signer: PublicKey;
+    signer?: PublicKey;
     market: "main" | "ethena";
 }) => Program<Vaults>;
 declare const INIT_TICK = -2147483648;
@@ -41,7 +42,7 @@ declare const getCurrentPosition: ({ vaultId, positionId, connection, market, }:
     userLiquidationStatus: boolean;
     postLiquidationBranchId: number;
 }>;
-declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurrentPositionStateParams) => Promise<{
+declare const getCurrentPositionState: ({ vaultId, position, program, market, }: GetCurrentPositionStateParams) => Promise<{
     tick: number;
     tickId: number;
     colRaw: BN__default;
@@ -52,7 +53,7 @@ declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurr
     userLiquidationStatus: boolean;
     postLiquidationBranchId: number;
 }>;
-declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, signer, }: {
+declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, signer, market, }: {
     vaultId: number;
     currentPosition: Awaited<ReturnType<typeof getCurrentPositionState>>;
     newColAmount: BN__default;
@@ -60,6 +61,7 @@ declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDe
     program?: Program<Vaults>;
     connection: Connection;
     signer: PublicKey;
+    market: "main" | "ethena";
 }) => Promise<{
     tick: number;
     tickId: number;
@@ -69,16 +71,16 @@ declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDe
     finalAmount: BN__default;
     isSupplyOnlyPosition: boolean;
 }>;
-declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, liquidationStatus: boolean, postLiquidationBranchId: number, program: Program<Vaults>): Promise<number[]>;
-declare function loadRelevantTicksHasDebtArrays(vaultId: number, topTick: number, existingPositionTick: number, finalTick: number, program: Program<Vaults>): Promise<PublicKey[]>;
-declare function loadRelevantTicksHasDebtArraysLiquidate(vaultId: number, topTick: number, nextTick: number, program: Program<Vaults>): Promise<{
+declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, liquidationStatus: boolean, postLiquidationBranchId: number, program: Program<Vaults>, market: "main" | "ethena"): Promise<number[]>;
+declare function loadRelevantTicksHasDebtArrays(vaultId: number, topTick: number, existingPositionTick: number, finalTick: number, program: Program<Vaults>, market: "main" | "ethena"): Promise<PublicKey[]>;
+declare function loadRelevantTicksHasDebtArraysLiquidate(vaultId: number, topTick: number, nextTick: number, program: Program<Vaults>, market: "main" | "ethena"): Promise<{
     vaultId: number;
     index: number;
     tickHasDebt: {
         childrenBits: number[];
     }[];
 }[]>;
-declare function loadRelevantBranchesForLiquidate(vaultId: number, vaultState: any, program: Program<Vaults>): Promise<any[]>;
+declare function loadRelevantBranchesForLiquidate(vaultId: number, vaultState: any, program: Program<Vaults>, market: "main" | "ethena"): Promise<any[]>;
 declare function readOraclePrice({ connection, signer, oracle, }: {
     connection: Connection;
     signer?: PublicKey;
@@ -193,10 +195,11 @@ declare function getTickIndices(tick: number): {
     byteIndex: number;
     bitIndex: number;
 };
-declare function readTickHasDebtArray({ vaultId, index, program, }: {
+declare function readTickHasDebtArray({ vaultId, index, program, market, }: {
     vaultId: number;
     index: number;
     program: Program<Vaults>;
+    market: "main" | "ethena";
 }): Promise<{
     vaultId: number;
     index: number;
@@ -204,7 +207,7 @@ declare function readTickHasDebtArray({ vaultId, index, program, }: {
         childrenBits: number[];
     }[];
 }>;
-declare function findNextTickWithDebt(vaultId: number, startTick: number, program: Program<Vaults>): Promise<number>;
+declare function findNextTickWithDebt(vaultId: number, startTick: number, program: Program<Vaults>, market: "main" | "ethena"): Promise<number>;
 
 declare const simulateLiquidate: (params: LiquidateParams) => Promise<_solana_web3_js.SimulatedTransactionResponse>;
 declare const getLiquidations: (params: Omit<LiquidateParams, "debtAmount">) => Promise<{

package/dist/borrow/index.d.ts

@@ -17,10 +17,11 @@ type GetCurrentPositionStateParams = {
     vaultId: number;
     position: PositionData;
     program: Program<Vaults>;
+    market: "main" | "ethena";
 };
 declare const getVaultsProgram: ({ connection, signer, market, }: {
     connection: Connection;
-    signer: PublicKey;
+    signer?: PublicKey;
     market: "main" | "ethena";
 }) => Program<Vaults>;
 declare const INIT_TICK = -2147483648;
@@ -41,7 +42,7 @@ declare const getCurrentPosition: ({ vaultId, positionId, connection, market, }:
     userLiquidationStatus: boolean;
     postLiquidationBranchId: number;
 }>;
-declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurrentPositionStateParams) => Promise<{
+declare const getCurrentPositionState: ({ vaultId, position, program, market, }: GetCurrentPositionStateParams) => Promise<{
     tick: number;
     tickId: number;
     colRaw: BN__default;
@@ -52,7 +53,7 @@ declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurr
     userLiquidationStatus: boolean;
     postLiquidationBranchId: number;
 }>;
-declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, signer, }: {
+declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, signer, market, }: {
     vaultId: number;
     currentPosition: Awaited<ReturnType<typeof getCurrentPositionState>>;
     newColAmount: BN__default;
@@ -60,6 +61,7 @@ declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDe
     program?: Program<Vaults>;
     connection: Connection;
     signer: PublicKey;
+    market: "main" | "ethena";
 }) => Promise<{
     tick: number;
     tickId: number;
@@ -69,16 +71,16 @@ declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDe
     finalAmount: BN__default;
     isSupplyOnlyPosition: boolean;
 }>;
-declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, liquidationStatus: boolean, postLiquidationBranchId: number, program: Program<Vaults>): Promise<number[]>;
-declare function loadRelevantTicksHasDebtArrays(vaultId: number, topTick: number, existingPositionTick: number, finalTick: number, program: Program<Vaults>): Promise<PublicKey[]>;
-declare function loadRelevantTicksHasDebtArraysLiquidate(vaultId: number, topTick: number, nextTick: number, program: Program<Vaults>): Promise<{
+declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, liquidationStatus: boolean, postLiquidationBranchId: number, program: Program<Vaults>, market: "main" | "ethena"): Promise<number[]>;
+declare function loadRelevantTicksHasDebtArrays(vaultId: number, topTick: number, existingPositionTick: number, finalTick: number, program: Program<Vaults>, market: "main" | "ethena"): Promise<PublicKey[]>;
+declare function loadRelevantTicksHasDebtArraysLiquidate(vaultId: number, topTick: number, nextTick: number, program: Program<Vaults>, market: "main" | "ethena"): Promise<{
     vaultId: number;
     index: number;
     tickHasDebt: {
         childrenBits: number[];
     }[];
 }[]>;
-declare function loadRelevantBranchesForLiquidate(vaultId: number, vaultState: any, program: Program<Vaults>): Promise<any[]>;
+declare function loadRelevantBranchesForLiquidate(vaultId: number, vaultState: any, program: Program<Vaults>, market: "main" | "ethena"): Promise<any[]>;
 declare function readOraclePrice({ connection, signer, oracle, }: {
     connection: Connection;
     signer?: PublicKey;
@@ -193,10 +195,11 @@ declare function getTickIndices(tick: number): {
     byteIndex: number;
     bitIndex: number;
 };
-declare function readTickHasDebtArray({ vaultId, index, program, }: {
+declare function readTickHasDebtArray({ vaultId, index, program, market, }: {
     vaultId: number;
     index: number;
     program: Program<Vaults>;
+    market: "main" | "ethena";
 }): Promise<{
     vaultId: number;
     index: number;
@@ -204,7 +207,7 @@ declare function readTickHasDebtArray({ vaultId, index, program, }: {
         childrenBits: number[];
     }[];
 }>;
-declare function findNextTickWithDebt(vaultId: number, startTick: number, program: Program<Vaults>): Promise<number>;
+declare function findNextTickWithDebt(vaultId: number, startTick: number, program: Program<Vaults>, market: "main" | "ethena"): Promise<number>;
 
 declare const simulateLiquidate: (params: LiquidateParams) => Promise<_solana_web3_js.SimulatedTransactionResponse>;
 declare const getLiquidations: (params: Omit<LiquidateParams, "debtAmount">) => Promise<{

package/dist/borrow/index.mjs

@@ -1,5 +1,5 @@
-import { g as getLiquidateIx, a as getVaultsProgram } from '../shared/lend.DUkMIKcH.mjs';
-export { I as INIT_TICK, h as MAX_REPAY_AMOUNT, u as MAX_TICK, i as MAX_WITHDRAW_AMOUNT, M as MIN_I128, t as MIN_TICK, v as TICKS_PER_TICK_HAS_DEBT, T as TICK_HAS_DEBT_ARRAY_SIZE, w as TICK_HAS_DEBT_CHILDREN_SIZE, x as TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS, y as TOTAL_INDICES_NEEDED, Z as ZERO_TICK_SCALED_RATIO, E as findNextTickWithDebt, j as getAccountOwner, k as getCurrentPosition, l as getCurrentPositionState, m as getFinalPosition, B as getFirstTickForIndex, d as getInitPositionContext, c as getInitPositionIx, f as getLiquidateContext, s as getLiquidityProgramId, b as getOperateContext, e as getOperateIx, z as getRatioAtTick, A as getTickAtRatio, C as getTickIndices, n as loadRelevantBranches, q as loadRelevantBranchesForLiquidate, o as loadRelevantTicksHasDebtArrays, p as loadRelevantTicksHasDebtArraysLiquidate, r as readOraclePrice, D as readTickHasDebtArray } from '../shared/lend.DUkMIKcH.mjs';
+import { g as getLiquidateIx, a as getVaultsProgram } from '../shared/lend.DfKhG_eQ.mjs';
+export { I as INIT_TICK, h as MAX_REPAY_AMOUNT, u as MAX_TICK, i as MAX_WITHDRAW_AMOUNT, M as MIN_I128, t as MIN_TICK, v as TICKS_PER_TICK_HAS_DEBT, T as TICK_HAS_DEBT_ARRAY_SIZE, w as TICK_HAS_DEBT_CHILDREN_SIZE, x as TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS, y as TOTAL_INDICES_NEEDED, Z as ZERO_TICK_SCALED_RATIO, E as findNextTickWithDebt, j as getAccountOwner, k as getCurrentPosition, l as getCurrentPositionState, m as getFinalPosition, B as getFirstTickForIndex, d as getInitPositionContext, c as getInitPositionIx, f as getLiquidateContext, s as getLiquidityProgramId, b as getOperateContext, e as getOperateIx, z as getRatioAtTick, A as getTickAtRatio, C as getTickIndices, n as loadRelevantBranches, q as loadRelevantBranchesForLiquidate, o as loadRelevantTicksHasDebtArrays, p as loadRelevantTicksHasDebtArraysLiquidate, r as readOraclePrice, D as readTickHasDebtArray } from '../shared/lend.DfKhG_eQ.mjs';
 import { PublicKey, TransactionMessage, ComputeBudgetProgram, VersionedTransaction } from '@solana/web3.js';
 import BN from 'bn.js';
 import { g as getVaultAdmin } from '../shared/lend.BsvjWilv.mjs';
@@ -39,10 +39,11 @@ const getLiquidations = async (params) => {
 const getAllLiquidations = async (params) => {
   const program = getVaultsProgram({
     connection: params.connection,
-    signer: params.signer || new PublicKey("HEyJLdMfZhhQ7FHCtjD5DWDFNFQhaeAVAsHeWqoY6dSD")
+    signer: params.signer || new PublicKey("HEyJLdMfZhhQ7FHCtjD5DWDFNFQhaeAVAsHeWqoY6dSD"),
+    market: params.market
   });
   const { nextVaultId: totalVaults } = await program.account.vaultAdmin.fetch(
-    getVaultAdmin()
+    getVaultAdmin(params.market)
   );
   const vaultIds = Array.from({ length: totalVaults - 1 }, (_, i) => i + 1);
   const results = [];

package/dist/index.mjs

@@ -7,6 +7,6 @@ import '@solana/web3.js';
 import '@solana/spl-token';
 import 'bn.js';
 
-const version = "0.1.10-beta.2";
+const version = "0.1.10-beta.4";
 
 export { version };

package/dist/refinance/index.mjs

@@ -1,4 +1,4 @@
-import { e as getOperateIx, F as vaultsIdl } from '../shared/lend.DUkMIKcH.mjs';
+import { e as getOperateIx, F as vaultsIdl } from '../shared/lend.DfKhG_eQ.mjs';
 import { PublicKey } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import 'bn.js';

package/dist/shared/{lend.DUkMIKcH.mjs → lend.DfKhG_eQ.mjs}

@@ -1528,12 +1528,13 @@ function getTickIndices(tick) {
 async function readTickHasDebtArray({
   vaultId,
   index,
-  program
+  program,
+  market
 }) {
-  const tickPda = getTickHasDebt(vaultId, index);
+  const tickPda = getTickHasDebt(vaultId, index, market);
   return await program.account.tickHasDebtArray.fetch(tickPda);
 }
-async function findNextTickWithDebt(vaultId, startTick, program) {
+async function findNextTickWithDebt(vaultId, startTick, program, market) {
   try {
     const { arrayIndex, mapIndex, byteIndex, bitIndex } = getTickIndices(startTick);
     let currentArrayIndex = arrayIndex;
@@ -1541,7 +1542,8 @@ async function findNextTickWithDebt(vaultId, startTick, program) {
     let tickHasDebtData = await readTickHasDebtArray({
       vaultId,
       index: currentArrayIndex,
-      program
+      program,
+      market
     });
     if (!tickHasDebtData) {
       return MIN_TICK$1;
@@ -1563,7 +1565,8 @@ async function findNextTickWithDebt(vaultId, startTick, program) {
       tickHasDebtData = await readTickHasDebtArray({
         vaultId,
         index: currentArrayIndex,
-        program
+        program,
+        market
       });
       if (!tickHasDebtData) {
         return MIN_TICK$1;
@@ -6555,13 +6558,15 @@ const getCurrentPosition = async ({
   return await getCurrentPositionState({
     vaultId,
     position,
-    program
+    program,
+    market
   });
 };
 const getCurrentPositionState = async ({
   vaultId,
   position,
-  program
+  program,
+  market
 }) => {
   let positionTick = position.tick;
   if (positionTick === INIT_TICK) {
@@ -6594,7 +6599,7 @@ const getCurrentPositionState = async ({
   let postLiquidationBranchId = 0;
   if (positionTick > MIN_TICK) {
     const tickData = await program.account.tick.fetch(
-      getTick(vaultId, positionTick)
+      getTick(vaultId, positionTick, market)
     );
     if (tickData.isLiquidated || tickData.totalIds > position.tickId) {
       userLiquidationStatus = true;
@@ -6603,10 +6608,11 @@ const getCurrentPositionState = async ({
           getTickIdLiquidation(
             vaultId,
             positionTick,
-            position.tickId
+            position.tickId,
+            market
           )
         ).catch(() => null),
-        getAllBranches({ vaultId, program })
+        getAllBranches({ vaultId, program, market })
       ]);
       if (!tickIdData) {
         tickIdData = {
@@ -6674,15 +6680,16 @@ const getCurrentPositionState = async ({
 };
 async function getAllBranches({
   vaultId,
-  program
+  program,
+  market
 }) {
   const vaultState = await program.account.vaultState.fetch(
-    getVaultState(vaultId)
+    getVaultState(vaultId, market)
   );
   const branchPromises = [];
   for (let i = 0; i <= vaultState.totalBranchId; i++) {
     branchPromises.push(
-      program.account.branch.fetch(getBranch(vaultId, i)).catch(() => null)
+      program.account.branch.fetch(getBranch(vaultId, i, market)).catch(() => null)
     );
   }
   const branchResults = await Promise.all(branchPromises);
@@ -6787,11 +6794,12 @@ const getFinalPosition = async ({
   newDebtAmount,
   program,
   connection,
-  signer
+  signer,
+  market
 }) => {
-  program = program ?? getVaultsProgram({ connection, signer });
+  program = program ?? getVaultsProgram({ connection, signer, market });
   const vaultConfig = await program.account.vaultConfig.fetch(
-    getVaultConfig(vaultId)
+    getVaultConfig(vaultId, market)
   );
   const {
     vaultSupplyExchangePrice: supplyExPrice,
@@ -6800,7 +6808,8 @@ const getFinalPosition = async ({
     vaultId,
     vaultConfig,
     connection,
-    signer
+    signer,
+    market
   });
   const borrowFee = vaultConfig.borrowFee;
   let { colRaw, debtRaw, dustDebtRaw } = currentPosition;
@@ -6862,14 +6871,14 @@ const getFinalPosition = async ({
     isSupplyOnlyPosition
   };
 };
-async function loadRelevantBranches(vaultId, vaultState, liquidationStatus, postLiquidationBranchId, program) {
+async function loadRelevantBranches(vaultId, vaultState, liquidationStatus, postLiquidationBranchId, program, market) {
   const addedBranchIds = /* @__PURE__ */ new Set();
   const currentBranchId = postLiquidationBranchId > 0 ? postLiquidationBranchId : vaultState.currentBranchId;
   let connectedBranchId = 0;
   if (currentBranchId > 0) {
     try {
       const currentBranch = await program.account.branch.fetch(
-        getBranch(vaultId, currentBranchId)
+        getBranch(vaultId, currentBranchId, market)
       );
       if (currentBranch) {
         addedBranchIds.add(currentBranch.branchId);
@@ -6883,7 +6892,7 @@ async function loadRelevantBranches(vaultId, vaultState, liquidationStatus, post
     while (connectedBranchId > 0) {
       try {
         const connectedBranch = await program.account.branch.fetch(
-          getBranch(vaultId, connectedBranchId)
+          getBranch(vaultId, connectedBranchId, market)
         );
         if (connectedBranch) {
           if (!addedBranchIds.has(connectedBranch.branchId))
@@ -6902,32 +6911,41 @@ async function loadRelevantBranches(vaultId, vaultState, liquidationStatus, post
   }
   return [...addedBranchIds];
 }
-async function loadRelevantTicksHasDebtArrays(vaultId, topTick, existingPositionTick, finalTick, program) {
+async function loadRelevantTicksHasDebtArrays(vaultId, topTick, existingPositionTick, finalTick, program, market) {
   const tickHasDebtArrays = /* @__PURE__ */ new Set();
   if (existingPositionTick == topTick) {
     let nextTickWithDebt = await findNextTickWithDebt(
       vaultId,
       topTick,
-      program
+      program,
+      market
     );
     let { arrayIndex: startIndex } = getTickIndices(nextTickWithDebt);
     let { arrayIndex: endIndex } = getTickIndices(topTick);
     let { arrayIndex: finalTickIndex } = getTickIndices(finalTick);
-    let finalTickHasDebtPda = getTickHasDebt(vaultId, finalTickIndex);
+    let finalTickHasDebtPda = getTickHasDebt(
+      vaultId,
+      finalTickIndex,
+      market
+    );
     tickHasDebtArrays.add(finalTickHasDebtPda);
     if (endIndex < 15) endIndex++;
     try {
       for (let arrIdx = startIndex; arrIdx <= endIndex; arrIdx++)
-        tickHasDebtArrays.add(getTickHasDebt(vaultId, arrIdx));
+        tickHasDebtArrays.add(
+          getTickHasDebt(vaultId, arrIdx, market)
+        );
     } catch (error) {
       console.warn(`Error finding next tick with debt:`, error);
     }
   } else {
     let { arrayIndex: finalTickIndex } = getTickIndices(finalTick);
     let { arrayIndex: existingPositionTickIndex } = getTickIndices(existingPositionTick);
-    tickHasDebtArrays.add(getTickHasDebt(vaultId, finalTickIndex));
     tickHasDebtArrays.add(
-      getTickHasDebt(vaultId, existingPositionTickIndex)
+      getTickHasDebt(vaultId, finalTickIndex, market)
+    );
+    tickHasDebtArrays.add(
+      getTickHasDebt(vaultId, existingPositionTickIndex, market)
     );
   }
   return [...tickHasDebtArrays];
@@ -6936,14 +6954,25 @@ async function getExchangePrices({
   vaultId,
   vaultConfig,
   connection,
-  signer
+  signer,
+  market
 }) {
-  const program = new Program(vaultsIdl, { connection });
+  const program = getVaultsProgram({
+    connection,
+    signer,
+    market
+  });
   const ix = await program.methods.getExchangePrices().accounts({
-    vaultState: getVaultState(vaultId),
-    vaultConfig: getVaultConfig(vaultId),
-    supplyTokenReserves: getReserve(vaultConfig.supplyToken),
-    borrowTokenReserves: getReserve(vaultConfig.borrowToken)
+    vaultState: getVaultState(vaultId, market),
+    vaultConfig: getVaultConfig(vaultId, market),
+    supplyTokenReserves: getReserve(
+      vaultConfig.supplyToken,
+      market
+    ),
+    borrowTokenReserves: getReserve(
+      vaultConfig.borrowToken,
+      market
+    )
   }).instruction();
   const transaction = new Transaction().add(ix);
   const latestBlockHash = await connection.getLatestBlockhash();
@@ -6955,7 +6984,8 @@ async function getExchangePrices({
       vaultId,
       vaultConfig,
       connection,
-      signer: new PublicKey("HEyJLdMfZhhQ7FHCtjD5DWDFNFQhaeAVAsHeWqoY6dSD")
+      signer: new PublicKey("HEyJLdMfZhhQ7FHCtjD5DWDFNFQhaeAVAsHeWqoY6dSD"),
+      market
     });
   }
   const returnLog = raw.value.logs?.find(
@@ -6979,14 +7009,14 @@ async function getExchangePrices({
     vaultBorrowExchangePrice
   };
 }
-async function loadRelevantTicksHasDebtArraysLiquidate(vaultId, topTick, nextTick, program) {
+async function loadRelevantTicksHasDebtArraysLiquidate(vaultId, topTick, nextTick, program, market) {
   const { arrayIndex: topTickIndex } = getTickIndices(topTick);
   const { arrayIndex: nextTickIndex } = getTickIndices(nextTick);
   const promises = [];
   for (let arrIdx = topTickIndex; arrIdx >= nextTickIndex; arrIdx--) {
     promises.push(
       program.account.tickHasDebtArray.fetch(
-        getTickHasDebt(vaultId, arrIdx)
+        getTickHasDebt(vaultId, arrIdx, market)
       )
     );
   }
@@ -6996,13 +7026,13 @@ async function loadRelevantTicksHasDebtArraysLiquidate(vaultId, topTick, nextTic
   );
   return tickHasDebtArrays;
 }
-async function loadRelevantBranchesForLiquidate(vaultId, vaultState, program) {
+async function loadRelevantBranchesForLiquidate(vaultId, vaultState, program, market) {
   const branches = [];
   const currentBranchId = vaultState.currentBranchId;
   if (currentBranchId > 0) {
     try {
       const currentBranch = await program.account.branch.fetch(
-        getBranch(vaultId, currentBranchId)
+        getBranch(vaultId, currentBranchId, market)
       );
       if (currentBranch) branches.push(currentBranch);
     } catch (error) {
@@ -7014,7 +7044,7 @@ async function loadRelevantBranchesForLiquidate(vaultId, vaultState, program) {
   while (!doesBranchExist(connectedBranchId)) {
     try {
       const connectedBranch = await program.account.branch.fetch(
-        getBranch(vaultId, connectedBranchId)
+        getBranch(vaultId, connectedBranchId, market)
       );
       connectedBranchId = connectedBranch.connectedBranchId;
       if (connectedBranch) branches.push(connectedBranch);
@@ -7188,14 +7218,16 @@ async function getRemainingAccountsOperate(vaultId, vaultState, vaultConfig, fin
       vaultState,
       liquidationStatus,
       postLiquidationBranchId,
-      program
+      program,
+      market
     ),
     loadRelevantTicksHasDebtArrays(
       vaultId,
       tickHelper(vaultState.topmostTick),
       existingPositionTick,
       finalPositionTick,
-      program
+      program,
+      market
     )
   ]);
   const sourceLength = oracleData.sources.length;
@@ -7282,7 +7314,8 @@ async function getOperateContext({
   const currentPosition = await getCurrentPositionState({
     vaultId,
     position: positionData,
-    program
+    program,
+    market
   });
   if (existingPositionTick === -2147483648) {
     existingPositionTick = currentPosition.tick;
@@ -7300,7 +7333,8 @@ async function getOperateContext({
     newDebtAmount: newDebt,
     program,
     connection,
-    signer
+    signer,
+    market
   });
   const { otherIxs, newBranchPda, currentTickIdDataPda, finalTickIdDataPda } = await getOtherInstructionsOperate(
     vaultId,
@@ -7792,7 +7826,7 @@ async function loadRelevantTicksForLiquidate(vaultId, vaultState, liquidationTic
     }
   let nextTick = MIN_TICK$1;
   try {
-    nextTick = await findNextTickWithDebt(vaultId, topTick, program);
+    nextTick = await findNextTickWithDebt(vaultId, topTick, program, market);
   } catch {
   }
   const doesTickExist = (tick) => ticks.some((t) => t.tick === tick);
@@ -7803,7 +7837,7 @@ async function loadRelevantTicksForLiquidate(vaultId, vaultState, liquidationTic
       );
       if (nextTickData) ticks.push({ ...nextTickData, tick: nextTick });
       else throw new Error("Tick not found to load");
-      nextTick = await findNextTickWithDebt(vaultId, nextTick, program);
+      nextTick = await findNextTickWithDebt(vaultId, nextTick, program, market);
     } catch {
     }
   }
@@ -7827,7 +7861,7 @@ async function getRemainingAccountsLiquidate(vaultId, vaultState, vaultConfig, o
     });
   }
   const [branches, { ticks: tickAccounts, nextTick }] = await Promise.all([
-    loadRelevantBranchesForLiquidate(vaultId, vaultState, program),
+    loadRelevantBranchesForLiquidate(vaultId, vaultState, program, market),
     loadRelevantTicksForLiquidate(
       vaultId,
       vaultState,
@@ -7840,7 +7874,8 @@ async function getRemainingAccountsLiquidate(vaultId, vaultState, vaultConfig, o
     vaultId,
     vaultState.topmostTick,
     nextTick,
-    program
+    program,
+    market
   );
   for (const branch of branches) {
     remainingAccounts.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jup-ag/lend",
-  "version": "0.1.10-beta.2",
+  "version": "0.1.10-beta.4",
   "license": "MIT",
   "sideEffects": false,
   "type": "module",