@jup-ag/lend 0.0.25 → 0.0.27

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;

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;

package/dist/borrow/index.mjs

@@ -1,6 +1,6 @@
-import { Keypair, PublicKey, SystemProgram } from '@solana/web3.js';
+import { Transaction, PublicKey, SystemProgram } from '@solana/web3.js';
 import BN from 'bn.js';
-import { Program, AnchorProvider, Wallet } from '@coral-xyz/anchor';
+import { Program } from '@coral-xyz/anchor';
 import { g as getTick, a as getTickIdLiquidation, c as getVaultConfig, d as getBranch, e as getTickHasDebt, f as getVaultState, v as vaults, h as getVaultMetadata, i as getPosition, j as getLiquidity, k as getClaimAccount, l as getRateModel, m as getUserBorrowPosition, n as getUserSupplyPosition, o as getLiquidityReserve, p as getPositionTokenAccount, q as getPositionMint, r as getVaultAdmin } from '../shared/lend.ByEareGr.mjs';
 import { h as getReserve, e as liquidity } from '../shared/lend.Byg4n7y5.mjs';
 import { getMint, getAssociatedTokenAddressSync, TOKEN_PROGRAM_ID, ASSOCIATED_TOKEN_PROGRAM_ID } from '@solana/spl-token';
@@ -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))) {
@@ -1033,19 +1034,24 @@ async function loadRelevantTicksHasDebtArrays(vaultId, program) {
 async function getExchangePrices({
   vaultId,
   vaultConfig,
-  connection
+  connection,
+  signer
 }) {
-  const program = new Program(
-    vaults,
-    new AnchorProvider(connection, new Wallet(Keypair.generate()))
-  );
-  const { raw } = await program.methods.getExchangePrices().accounts({
+  const program = new Program(vaults, { connection });
+  const ix = await program.methods.getExchangePrices().accounts({
     vaultState: getVaultState(vaultId),
     vaultConfig: getVaultConfig(vaultId),
     supplyTokenReserves: getReserve(vaultConfig.supplyToken),
     borrowTokenReserves: getReserve(vaultConfig.borrowToken)
-  }).simulate();
-  const returnLog = raw?.find((log) => log.startsWith("Program return:"));
+  }).instruction();
+  const transaction = new Transaction().add(ix);
+  const latestBlockHash = await connection.getLatestBlockhash();
+  transaction.recentBlockhash = latestBlockHash.blockhash;
+  transaction.feePayer = signer;
+  const raw = await connection.simulateTransaction(transaction);
+  const returnLog = raw.value.logs?.find(
+    (log) => log.startsWith("Program return:")
+  );
   if (!returnLog) {
     throw new Error("No return data found in logs");
   }
@@ -1264,7 +1270,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.25";
+const version = "0.0.27";
 
 export { version };

package/package.json

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