@jup-ag/lend 0.0.13 → 0.0.15

package/README.md

@@ -42,7 +42,7 @@ import { getOperateIx } from "@jup-ag/lend/borrow";
 const connection = new Connection("https://api.devnet.solana.com");
 const signer = new PublicKey("signerAddress");
 
-const { ixs, lookupTable } = await getOperateIx({
+const { ixs, addressLookupTableAccounts } = await getOperateIx({
   vaultId: 1,
   positionId: 0,
 

package/dist/borrow/index.d.mts

@@ -3634,7 +3634,7 @@ declare function getInitPositionContext(vaultId: number, positionId: number, sig
 };
 declare const getOperateIx: ({ vaultId, positionId, colAmount, debtAmount, connection, signer, recipient, positionOwner, }: OperateParams) => Promise<{
     nftId: number;
-    addressLookupTableAccounts: (_solana_web3_js.AddressLookupTableAccount | null)[];
+    addressLookupTableAccounts: _solana_web3_js.AddressLookupTableAccount[];
     ixs: TransactionInstruction[];
 }>;
 

package/dist/borrow/index.d.ts

@@ -3634,7 +3634,7 @@ declare function getInitPositionContext(vaultId: number, positionId: number, sig
 };
 declare const getOperateIx: ({ vaultId, positionId, colAmount, debtAmount, connection, signer, recipient, positionOwner, }: OperateParams) => Promise<{
     nftId: number;
-    addressLookupTableAccounts: (_solana_web3_js.AddressLookupTableAccount | null)[];
+    addressLookupTableAccounts: _solana_web3_js.AddressLookupTableAccount[];
     ixs: TransactionInstruction[];
 }>;
 

package/dist/borrow/index.mjs

@@ -475,12 +475,12 @@ const oracle = {
 	types: types
 };
 
-const MIN_TICK$2 = -16383;
+const MIN_TICK$1 = -16383;
 const MAX_TICK$1 = 16383;
 const ZERO_TICK_SCALED_RATIO$1 = new BN(281474976710656);
 function getRatioAtTick(tick) {
-  if (tick < MIN_TICK$2 || tick > MAX_TICK$1) {
-    throw new Error(`Tick ${tick} out of range [${MIN_TICK$2}, ${MAX_TICK$1}]`);
+  if (tick < MIN_TICK$1 || tick > MAX_TICK$1) {
+    throw new Error(`Tick ${tick} out of range [${MIN_TICK$1}, ${MAX_TICK$1}]`);
   }
   const FACTOR00 = new BN("18446744073709551616");
   const FACTOR01 = new BN("18419115400608638658");
@@ -669,7 +669,7 @@ function mulBigNumber(bigNumber1, bigNumber2) {
 }
 
 const INIT_TICK = -2147483648;
-const MIN_TICK$1 = -16383;
+const MIN_TICK = -16383;
 const MAX_TICK = 16383;
 const MAX_MASK_DEBT_FACTOR = new BN("1125899906842623");
 const EXCHANGE_PRICES_PRECISION = new BN(10).pow(new BN(12));
@@ -684,11 +684,11 @@ const getCurrentPositionState = async ({
 }) => {
   let positionTick = position.tick;
   if (positionTick === INIT_TICK) {
-    positionTick = MIN_TICK$1;
+    positionTick = MIN_TICK;
   }
   if (position.isSupplyOnlyPosition) {
     return {
-      tick: MIN_TICK$1,
+      tick: MIN_TICK,
       tickId: 0,
       colRaw: new BN(position.supplyAmount.toString()),
       finalAmount: new BN(position.supplyAmount.toString()),
@@ -700,14 +700,14 @@ const getCurrentPositionState = async ({
   let colRaw = new BN(position.supplyAmount.toString());
   let dustDebtRaw = new BN(position.dustDebtAmount.toString());
   let debtRaw = new BN(0);
-  if (positionTick > MIN_TICK$1) {
+  if (positionTick > MIN_TICK) {
     const collateralForDebtCalc = colRaw.add(new BN(1));
     const ratio = getRatioAtTick(positionTick);
     debtRaw = ratio.mul(collateralForDebtCalc).shrn(48).add(new BN(1));
   } else {
     debtRaw = new BN(0);
   }
-  if (positionTick > MIN_TICK$1) {
+  if (positionTick > MIN_TICK) {
     const tickData = await program.account.tick.fetch(
       getTick(vaultId, positionTick)
     );
@@ -719,7 +719,7 @@ const getCurrentPositionState = async ({
       const { isFullyLiquidated, branchId, connectionFactor } = getLiquidationStatus(position.tickId, tickData, tickIdData);
       if (isFullyLiquidated) {
         return {
-          tick: MIN_TICK$1,
+          tick: MIN_TICK,
           tickId: 0,
           colRaw: new BN(0),
           debtRaw: new BN(0),
@@ -742,7 +742,7 @@ const getCurrentPositionState = async ({
         debtRaw: finalDebtRaw,
         dustDebtRaw,
         finalAmount: netDebtRaw2.gt(new BN(0)) ? finalColRaw : new BN(0),
-        isSupplyOnlyPosition: finalTick === MIN_TICK$1
+        isSupplyOnlyPosition: finalTick === MIN_TICK
       };
     }
   }
@@ -754,7 +754,7 @@ const getCurrentPositionState = async ({
     debtRaw,
     dustDebtRaw,
     finalAmount: netDebtRaw.gt(new BN(0)) ? colRaw : new BN(0),
-    isSupplyOnlyPosition: positionTick === MIN_TICK$1
+    isSupplyOnlyPosition: positionTick === MIN_TICK
   };
 };
 async function getAllBranches({
@@ -841,7 +841,7 @@ async function processLiquidatedPosition({
   let positionDebtRaw = new BN(0);
   if (currentBranch.status === 3 || currentConnectionFactor.eq(MAX_MASK_DEBT_FACTOR)) {
     positionDebtRaw = new BN(0);
-    finalTick = MIN_TICK$1;
+    finalTick = MIN_TICK;
   } else {
     positionDebtRaw = mulDivNormal(
       initialDebtRaw,
@@ -862,7 +862,7 @@ async function processLiquidatedPosition({
         ratioLength.mul(new BN(currentBranch.minimaTickPartials)).div(X30)
       );
       finalColRaw = positionDebtRaw.mul(ZERO_TICK_SCALED_RATIO).div(finalRatio);
-    } else finalTick = MIN_TICK$1;
+    } else finalTick = MIN_TICK;
   }
   return {
     finalTick,
@@ -920,7 +920,7 @@ const calculateFinalPosition = async ({
   let finalTick;
   let isSupplyOnlyPosition;
   if (netDebtRaw.eq(new BN(0)) || colRaw.eq(new BN(0))) {
-    finalTick = MIN_TICK$1;
+    finalTick = MIN_TICK;
     isSupplyOnlyPosition = true;
   } else {
     const marginAdjustedDebt = netDebtRaw.mul(new BN(1000000001)).div(new BN(1e9)).add(new BN(1));
@@ -930,8 +930,8 @@ const calculateFinalPosition = async ({
     finalTick = baseTickAtRatio + 1;
     const ratioNew = ratioAtTick.mul(TICK_SPACING).div(new BN(1e4));
     ratioNew.mul(colRaw).shrn(48);
-    if (finalTick < MIN_TICK$1) {
-      finalTick = MIN_TICK$1;
+    if (finalTick < MIN_TICK) {
+      finalTick = MIN_TICK;
     } else if (finalTick > MAX_TICK) {
       finalTick = MAX_TICK;
     }
@@ -1007,7 +1007,7 @@ async function loadRelevantBranches(vaultId, vaultState, program) {
       branches.push({
         branchId: 1,
         status: 0,
-        minimaTick: MIN_TICK$1,
+        minimaTick: MIN_TICK,
         minimaTickPartials: 0,
         debtLiquidity: 0,
         debtFactor: 0,
@@ -1030,15 +1030,13 @@ async function loadRelevantTicksHasDebtArrays(vaultId, program) {
 }
 
 const MIN_I128 = new BN("170141183460469231731687303715884105728").neg();
-const MIN_TICK = -16383;
 async function getOtherInstructionsOperate(vaultId, vaultState, currentPosition, finalPosition, currentTick, program, signer) {
   const otherIxs = [];
   const tickToRead = [currentTick];
   let currentTickData;
   let finalTickData;
-  if (currentPosition.tick > MIN_TICK) tickToRead.push(currentPosition.tick);
-  if (finalPosition.tick > MIN_TICK && finalPosition.tick !== currentPosition.tick)
-    tickToRead.push(finalPosition.tick);
+  tickToRead.push(currentPosition.tick);
+  tickToRead.push(finalPosition.tick);
   if (tickToRead.length > 0) {
     const tickData = await program.account.tick.fetchMultiple(
       tickToRead.map((tick) => getTick(vaultId, tick))
@@ -1082,11 +1080,22 @@ async function getOtherInstructionsOperate(vaultId, vaultState, currentPosition,
     finalPosition.tick,
     finalTickData ? finalTickData.totalIds : 0
   );
-  if (finalPosition.tick !== currentTick && finalTickData)
-    tickIdsToRead.push({
-      tick: finalPosition.tick,
-      totalIds: finalTickData.totalIds
-    });
+  if (finalPosition.tick !== currentTick)
+    if (finalTickData) {
+      tickIdsToRead.push({
+        tick: finalPosition.tick,
+        totalIds: finalTickData.totalIds
+      });
+    } else {
+      const context = await getInitTickIdLiquidationContext(
+        vaultId,
+        finalPosition.tick,
+        signer,
+        program
+      );
+      const ix = await program.methods.initTickIdLiquidation(vaultId, finalPosition.tick, 0).accounts(context).instruction();
+      otherIxs.push(ix);
+    }
   const tickIdData = await program.account.tickIdLiquidation.fetchMultiple(
     tickIdsToRead.map(
       ({ tick, totalIds }) => getTickIdLiquidation(vaultId, tick, totalIds)
@@ -1378,7 +1387,7 @@ const getOperateIx = async ({
   ]);
   return {
     nftId,
-    addressLookupTableAccounts: [addressLookupTable.value],
+    addressLookupTableAccounts: addressLookupTable.value ? [addressLookupTable.value] : [],
     ixs: initPositionIx ? [initPositionIx, ...otherIxs, operateIx] : [...otherIxs, operateIx]
   };
 };

package/package.json

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