@jup-ag/lend 0.0.26 → 0.0.28

package/dist/borrow/index.d.mts

@@ -3709,13 +3709,14 @@ declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurr
     dustDebtRaw: BN;
     isSupplyOnlyPosition: boolean;
 }>;
-declare const calculateFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, }: {
+declare const calculateFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, signer, }: {
     vaultId: number;
     currentPosition: Awaited<ReturnType<typeof getCurrentPositionState>>;
     newColAmount: BN;
     newDebtAmount: BN;
     program: Program<Vaults>;
     connection: Connection;
+    signer: PublicKey;
 }) => Promise<{
     tick: number;
     tickId: number;
@@ -3725,26 +3726,7 @@ declare const calculateFinalPosition: ({ vaultId, currentPosition, newColAmount,
     finalAmount: BN;
     isSupplyOnlyPosition: boolean;
 }>;
-declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, program: Program<Vaults>): Promise<({
-    vaultId: number;
-    branchId: number;
-    status: number;
-    minimaTick: number;
-    minimaTickPartials: number;
-    debtLiquidity: BN;
-    debtFactor: BN;
-    connectedBranchId: number;
-    connectedMinimaTick: number;
-} | {
-    branchId: number;
-    status: number;
-    minimaTick: number;
-    minimaTickPartials: number;
-    debtLiquidity: number;
-    debtFactor: number;
-    connectedBranchId: number;
-    connectedMinimaTick: number;
-} | undefined)[]>;
+declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, program: Program<Vaults>): Promise<number[]>;
 declare function loadRelevantTicksHasDebtArrays(vaultId: number, program: Program<Vaults>): Promise<{
     vaultId: number;
     index: number;

package/dist/borrow/index.d.ts

@@ -3709,13 +3709,14 @@ declare const getCurrentPositionState: ({ vaultId, position, program, }: GetCurr
     dustDebtRaw: BN;
     isSupplyOnlyPosition: boolean;
 }>;
-declare const calculateFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, }: {
+declare const calculateFinalPosition: ({ vaultId, currentPosition, newColAmount, newDebtAmount, program, connection, signer, }: {
     vaultId: number;
     currentPosition: Awaited<ReturnType<typeof getCurrentPositionState>>;
     newColAmount: BN;
     newDebtAmount: BN;
     program: Program<Vaults>;
     connection: Connection;
+    signer: PublicKey;
 }) => Promise<{
     tick: number;
     tickId: number;
@@ -3725,26 +3726,7 @@ declare const calculateFinalPosition: ({ vaultId, currentPosition, newColAmount,
     finalAmount: BN;
     isSupplyOnlyPosition: boolean;
 }>;
-declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, program: Program<Vaults>): Promise<({
-    vaultId: number;
-    branchId: number;
-    status: number;
-    minimaTick: number;
-    minimaTickPartials: number;
-    debtLiquidity: BN;
-    debtFactor: BN;
-    connectedBranchId: number;
-    connectedMinimaTick: number;
-} | {
-    branchId: number;
-    status: number;
-    minimaTick: number;
-    minimaTickPartials: number;
-    debtLiquidity: number;
-    debtFactor: number;
-    connectedBranchId: number;
-    connectedMinimaTick: number;
-} | undefined)[]>;
+declare function loadRelevantBranches(vaultId: number, vaultState: VaultState, program: Program<Vaults>): Promise<number[]>;
 declare function loadRelevantTicksHasDebtArrays(vaultId: number, program: Program<Vaults>): Promise<{
     vaultId: number;
     index: number;

package/dist/borrow/index.mjs

@@ -876,7 +876,8 @@ const calculateFinalPosition = async ({
   newColAmount,
   newDebtAmount,
   program,
-  connection
+  connection,
+  signer
 }) => {
   const [vaultConfig] = await Promise.all([
     program.account.vaultConfig.fetch(getVaultConfig(vaultId))
@@ -884,7 +885,7 @@ const calculateFinalPosition = async ({
   const {
     vaultSupplyExchangePrice: supplyExPrice,
     vaultBorrowExchangePrice: borrowExPrice
-  } = await getExchangePrices({ vaultId, vaultConfig, connection });
+  } = await getExchangePrices({ vaultId, vaultConfig, connection, signer });
   const borrowFee = vaultConfig.borrowFee;
   let { colRaw, debtRaw, dustDebtRaw } = currentPosition;
   if (newColAmount.gt(new BN(0))) {
@@ -950,75 +951,42 @@ const calculateFinalPosition = async ({
   };
 };
 async function loadRelevantBranches(vaultId, vaultState, program) {
-  const branches = [];
+  const addedBranchIds = /* @__PURE__ */ new Set();
   const currentBranchId = vaultState.currentBranchId;
+  let connectedBranchId = 0;
   if (currentBranchId > 0) {
     try {
       const currentBranch = await program.account.branch.fetch(
         getBranch(vaultId, currentBranchId)
       );
       if (currentBranch) {
-        branches.push(currentBranch);
+        addedBranchIds.add(currentBranch.branchId);
+        connectedBranchId = currentBranch.connectedBranchId;
       }
     } catch (error) {
       console.warn(`Failed to fetch current branch ${currentBranchId}:`, error);
     }
   }
-  if (branches.length > 0) {
-    let connectedBranchId = branches[0].connectedBranchId;
-    while (connectedBranchId > 0 && branches.length < 10) {
-      try {
-        const connectedBranch = await program.account.branch.fetch(
-          getBranch(vaultId, connectedBranchId)
-        );
-        if (connectedBranch) {
-          branches.push(connectedBranch);
-          connectedBranchId = connectedBranch.connectedBranchId;
-        } else {
-          break;
-        }
-      } catch (error) {
-        console.warn(
-          `Failed to fetch connected branch ${connectedBranchId}:`,
-          error
-        );
-        break;
-      }
-    }
-  }
-  if (branches.length < 10) {
-    for (let i = 1; i <= vaultState.totalBranchId && branches.length < 10; i++) {
-      if (branches.some((b) => b.branchId === i)) {
-        continue;
-      }
-      try {
-        const branch = await program.account.branch.fetch(
-          getBranch(vaultId, i)
-        );
-        if (branch) {
-          branches.push(branch);
-        }
-      } catch (error) {
-      }
-    }
-  }
-  while (branches.length < 10) {
-    if (branches.length > 0) {
-      branches.push(branches[0]);
-    } else {
-      branches.push({
-        branchId: 1,
-        status: 0,
-        minimaTick: MIN_TICK,
-        minimaTickPartials: 0,
-        debtLiquidity: 0,
-        debtFactor: 0,
-        connectedBranchId: 0,
-        connectedMinimaTick: 0
-      });
+  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;
     }
   }
-  return branches.slice(0, 10);
+  if (!addedBranchIds.has(0)) addedBranchIds.add(0);
+  return Array.from(addedBranchIds);
 }
 async function loadRelevantTicksHasDebtArrays(vaultId, program) {
   return await Promise.all(
@@ -1033,7 +1001,8 @@ async function loadRelevantTicksHasDebtArrays(vaultId, program) {
 async function getExchangePrices({
   vaultId,
   vaultConfig,
-  connection
+  connection,
+  signer
 }) {
   const program = new Program(vaults, { connection });
   const ix = await program.methods.getExchangePrices().accounts({
@@ -1045,9 +1014,7 @@ async function getExchangePrices({
   const transaction = new Transaction().add(ix);
   const latestBlockHash = await connection.getLatestBlockhash();
   transaction.recentBlockhash = latestBlockHash.blockhash;
-  transaction.feePayer = new PublicKey(
-    "7ty28gFJMqjxz3YxAY3uBZs7vYXU7rcM8j7F96Akx9tQ"
-  );
+  transaction.feePayer = signer;
   const raw = await connection.simulateTransaction(transaction);
   const returnLog = raw.value.logs?.find(
     (log) => log.startsWith("Program return:")
@@ -1185,7 +1152,7 @@ async function getRemainingAccountsOperate(vaultId, vaultState, vaultConfig, pro
   for (const branch of branches) {
     if (!branch) continue;
     remainingAccounts.push({
-      pubkey: getBranch(vaultId, branch.branchId),
+      pubkey: getBranch(vaultId, branch),
       isWritable: true,
       isSigner: false
     });
@@ -1270,7 +1237,8 @@ async function getOperateContext({
     newColAmount: newCol,
     newDebtAmount: newDebt,
     program,
-    connection
+    connection,
+    signer
   });
   const { otherIxs, newBranchPda, currentTickIdDataPda, finalTickIdDataPda } = await getOtherInstructionsOperate(
     vaultId,

package/dist/index.mjs

@@ -5,6 +5,6 @@ import '@solana/web3.js';
 import '@solana/spl-token';
 import 'bn.js';
 
-const version = "0.0.26";
+const version = "0.0.28";
 
 export { version };

package/package.json

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