@jup-ag/lend 0.0.80 → 0.0.82

package/dist/borrow/index.d.mts

@@ -4011,6 +4011,7 @@ declare const getVaultsProgram: ({ connection, signer, }: {
     connection: Connection;
     signer: PublicKey;
 }) => Program<Vaults>;
+declare const INIT_TICK = -2147483648;
 declare const getAccountOwner: (account: PublicKey, connection: Connection) => Promise<PublicKey>;
 declare const getCurrentPosition: ({ vaultId, positionId, connection, }: GetCurrentPositionParams) => Promise<{
     tick: number;
@@ -4067,7 +4068,7 @@ declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, p
     connectedBranchId: number;
     connectedMinimaTick: number;
 } | undefined)[]>;
-declare function loadRelevantTicksHasDebtArrays(vaultId: number, program: Program<Vaults>): Promise<{
+declare function loadRelevantTicksHasDebtArrays(vaultId: number, topTick: number, program: Program<Vaults>): Promise<{
     vaultId: number;
     index: number;
     tickHasDebt: {
@@ -4145,5 +4146,5 @@ declare const getAllLiquidations: (params: Omit<LiquidateParams, "debtAmount" |
     }[];
 }[]>;
 
-export { MAX_TICK, MIN_TICK, TICKS_PER_TICK_HAS_DEBT, TICK_HAS_DEBT_ARRAY_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS, TOTAL_INDICES_NEEDED, ZERO_TICK_SCALED_RATIO, findNextTickWithDebt, getAccountOwner, getAllLiquidations, getCurrentPosition, getCurrentPositionState, getFinalPosition, getFirstTickForIndex, getInitPositionContext, getLiquidateContext, getLiquidateIx, getLiquidations, getOperateContext, getOperateIx, getRatioAtTick, getTickAtRatio, getTickIndices, getVaultsProgram, loadRelevantBranches, loadRelevantBranchesForLiquidate, loadRelevantTicksHasDebtArrays, loadRelevantTicksHasDebtArraysLiquidate, readOraclePrice, readTickHasDebtArray, simulateLiquidate };
+export { INIT_TICK, MAX_TICK, MIN_TICK, TICKS_PER_TICK_HAS_DEBT, TICK_HAS_DEBT_ARRAY_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS, TOTAL_INDICES_NEEDED, ZERO_TICK_SCALED_RATIO, findNextTickWithDebt, getAccountOwner, getAllLiquidations, getCurrentPosition, getCurrentPositionState, getFinalPosition, getFirstTickForIndex, getInitPositionContext, getLiquidateContext, getLiquidateIx, getLiquidations, getOperateContext, getOperateIx, getRatioAtTick, getTickAtRatio, getTickIndices, getVaultsProgram, loadRelevantBranches, loadRelevantBranchesForLiquidate, loadRelevantTicksHasDebtArrays, loadRelevantTicksHasDebtArraysLiquidate, readOraclePrice, readTickHasDebtArray, simulateLiquidate };
 export type { ConnectionParams, LiquidateContextParams, LiquidateParams, OperateContextParams, OperateParams };

package/dist/borrow/index.d.ts

@@ -4011,6 +4011,7 @@ declare const getVaultsProgram: ({ connection, signer, }: {
     connection: Connection;
     signer: PublicKey;
 }) => Program<Vaults>;
+declare const INIT_TICK = -2147483648;
 declare const getAccountOwner: (account: PublicKey, connection: Connection) => Promise<PublicKey>;
 declare const getCurrentPosition: ({ vaultId, positionId, connection, }: GetCurrentPositionParams) => Promise<{
     tick: number;
@@ -4067,7 +4068,7 @@ declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, p
     connectedBranchId: number;
     connectedMinimaTick: number;
 } | undefined)[]>;
-declare function loadRelevantTicksHasDebtArrays(vaultId: number, program: Program<Vaults>): Promise<{
+declare function loadRelevantTicksHasDebtArrays(vaultId: number, topTick: number, program: Program<Vaults>): Promise<{
     vaultId: number;
     index: number;
     tickHasDebt: {
@@ -4145,5 +4146,5 @@ declare const getAllLiquidations: (params: Omit<LiquidateParams, "debtAmount" |
     }[];
 }[]>;
 
-export { MAX_TICK, MIN_TICK, TICKS_PER_TICK_HAS_DEBT, TICK_HAS_DEBT_ARRAY_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS, TOTAL_INDICES_NEEDED, ZERO_TICK_SCALED_RATIO, findNextTickWithDebt, getAccountOwner, getAllLiquidations, getCurrentPosition, getCurrentPositionState, getFinalPosition, getFirstTickForIndex, getInitPositionContext, getLiquidateContext, getLiquidateIx, getLiquidations, getOperateContext, getOperateIx, getRatioAtTick, getTickAtRatio, getTickIndices, getVaultsProgram, loadRelevantBranches, loadRelevantBranchesForLiquidate, loadRelevantTicksHasDebtArrays, loadRelevantTicksHasDebtArraysLiquidate, readOraclePrice, readTickHasDebtArray, simulateLiquidate };
+export { INIT_TICK, MAX_TICK, MIN_TICK, TICKS_PER_TICK_HAS_DEBT, TICK_HAS_DEBT_ARRAY_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS, TOTAL_INDICES_NEEDED, ZERO_TICK_SCALED_RATIO, findNextTickWithDebt, getAccountOwner, getAllLiquidations, getCurrentPosition, getCurrentPositionState, getFinalPosition, getFirstTickForIndex, getInitPositionContext, getLiquidateContext, getLiquidateIx, getLiquidations, getOperateContext, getOperateIx, getRatioAtTick, getTickAtRatio, getTickIndices, getVaultsProgram, loadRelevantBranches, loadRelevantBranchesForLiquidate, loadRelevantTicksHasDebtArrays, loadRelevantTicksHasDebtArraysLiquidate, readOraclePrice, readTickHasDebtArray, simulateLiquidate };
 export type { ConnectionParams, LiquidateContextParams, LiquidateParams, OperateContextParams, OperateParams };

package/dist/borrow/index.mjs

@@ -1219,10 +1219,11 @@ async function loadRelevantBranches(vaultId, vaultState, program) {
   }
   return branches.slice(0, 10);
 }
-async function loadRelevantTicksHasDebtArrays(vaultId, program) {
+async function loadRelevantTicksHasDebtArrays(vaultId, topTick, program) {
+  const { arrayIndex: topTickIndex } = getTickIndices(topTick);
   return await Promise.all(
     Array.from(
-      { length: 16 },
+      { length: topTickIndex },
       (_, i) => program.account.tickHasDebtArray.fetch(
         getTickHasDebt(vaultId, 15 - i)
       )
@@ -1460,14 +1461,22 @@ async function getOtherInstructionsOperate(vaultId, vaultState, currentPosition,
     finalTickIdDataPda
   };
 }
-async function getRemainingAccountsOperate(vaultId, vaultState, vaultConfig, program) {
+const tickHelper = (tickValue) => {
+  return tickValue === 0 ? INIT_TICK : tickValue;
+};
+async function getRemainingAccountsOperate(vaultId, vaultState, vaultConfig, finalPositionTick, 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),
-    loadRelevantTicksHasDebtArrays(vaultId, program)
+    loadRelevantTicksHasDebtArrays(
+      vaultId,
+      Math.max(finalPositionTick, tickHelper(vaultState.topmostTick)),
+      // max of both ticks
+      program
+    )
   ]);
   const sourceLength = oracleData.sources.length;
   for (const source of oracleData.sources)
@@ -1579,6 +1588,7 @@ async function getOperateContext({
     vaultId,
     vaultState,
     vaultConfig,
+    finalPosition.tick,
     program
   );
   const accounts = {
@@ -2133,15 +2143,18 @@ function parseVaultLiquidations(logs) {
       const match = log.match(/VaultLiquidationResult: \[([^\]]+)\]/);
       if (match && match[1]) {
         const values = match[1].split(", ").map((v) => v.trim());
-        results.push({
-          amtOut: values[0] || "0",
-          amtIn: values[1] || "0",
-          topTick: values[2] || "undefined"
-        });
+        const [amtOut, amtIn, topTick] = values;
+        if (amtIn && amtIn != "0" && amtOut && amtOut != "0" && topTick) {
+          results.push({
+            amtOut,
+            amtIn,
+            topTick
+          });
+        }
       }
     }
   }
   return results;
 }
 
-export { MAX_TICK$1 as MAX_TICK, MIN_TICK$1 as MIN_TICK, TICKS_PER_TICK_HAS_DEBT, TICK_HAS_DEBT_ARRAY_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS, TOTAL_INDICES_NEEDED, ZERO_TICK_SCALED_RATIO$1 as ZERO_TICK_SCALED_RATIO, findNextTickWithDebt, getAccountOwner, getAllLiquidations, getCurrentPosition, getCurrentPositionState, getFinalPosition, getFirstTickForIndex, getInitPositionContext, getLiquidateContext, getLiquidateIx, getLiquidations, getOperateContext, getOperateIx, getRatioAtTick, getTickAtRatio, getTickIndices, getVaultsProgram, loadRelevantBranches, loadRelevantBranchesForLiquidate, loadRelevantTicksHasDebtArrays, loadRelevantTicksHasDebtArraysLiquidate, readOraclePrice, readTickHasDebtArray, simulateLiquidate };
+export { INIT_TICK, MAX_TICK$1 as MAX_TICK, MIN_TICK$1 as MIN_TICK, TICKS_PER_TICK_HAS_DEBT, TICK_HAS_DEBT_ARRAY_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE, TICK_HAS_DEBT_CHILDREN_SIZE_IN_BITS, TOTAL_INDICES_NEEDED, ZERO_TICK_SCALED_RATIO$1 as ZERO_TICK_SCALED_RATIO, findNextTickWithDebt, getAccountOwner, getAllLiquidations, getCurrentPosition, getCurrentPositionState, getFinalPosition, getFirstTickForIndex, getInitPositionContext, getLiquidateContext, getLiquidateIx, getLiquidations, getOperateContext, getOperateIx, getRatioAtTick, getTickAtRatio, getTickIndices, getVaultsProgram, loadRelevantBranches, loadRelevantBranchesForLiquidate, loadRelevantTicksHasDebtArrays, loadRelevantTicksHasDebtArraysLiquidate, readOraclePrice, readTickHasDebtArray, simulateLiquidate };

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.80";
+const version = "0.0.82";
 
 export { version };

package/package.json

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