@kamino-finance/klend-sdk 6.0.5-beta.3 → 6.0.5-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/klend-sdk",
-  "version": "6.0.5-beta.3",
+  "version": "6.0.5-beta.5",
   "description": "Typescript SDK for interacting with the Kamino Lending (klend) protocol",
   "repository": {
     "type": "git",

package/src/classes/market.ts

@@ -1214,8 +1214,11 @@ export class KaminoMarket {
     for (const [feed, account] of oraclePrices) {
       oraclePriceMap.set(feed, account);
     }
-    for (const reserve of this.reserves.keys()) {
-      reserveOraclePrices.set(reserve, oraclePriceMap.get(reserve)!);
+    for (const [reserveAddress, reserve] of this.reserves) {
+      reserveOraclePrices.set(
+        reserveAddress,
+        oraclePriceMap.get(reserve.state.config.tokenInfo.scopeConfiguration.priceFeed)!
+      );
     }
     return reserveOraclePrices;
   }

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -117,26 +117,30 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   const inputAmountLamports = Decimal.min(maxWithdrawableCollLamports, maxCollNeededFromOracle);
 
   // Build the repay & withdraw collateral tx to get the number of accounts
-  const klendIxs: LeverageIxsOutput = await buildRepayWithCollateralIxs(
-    kaminoMarket,
-    debtReserve,
-    collReserve,
-    obligation,
-    referrer,
-    currentSlot,
-    budgetAndPriorityFeeIxs,
-    scopeRefreshConfig,
-    {
-      preActionIxs: [],
-      swapIxs: [],
-      lookupTables: [],
-      quote: {} as SwapQuote<QuoteResponse>,
-    },
-    isClosingPosition,
-    repayAmountLamports,
-    inputAmountLamports,
-    useV2Ixs
-  );
+  const klendIxs: LeverageIxsOutput = (
+    await buildRepayWithCollateralIxs(
+      kaminoMarket,
+      debtReserve,
+      collReserve,
+      obligation,
+      referrer,
+      currentSlot,
+      budgetAndPriorityFeeIxs,
+      scopeRefreshConfig,
+      [
+        {
+          preActionIxs: [],
+          swapIxs: [],
+          lookupTables: [],
+          quote: {} as SwapQuote<QuoteResponse>,
+        },
+      ],
+      isClosingPosition,
+      repayAmountLamports,
+      inputAmountLamports,
+      useV2Ixs
+    )
+  )[0];
   const uniqueKlendAccounts = uniqueAccountsWithProgramIds(klendIxs.instructions);
 
   const swapQuoteInputs: SwapInputs = {
@@ -238,34 +242,32 @@ export async function getRepayWithCollIxs<QuoteResponse>({
 
   const swapResponses = await swapper(swapInputs, initialInputs.klendAccounts, swapQuote);
 
-  return Promise.all(
-    swapResponses.map(async (swapResponse) => {
-      const ixs: LeverageIxsOutput = await buildRepayWithCollateralIxs(
-        kaminoMarket,
-        debtReserve,
-        collReserve,
-        obligation,
-        referrer,
-        currentSlot,
-        budgetAndPriorityFeeIxs,
-        scopeRefreshConfig,
-        swapResponse,
-        isClosingPosition,
-        debtRepayAmountLamports,
-        swapInputs.inputAmountLamports,
-        useV2Ixs
-      );
-
-      return {
-        ixs: ixs.instructions,
-        lookupTables: swapResponse.lookupTables,
-        swapInputs,
-        flashLoanInfo: ixs.flashLoanInfo,
-        initialInputs,
-        quote: swapResponse.quote.quoteResponse,
-      };
-    })
+  const repayWithCollateralIxs = await buildRepayWithCollateralIxs(
+    kaminoMarket,
+    debtReserve,
+    collReserve,
+    obligation,
+    referrer,
+    currentSlot,
+    budgetAndPriorityFeeIxs,
+    scopeRefreshConfig,
+    swapResponses,
+    isClosingPosition,
+    debtRepayAmountLamports,
+    swapInputs.inputAmountLamports,
+    useV2Ixs
   );
+
+  return repayWithCollateralIxs.map((ixs, index) => {
+    return {
+      ixs: ixs.instructions,
+      lookupTables: swapResponses[index].lookupTables,
+      swapInputs,
+      flashLoanInfo: ixs.flashLoanInfo,
+      initialInputs,
+      quote: swapResponses[index].quote.quoteResponse,
+    };
+  });
 }
 
 async function buildRepayWithCollateralIxs<QuoteResponse>(
@@ -277,12 +279,12 @@ async function buildRepayWithCollateralIxs<QuoteResponse>(
   currentSlot: number,
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
   scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-  swapQuoteIxs: SwapIxs<QuoteResponse>,
+  swapQuoteIxsArray: SwapIxs<QuoteResponse>[],
   isClosingPosition: boolean,
   debtRepayAmountLamports: Decimal,
   collWithdrawLamports: Decimal,
   useV2Ixs: boolean
-): Promise<LeverageIxsOutput> {
+): Promise<LeverageIxsOutput[]> {
   // 1. Create atas & budget txns
   const budgetIxs = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxs(1_400_000);
 
@@ -361,29 +363,31 @@ async function buildRepayWithCollateralIxs<QuoteResponse>(
   }
 
   // 4. Swap collateral to debt to repay flash loan
-  const { preActionIxs, swapIxs } = swapQuoteIxs;
-  const swapInstructions = removeBudgetIxs(swapIxs);
-
-  const ixs = [
-    ...scopeRefreshIxn,
-    ...budgetIxs,
-    ...atasAndIxs.map((x) => x.createAtaIx),
-    flashBorrowIx,
-    ...preActionIxs,
-    ...KaminoAction.actionToIxs(repayAndWithdrawAction),
-    ...swapInstructions,
-    flashRepayIx,
-  ];
-
-  const res: LeverageIxsOutput = {
-    flashLoanInfo: {
-      flashBorrowReserve: debtReserve.address,
-      flashLoanFee: debtReserve.getFlashLoanFee(),
-    },
-    instructions: ixs,
-  };
-
-  return res;
+  return swapQuoteIxsArray.map((swapQuoteIxs) => {
+    const { preActionIxs, swapIxs } = swapQuoteIxs;
+    const swapInstructions = removeBudgetIxs(swapIxs);
+
+    const ixs = [
+      ...scopeRefreshIxn,
+      ...budgetIxs,
+      ...atasAndIxs.map((x) => x.createAtaIx),
+      flashBorrowIx,
+      ...preActionIxs,
+      ...KaminoAction.actionToIxs(repayAndWithdrawAction),
+      ...swapInstructions,
+      flashRepayIx,
+    ];
+
+    const res: LeverageIxsOutput = {
+      flashLoanInfo: {
+        flashBorrowReserve: debtReserve.address,
+        flashLoanFee: debtReserve.getFlashLoanFee(),
+      },
+      instructions: ixs,
+    };
+
+    return res;
+  });
 }
 
 export const getMaxWithdrawLtvCheck = (

package/src/lending_operations/swap_collateral_operations.ts

@@ -161,7 +161,16 @@ export async function getSwapCollIxs<QuoteResponse>(
   //  - To construct 1. (i.e. flash-borrow), we need to know the target collateral swap-out from 4.
 
   // Construct the Klend's own ixs with a fake swap-out (only to learn the klend accounts used):
-  const fakeKlendIxs = await getKlendIxs(args, FAKE_TARGET_COLL_SWAP_OUT_AMOUNT, context);
+
+  const scopeRefreshIxn = await getScopeRefreshIx(
+    context.market,
+    context.sourceCollReserve,
+    context.targetCollReserve,
+    context.obligation,
+    context.scopeRefreshConfig
+  );
+
+  const fakeKlendIxs = await getKlendIxs(args, FAKE_TARGET_COLL_SWAP_OUT_AMOUNT, context, scopeRefreshIxn);
   const klendAccounts = uniqueAccountsWithProgramIds(listIxs(fakeKlendIxs));
 
   // Construct the external swap ixs (and learn the actual swap-out amount):
@@ -176,7 +185,7 @@ export async function getSwapCollIxs<QuoteResponse>(
       checkResultingObligationValid(args, externalSwapIxs.swapOutAmount, context);
 
       // Construct the Klend's own ixs with an actual swap-out amount:
-      const klendIxs = await getKlendIxs(args, externalSwapIxs.swapOutAmount, context);
+      const klendIxs = await getKlendIxs(args, externalSwapIxs.swapOutAmount, context, scopeRefreshIxn);
 
       return {
         ixs: listIxs(klendIxs, externalSwapIxs.ixs),
@@ -270,19 +279,12 @@ type SwapCollKlendIxs = {
 async function getKlendIxs(
   args: SwapCollArgs,
   targetCollSwapOutAmount: Decimal,
-  context: SwapCollContext<any>
+  context: SwapCollContext<any>,
+  scopeRefreshIxn: TransactionInstruction[]
 ): Promise<SwapCollKlendIxs> {
   const { ataCreationIxs, targetCollAta } = getAtaCreationIxs(context);
   const setupIxs = [...context.budgetAndPriorityFeeIxs, ...ataCreationIxs];
 
-  const scopeRefreshIxn = await getScopeRefreshIx(
-    context.market,
-    context.sourceCollReserve,
-    context.targetCollReserve,
-    context.obligation,
-    context.scopeRefreshConfig
-  );
-
   if (scopeRefreshIxn) {
     setupIxs.unshift(...scopeRefreshIxn);
   }