@jup-ag/lend 0.0.100 → 0.0.101

package/dist/borrow/index.d.mts

@@ -4031,6 +4031,7 @@ declare const getCurrentPosition: ({ vaultId, positionId, connection, }: GetCurr
     dustDebtRaw: BN;
     isSupplyOnlyPosition: boolean;
     userLiquidationStatus: boolean;
+    postLiquidationBranchId: number;
 }>;
 declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurrentPositionStateParams) => Promise<{
     tick: number;
@@ -4041,6 +4042,7 @@ declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurr
     dustDebtRaw: BN;
     isSupplyOnlyPosition: boolean;
     userLiquidationStatus: boolean;
+    postLiquidationBranchId: number;
 }>;
 declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, signer, }: {
     vaultId: number;
@@ -4059,7 +4061,7 @@ declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDe
     finalAmount: BN;
     isSupplyOnlyPosition: boolean;
 }>;
-declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, liquidationStatus: boolean, program: Program<Vaults>): Promise<number[]>;
+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): Promise<PublicKey[]>;
 declare function loadRelevantTicksHasDebtArraysLiquidate(vaultId: number, topTick: number, nextTick: number, program: Program<Vaults>): Promise<{
     vaultId: number;

package/dist/borrow/index.d.ts

@@ -4031,6 +4031,7 @@ declare const getCurrentPosition: ({ vaultId, positionId, connection, }: GetCurr
     dustDebtRaw: BN;
     isSupplyOnlyPosition: boolean;
     userLiquidationStatus: boolean;
+    postLiquidationBranchId: number;
 }>;
 declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurrentPositionStateParams) => Promise<{
     tick: number;
@@ -4041,6 +4042,7 @@ declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurr
     dustDebtRaw: BN;
     isSupplyOnlyPosition: boolean;
     userLiquidationStatus: boolean;
+    postLiquidationBranchId: number;
 }>;
 declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, signer, }: {
     vaultId: number;
@@ -4059,7 +4061,7 @@ declare const getFinalPosition: ({ vaultId, currentPosition, newColAmount, newDe
     finalAmount: BN;
     isSupplyOnlyPosition: boolean;
 }>;
-declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, liquidationStatus: boolean, program: Program<Vaults>): Promise<number[]>;
+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): Promise<PublicKey[]>;
 declare function loadRelevantTicksHasDebtArraysLiquidate(vaultId: number, topTick: number, nextTick: number, program: Program<Vaults>): Promise<{
     vaultId: number;

package/dist/borrow/index.mjs

@@ -939,7 +939,8 @@ const getCurrentPositionState = async ({
       debtRaw: new BN(0),
       dustDebtRaw: new BN(0),
       isSupplyOnlyPosition: true,
-      userLiquidationStatus: false
+      userLiquidationStatus: false,
+      postLiquidationBranchId: 0
     };
   }
   const colRaw = new BN(position.supplyAmount.toString());
@@ -953,6 +954,7 @@ const getCurrentPositionState = async ({
     debtRaw = new BN(0);
   }
   let userLiquidationStatus = false;
+  let postLiquidationBranchId = 0;
   if (positionTick > MIN_TICK) {
     const tickData = await program.account.tick.fetch(
       getTick(vaultId, positionTick)
@@ -986,6 +988,7 @@ const getCurrentPositionState = async ({
         };
       }
       const { isFullyLiquidated, branchId, connectionFactor } = getLiquidationStatus(position.tickId, tickData, tickIdData);
+      postLiquidationBranchId = branchId;
       if (isFullyLiquidated) {
         return {
           tick: MIN_TICK,
@@ -995,12 +998,13 @@ const getCurrentPositionState = async ({
           dustDebtRaw: new BN(0),
           finalAmount: new BN(0),
           isSupplyOnlyPosition: true,
-          userLiquidationStatus: true
+          userLiquidationStatus: true,
+          postLiquidationBranchId: 0
         };
       }
       const { finalTick, finalColRaw, finalDebtRaw } = processLiquidatedPosition({
         branches,
-        branchId,
+        branchId: postLiquidationBranchId,
         initialConnectionFactor: connectionFactor,
         initialDebtRaw: debtRaw
       });
@@ -1013,7 +1017,8 @@ const getCurrentPositionState = async ({
         dustDebtRaw,
         finalAmount: netDebtRaw2.gt(new BN(0)) ? finalColRaw : new BN(0),
         isSupplyOnlyPosition: finalTick === MIN_TICK,
-        userLiquidationStatus
+        userLiquidationStatus,
+        postLiquidationBranchId
       };
     }
   }
@@ -1026,7 +1031,8 @@ const getCurrentPositionState = async ({
     dustDebtRaw,
     finalAmount: netDebtRaw.gt(new BN(0)) ? colRaw : new BN(0),
     isSupplyOnlyPosition: positionTick === MIN_TICK,
-    userLiquidationStatus
+    userLiquidationStatus,
+    postLiquidationBranchId
   };
 };
 async function getAllBranches({
@@ -1219,9 +1225,9 @@ const getFinalPosition = async ({
     isSupplyOnlyPosition
   };
 };
-async function loadRelevantBranches(vaultId, vaultState, liquidationStatus, program) {
+async function loadRelevantBranches(vaultId, vaultState, liquidationStatus, postLiquidationBranchId, program) {
   const addedBranchIds = /* @__PURE__ */ new Set();
-  const currentBranchId = vaultState.currentBranchId;
+  const currentBranchId = postLiquidationBranchId > 0 ? postLiquidationBranchId : vaultState.currentBranchId;
   let connectedBranchId = 0;
   if (currentBranchId > 0) {
     try {
@@ -1506,13 +1512,19 @@ async function getOtherInstructionsOperate(vaultId, vaultState, currentPosition,
 const tickHelper = (tickValue) => {
   return tickValue === 0 ? INIT_TICK : tickValue;
 };
-async function getRemainingAccountsOperate(vaultId, vaultState, vaultConfig, finalPositionTick, existingPositionTick, liquidationStatus, program) {
+async function getRemainingAccountsOperate(vaultId, vaultState, vaultConfig, finalPositionTick, existingPositionTick, liquidationStatus, postLiquidationBranchId, 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, liquidationStatus, program),
+    loadRelevantBranches(
+      vaultId,
+      vaultState,
+      liquidationStatus,
+      postLiquidationBranchId,
+      program
+    ),
     loadRelevantTicksHasDebtArrays(
       vaultId,
       tickHelper(vaultState.topmostTick),
@@ -1632,6 +1644,7 @@ async function getOperateContext({
     finalPosition.tick,
     existingPositionTick,
     currentPosition.userLiquidationStatus,
+    currentPosition.postLiquidationBranchId,
     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.100";
+const version = "0.0.101";
 
 export { version };

package/package.json

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