@jup-ag/lend 0.0.89 → 0.0.91

package/dist/borrow/index.d.mts

@@ -4021,6 +4021,7 @@ declare const getCurrentPosition: ({ vaultId, positionId, connection, }: GetCurr
     debtRaw: BN;
     dustDebtRaw: BN;
     isSupplyOnlyPosition: boolean;
+    userLiquidationStatus: boolean;
 }>;
 declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurrentPositionStateParams) => Promise<{
     tick: number;
@@ -4030,6 +4031,7 @@ declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurr
     debtRaw: BN;
     dustDebtRaw: BN;
     isSupplyOnlyPosition: boolean;
+    userLiquidationStatus: boolean;
 }>;
 declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, signer, }: {
     vaultId: number;
@@ -4048,14 +4050,8 @@ declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDe
     finalAmount: BN;
     isSupplyOnlyPosition: boolean;
 }>;
-declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, program: Program<Vaults>): Promise<number[]>;
-declare function loadRelevantTicksHasDebtArrays(vaultId: number, topTick: number, program: Program<Vaults>): Promise<{
-    vaultId: number;
-    index: number;
-    tickHasDebt: {
-        childrenBits: number[];
-    }[];
-}[]>;
+declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, liquidationStatus: boolean, program: Program<Vaults>): Promise<number[]>;
+declare function loadRelevantTicksHasDebtArrays(vaultId: number, topTick: number, existingPositionTick: number, finalTick: number): Promise<PublicKey[]>;
 declare function loadRelevantTicksHasDebtArraysLiquidate(vaultId: number, topTick: number, nextTick: number, program: Program<Vaults>): Promise<{
     vaultId: number;
     index: number;

package/dist/borrow/index.d.ts

@@ -4021,6 +4021,7 @@ declare const getCurrentPosition: ({ vaultId, positionId, connection, }: GetCurr
     debtRaw: BN;
     dustDebtRaw: BN;
     isSupplyOnlyPosition: boolean;
+    userLiquidationStatus: boolean;
 }>;
 declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurrentPositionStateParams) => Promise<{
     tick: number;
@@ -4030,6 +4031,7 @@ declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurr
     debtRaw: BN;
     dustDebtRaw: BN;
     isSupplyOnlyPosition: boolean;
+    userLiquidationStatus: boolean;
 }>;
 declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, signer, }: {
     vaultId: number;
@@ -4048,14 +4050,8 @@ declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDe
     finalAmount: BN;
     isSupplyOnlyPosition: boolean;
 }>;
-declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, program: Program<Vaults>): Promise<number[]>;
-declare function loadRelevantTicksHasDebtArrays(vaultId: number, topTick: number, program: Program<Vaults>): Promise<{
-    vaultId: number;
-    index: number;
-    tickHasDebt: {
-        childrenBits: number[];
-    }[];
-}[]>;
+declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, liquidationStatus: boolean, program: Program<Vaults>): Promise<number[]>;
+declare function loadRelevantTicksHasDebtArrays(vaultId: number, topTick: number, existingPositionTick: number, finalTick: number): Promise<PublicKey[]>;
 declare function loadRelevantTicksHasDebtArraysLiquidate(vaultId: number, topTick: number, nextTick: number, program: Program<Vaults>): Promise<{
     vaultId: number;
     index: number;

package/dist/borrow/index.mjs

@@ -871,7 +871,8 @@ const getCurrentPositionState = async ({
       finalAmount: new BN(position.supplyAmount.toString()),
       debtRaw: new BN(0),
       dustDebtRaw: new BN(0),
-      isSupplyOnlyPosition: true
+      isSupplyOnlyPosition: true,
+      userLiquidationStatus: false
     };
   }
   const colRaw = new BN(position.supplyAmount.toString());
@@ -884,18 +885,23 @@ const getCurrentPositionState = async ({
   } else {
     debtRaw = new BN(0);
   }
+  let userLiquidationStatus = false;
   if (positionTick > MIN_TICK) {
     const tickData = await program.account.tick.fetch(
       getTick(vaultId, positionTick)
     );
     if (tickData.isLiquidated || tickData.totalIds > position.tickId) {
-      let tickIdData = await program.account.tickIdLiquidation.fetch(
-        getTickIdLiquidation(
-          vaultId,
-          positionTick,
-          position.tickId
-        )
-      ).catch(() => null);
+      userLiquidationStatus = true;
+      let [tickIdData, branches] = await Promise.all([
+        program.account.tickIdLiquidation.fetch(
+          getTickIdLiquidation(
+            vaultId,
+            positionTick,
+            position.tickId
+          )
+        ).catch(() => null),
+        getAllBranches({ vaultId, program })
+      ]);
       if (!tickIdData) {
         tickIdData = {
           vaultId,
@@ -912,7 +918,6 @@ const getCurrentPositionState = async ({
           debtFactor3: new BN(0)
         };
       }
-      const branches = await getAllBranches({ vaultId, program });
       const { isFullyLiquidated, branchId, connectionFactor } = getLiquidationStatus(position.tickId, tickData, tickIdData);
       if (isFullyLiquidated) {
         return {
@@ -922,7 +927,8 @@ const getCurrentPositionState = async ({
           debtRaw: new BN(0),
           dustDebtRaw: new BN(0),
           finalAmount: new BN(0),
-          isSupplyOnlyPosition: true
+          isSupplyOnlyPosition: true,
+          userLiquidationStatus: true
         };
       }
       const { finalTick, finalColRaw, finalDebtRaw } = await processLiquidatedPosition({
@@ -939,7 +945,8 @@ const getCurrentPositionState = async ({
         debtRaw: finalDebtRaw,
         dustDebtRaw,
         finalAmount: netDebtRaw2.gt(new BN(0)) ? finalColRaw : new BN(0),
-        isSupplyOnlyPosition: finalTick === MIN_TICK
+        isSupplyOnlyPosition: finalTick === MIN_TICK,
+        userLiquidationStatus
       };
     }
   }
@@ -951,7 +958,8 @@ const getCurrentPositionState = async ({
     debtRaw,
     dustDebtRaw,
     finalAmount: netDebtRaw.gt(new BN(0)) ? colRaw : new BN(0),
-    isSupplyOnlyPosition: positionTick === MIN_TICK
+    isSupplyOnlyPosition: positionTick === MIN_TICK,
+    userLiquidationStatus
   };
 };
 async function getAllBranches({
@@ -1148,7 +1156,7 @@ const getFinalPosition = async ({
     isSupplyOnlyPosition
   };
 };
-async function loadRelevantBranches(vaultId, vaultState, program) {
+async function loadRelevantBranches(vaultId, vaultState, liquidationStatus, program) {
   const addedBranchIds = /* @__PURE__ */ new Set();
   const currentBranchId = vaultState.currentBranchId;
   let connectedBranchId = 0;
@@ -1165,38 +1173,50 @@ async function loadRelevantBranches(vaultId, vaultState, program) {
       console.warn(`Failed to fetch current branch ${currentBranchId}:`, error);
     }
   }
-  while (connectedBranchId > 0) {
-    try {
-      const connectedBranch = await program.account.branch.fetch(
-        getBranch(vaultId, connectedBranchId)
-      );
-      if (connectedBranch) {
-        if (!addedBranchIds.has(connectedBranch.branchId))
-          addedBranchIds.add(connectedBranch.branchId);
-        connectedBranchId = connectedBranch.connectedBranchId;
-      } else break;
-    } catch (error) {
-      console.warn(
-        `Failed to fetch connected branch ${connectedBranchId}:`,
-        error
-      );
-      break;
+  if (liquidationStatus) {
+    while (connectedBranchId > 0) {
+      try {
+        const connectedBranch = await program.account.branch.fetch(
+          getBranch(vaultId, connectedBranchId)
+        );
+        if (connectedBranch) {
+          if (!addedBranchIds.has(connectedBranch.branchId))
+            addedBranchIds.add(connectedBranch.branchId);
+          connectedBranchId = connectedBranch.connectedBranchId;
+        } else break;
+      } catch (error) {
+        console.warn(
+          `Failed to fetch connected branch ${connectedBranchId}:`,
+          error
+        );
+        break;
+      }
     }
+    if (!addedBranchIds.has(0)) addedBranchIds.add(0);
   }
-  if (!addedBranchIds.has(0)) addedBranchIds.add(0);
   return [...addedBranchIds];
 }
-async function loadRelevantTicksHasDebtArrays(vaultId, topTick, program) {
-  let { arrayIndex: topTickIndex } = getTickIndices(topTick);
-  if (topTickIndex < 15) topTickIndex += 1;
-  return await Promise.all(
-    Array.from(
-      { length: topTickIndex },
-      (_, i) => program.account.tickHasDebtArray.fetch(
-        getTickHasDebt(vaultId, topTickIndex - i)
-      )
-    )
-  );
+async function loadRelevantTicksHasDebtArrays(vaultId, topTick, existingPositionTick, finalTick) {
+  const tickHasDebtArrays = /* @__PURE__ */ new Set();
+  if (existingPositionTick == topTick && finalTick < topTick) {
+    let { arrayIndex: startIndex } = getTickIndices(finalTick);
+    let { arrayIndex: endIndex } = getTickIndices(topTick);
+    if (endIndex < 15) endIndex++;
+    try {
+      for (let arrIdx = startIndex; arrIdx <= endIndex; arrIdx++)
+        tickHasDebtArrays.add(getTickHasDebt(vaultId, arrIdx));
+    } 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)
+    );
+  }
+  return [...tickHasDebtArrays];
 }
 async function getExchangePrices({
   vaultId,
@@ -1423,18 +1443,18 @@ async function getOtherInstructionsOperate(vaultId, vaultState, currentPosition,
 const tickHelper = (tickValue) => {
   return tickValue === 0 ? INIT_TICK : tickValue;
 };
-async function getRemainingAccountsOperate(vaultId, vaultState, vaultConfig, finalPositionTick, program) {
+async function getRemainingAccountsOperate(vaultId, vaultState, vaultConfig, finalPositionTick, existingPositionTick, liquidationStatus, program) {
   const remainingAccounts = [];
   const oracleProgram = new Program(oracle, program.provider);
   const [oracleData, branches, tickHasDebt] = await Promise.all([
     oracleProgram.account.oracle.fetch(new PublicKey(vaultConfig.oracle)),
     // Add branch accounts (next 10 remaining accounts)
-    loadRelevantBranches(vaultId, vaultState, program),
+    loadRelevantBranches(vaultId, vaultState, liquidationStatus, program),
     loadRelevantTicksHasDebtArrays(
       vaultId,
-      Math.max(finalPositionTick, tickHelper(vaultState.topmostTick)),
-      // max of both ticks
-      program
+      tickHelper(vaultState.topmostTick),
+      existingPositionTick,
+      finalPositionTick
     )
   ]);
   const sourceLength = oracleData.sources.length;
@@ -1455,7 +1475,7 @@ async function getRemainingAccountsOperate(vaultId, vaultState, vaultConfig, fin
   const tickHasDebtLength = tickHasDebt.length;
   for (const tickHasDebtArray of tickHasDebt)
     remainingAccounts.push({
-      pubkey: getTickHasDebt(vaultId, tickHasDebtArray.index),
+      pubkey: tickHasDebtArray,
       isWritable: true,
       isSigner: false
     });
@@ -1547,6 +1567,8 @@ async function getOperateContext({
     vaultState,
     vaultConfig,
     finalPosition.tick,
+    existingPositionTick,
+    currentPosition.userLiquidationStatus,
     program
   );
   const accounts = {

package/dist/index.mjs

@@ -8,6 +8,6 @@ import './shared/lend.CioR9-te.mjs';
 import '@solana/spl-token';
 import 'bn.js';
 
-const version = "0.0.89";
+const version = "0.0.91";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jup-ag/lend",
-  "version": "0.0.89",
+  "version": "0.0.91",
   "license": "MIT",
   "sideEffects": false,
   "type": "module",