@jup-ag/lend 0.0.76 → 0.0.78

package/dist/borrow/index.d.mts

@@ -3909,10 +3909,9 @@ type LiquidateParams = {
 type LiquidateContextParams = {
     vaultId: number;
     to: PublicKey;
-    sources: PublicKey[];
     program: Program<Vaults>;
 } & ConnectionParams;
-declare function getLiquidateContext({ vaultId, to, sources, program, connection, signer, }: LiquidateContextParams): Promise<{
+declare function getLiquidateContext({ vaultId, to, program, connection, signer, }: LiquidateContextParams): Promise<{
     accounts: {
         signer: PublicKey;
         signerTokenAccount: PublicKey;
@@ -4075,7 +4074,31 @@ declare function loadRelevantTicksHasDebtArrays(vaultId: number, program: Progra
         childrenBits: number[];
     }[];
 }[]>;
+declare function loadRelevantTicksHasDebtArraysLiquidate(vaultId: number, topTick: number, nextTick: number, program: Program<Vaults>): Promise<{
+    vaultId: number;
+    index: number;
+    tickHasDebt: {
+        childrenBits: number[];
+    }[];
+}[]>;
 declare function loadRelevantBranchesForLiquidate(vaultId: number, vaultState: any, program: Program<Vaults>): Promise<any[]>;
+declare function readOraclePrice({ connection, signer, oracle, }: {
+    connection: Connection;
+    signer?: PublicKey;
+    oracle: PublicKey;
+}): Promise<{
+    oraclePriceOperate: any;
+    oraclePriceLiquidate: any;
+    oracleSources: {
+        source: PublicKey;
+        invert: boolean;
+        multiplier: BN;
+        divisor: BN;
+        sourceType: {} & {
+            pyth: Record<string, never>;
+        };
+    }[];
+}>;
 
 declare const MIN_TICK = -16383;
 declare const MAX_TICK = 16383;
@@ -4122,5 +4145,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, readTickHasDebtArray, simulateLiquidate };
+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 type { ConnectionParams, LiquidateContextParams, LiquidateParams, OperateContextParams, OperateParams };

package/dist/borrow/index.d.ts

@@ -3909,10 +3909,9 @@ type LiquidateParams = {
 type LiquidateContextParams = {
     vaultId: number;
     to: PublicKey;
-    sources: PublicKey[];
     program: Program<Vaults>;
 } & ConnectionParams;
-declare function getLiquidateContext({ vaultId, to, sources, program, connection, signer, }: LiquidateContextParams): Promise<{
+declare function getLiquidateContext({ vaultId, to, program, connection, signer, }: LiquidateContextParams): Promise<{
     accounts: {
         signer: PublicKey;
         signerTokenAccount: PublicKey;
@@ -4075,7 +4074,31 @@ declare function loadRelevantTicksHasDebtArrays(vaultId: number, program: Progra
         childrenBits: number[];
     }[];
 }[]>;
+declare function loadRelevantTicksHasDebtArraysLiquidate(vaultId: number, topTick: number, nextTick: number, program: Program<Vaults>): Promise<{
+    vaultId: number;
+    index: number;
+    tickHasDebt: {
+        childrenBits: number[];
+    }[];
+}[]>;
 declare function loadRelevantBranchesForLiquidate(vaultId: number, vaultState: any, program: Program<Vaults>): Promise<any[]>;
+declare function readOraclePrice({ connection, signer, oracle, }: {
+    connection: Connection;
+    signer?: PublicKey;
+    oracle: PublicKey;
+}): Promise<{
+    oraclePriceOperate: any;
+    oraclePriceLiquidate: any;
+    oracleSources: {
+        source: PublicKey;
+        invert: boolean;
+        multiplier: BN;
+        divisor: BN;
+        sourceType: {} & {
+            pyth: Record<string, never>;
+        };
+    }[];
+}>;
 
 declare const MIN_TICK = -16383;
 declare const MAX_TICK = 16383;
@@ -4122,5 +4145,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, readTickHasDebtArray, simulateLiquidate };
+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 type { ConnectionParams, LiquidateContextParams, LiquidateParams, OperateContextParams, OperateParams };

package/dist/borrow/index.mjs

@@ -1,4 +1,4 @@
-import { Transaction, PublicKey, SystemProgram, SYSVAR_RENT_PUBKEY, SYSVAR_INSTRUCTIONS_PUBKEY, TransactionMessage, ComputeBudgetProgram, VersionedTransaction } from '@solana/web3.js';
+import { PublicKey, VersionedTransaction, Transaction, SystemProgram, SYSVAR_RENT_PUBKEY, SYSVAR_INSTRUCTIONS_PUBKEY, TransactionMessage, ComputeBudgetProgram } from '@solana/web3.js';
 import BN from 'bn.js';
 import { Program } from '@coral-xyz/anchor';
 import { l as liquidity } from '../shared/lend.CioR9-te.mjs';
@@ -889,9 +889,29 @@ const getCurrentPositionState = async ({
       getTick(vaultId, positionTick)
     );
     if (tickData.isLiquidated || tickData.totalIds > position.tickId) {
-      const tickIdData = await program.account.tickIdLiquidation.fetch(
-        getTickIdLiquidation(vaultId, positionTick, position.tickId)
-      );
+      let tickIdData = await program.account.tickIdLiquidation.fetch(
+        getTickIdLiquidation(
+          vaultId,
+          positionTick,
+          position.tickId
+        )
+      ).catch(() => null);
+      if (!tickIdData) {
+        tickIdData = {
+          vaultId,
+          tick: positionTick,
+          tickMap: position.tickId,
+          isFullyLiquidated1: 0,
+          liquidationBranchId1: 0,
+          debtFactor1: new BN(0),
+          isFullyLiquidated2: 0,
+          liquidationBranchId2: 0,
+          debtFactor2: new BN(0),
+          isFullyLiquidated3: 0,
+          liquidationBranchId3: 0,
+          debtFactor3: new BN(0)
+        };
+      }
       const branches = await getAllBranches({ vaultId, program });
       const { isFullyLiquidated, branchId, connectionFactor } = getLiquidationStatus(position.tickId, tickData, tickIdData);
       if (isFullyLiquidated) {
@@ -1246,6 +1266,23 @@ async function getExchangePrices({
     vaultBorrowExchangePrice
   };
 }
+async function loadRelevantTicksHasDebtArraysLiquidate(vaultId, topTick, nextTick, program) {
+  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)
+      )
+    );
+  }
+  const results = await Promise.allSettled(promises);
+  const tickHasDebtArrays = results.filter((result) => result.status === "fulfilled").map(
+    (result) => result.value
+  );
+  return tickHasDebtArrays;
+}
 async function loadRelevantBranchesForLiquidate(vaultId, vaultState, program) {
   const branches = [];
   const currentBranchId = vaultState.currentBranchId;
@@ -1275,6 +1312,51 @@ async function loadRelevantBranchesForLiquidate(vaultId, vaultState, program) {
   if (!doesBranchExist(0)) branches.push({ branchId: 0 });
   return branches;
 }
+async function readOraclePrice({
+  connection,
+  signer,
+  oracle: oracle$1
+}) {
+  signer ??= new PublicKey("JupRhwjrF5fAcs6dFhLH59r3TJFvbcyLP2NRM8UGH9H");
+  const program = new Program(oracle, {
+    connection,
+    publicKey: signer,
+    async simulate(tx) {
+      if (tx instanceof VersionedTransaction) {
+        const res = await connection.simulateTransaction(tx);
+        if (res.value.err) {
+          throw new Error(`Simulation failed: ${res.value.err}`);
+        }
+        return res.value;
+      } else {
+        tx.feePayer = signer;
+        const res = await connection.simulateTransaction(tx);
+        if (res.value.err) {
+          throw new Error(`Simulation failed: ${res.value.err}`);
+        }
+        return res.value;
+      }
+    }
+  });
+  const oracleData = await program.account.oracle.fetch(oracle$1);
+  let remainingAccounts = [];
+  for (const source of oracleData.sources) {
+    remainingAccounts.push({
+      pubkey: source.source,
+      isWritable: false,
+      isSigner: false
+    });
+  }
+  const [oraclePriceOperate, oraclePriceLiquidate] = await Promise.all([
+    program.methods.getExchangeRateOperate(oracleData.nonce).accounts({ oracle: oracle$1 }).remainingAccounts(remainingAccounts).view(),
+    program.methods.getExchangeRateLiquidate(oracleData.nonce).accounts({ oracle: oracle$1 }).remainingAccounts(remainingAccounts).view()
+  ]);
+  return {
+    oraclePriceOperate,
+    oraclePriceLiquidate,
+    oracleSources: oracleData.sources
+  };
+}
 
 const MPL_TOKEN_METADATA_PROGRAM_ID = new PublicKey(
   "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s"
@@ -1704,7 +1786,6 @@ async function getInitTickIdLiquidationContext(vaultId, tick, signer, program) {
 async function getLiquidateContext({
   vaultId,
   to,
-  sources,
   program,
   connection,
   signer
@@ -1733,10 +1814,10 @@ async function getLiquidateContext({
   } = await getRemainingAccountsLiquidate(
     vaultId,
     vaultState,
+    vaultConfig,
     otherIxs,
-    vaultConfig.oracle,
-    sources,
     program,
+    connection,
     signer
   );
   return {
@@ -1832,7 +1913,6 @@ const getLiquidateIx = async ({
   } = await getLiquidateContext({
     vaultId,
     to,
-    sources: [],
     program,
     signer,
     connection
@@ -1883,11 +1963,10 @@ async function getOtherInstructionsLiquidate(vaultId, vaultState, program, signe
     newBranchPda
   };
 }
-async function loadRelevantTicksForLiquidate(vaultId, vaultState, program) {
+async function loadRelevantTicksForLiquidate(vaultId, vaultState, liquidationTick, program) {
   const ticks = [];
-  const MAX_TICKS = 15;
   let topTick = vaultState.topmostTick;
-  if (topTick > MIN_TICK$1)
+  if (topTick > liquidationTick)
     try {
       const topTickData = await program.account.tick.fetch(
         getTick(vaultId, topTick)
@@ -1903,7 +1982,7 @@ async function loadRelevantTicksForLiquidate(vaultId, vaultState, program) {
     console.warn(`Failed to find next tick with debt:`, error);
   }
   const doesTickExist = (tick) => ticks.some((t) => t.tick === tick);
-  while (nextTick > MIN_TICK$1 && !doesTickExist(nextTick) && ticks.length < MAX_TICKS) {
+  while (nextTick > liquidationTick && !doesTickExist(nextTick)) {
     try {
       const nextTickData = await program.account.tick.fetch(
         getTick(vaultId, nextTick)
@@ -1915,27 +1994,40 @@ async function loadRelevantTicksForLiquidate(vaultId, vaultState, program) {
       console.warn(`Failed to fetch next tick ${nextTick}:`, error);
     }
   }
-  return ticks;
+  return { ticks, nextTick };
 }
-async function getRemainingAccountsLiquidate(vaultId, vaultState, otherIxs, oracleAddress, sources, program, signer) {
+async function getRemainingAccountsLiquidate(vaultId, vaultState, vaultConfig, otherIxs, program, connection, signer) {
   const remainingAccounts = [];
-  if (sources.length === 0) {
-    const oracleProgram = new Program(oracle, program.provider);
-    const oracleData = await oracleProgram.account.oracle.fetch(oracleAddress);
-    sources = oracleData.sources.map((source) => new PublicKey(source.source));
-  }
-  for (const source of sources) {
+  const { oraclePriceLiquidate, oracleSources } = await readOraclePrice({
+    oracle: vaultConfig.oracle,
+    connection,
+    signer
+  });
+  const liquidationRatio = new BN(oraclePriceLiquidate).div(new BN(10).pow(new BN(15))).mul(new BN(281474976710656));
+  const liquidationThresholdRatio = liquidationRatio.mul(new BN(vaultConfig.liquidationThreshold)).div(new BN(10).pow(new BN(3)));
+  const liquidationTick = getTickAtRatio(liquidationThresholdRatio);
+  for (const source of oracleSources) {
     remainingAccounts.push({
-      pubkey: source,
+      pubkey: source.source,
       isWritable: false,
       isSigner: false
     });
   }
-  const [branches, tickAccounts, tickHasDebt] = await Promise.all([
+  const [branches, { ticks: tickAccounts, nextTick }] = await Promise.all([
     loadRelevantBranchesForLiquidate(vaultId, vaultState, program),
-    loadRelevantTicksForLiquidate(vaultId, vaultState, program),
-    loadRelevantTicksHasDebtArrays(vaultId, program)
+    loadRelevantTicksForLiquidate(
+      vaultId,
+      vaultState,
+      liquidationTick,
+      program
+    )
   ]);
+  const tickHasDebt = await loadRelevantTicksHasDebtArraysLiquidate(
+    vaultId,
+    vaultState.topmostTick,
+    nextTick,
+    program
+  );
   for (const branch of branches) {
     remainingAccounts.push({
       pubkey: getBranch(vaultId, branch.branchId),
@@ -1979,7 +2071,7 @@ async function getRemainingAccountsLiquidate(vaultId, vaultState, otherIxs, orac
     });
   }
   const remainingAccountsIndices = [
-    sources.length,
+    oracleSources.length,
     branches.length,
     tickAccounts.length,
     tickHasDebt.length
@@ -2054,4 +2146,4 @@ function parseVaultLiquidations(logs) {
   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, readTickHasDebtArray, simulateLiquidate };
+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 };

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

package/package.json

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