@kamino-finance/klend-sdk 7.3.10-beta.0 → 7.3.10-beta.1

package/src/leverage/operations.ts

@@ -28,6 +28,8 @@ import {
   removeBudgetIxs,
   uniqueAccountsWithProgramIds,
   WRAPPED_SOL_MINT,
+  MultiplyObligationFixedRate,
+  LeverageObligationFixedRate,
 } from '../utils';
 import {
   adjustDepositLeverageCalcs,
@@ -68,8 +70,8 @@ export const WITHDRAW_SLOT_OFFSET = 150; // Offset for the withdraw slot to unde
 export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
   owner,
   kaminoMarket,
-  debtTokenMint,
-  collTokenMint,
+  debtReserveAddress,
+  collReserveAddress,
   depositAmount,
   priceDebtToColl,
   slippagePct,
@@ -90,13 +92,20 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
   swapInputs: SwapInputs;
   initialInputs: DepositLeverageInitialInputs<QuoteResponse>;
 }> {
-  const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
-  const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const collReserve = kaminoMarket.getExistingReserveByAddress(collReserveAddress);
+  const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
+  const collTokenMint = collReserve.getLiquidityMint();
+  const debtTokenMint = debtReserve.getLiquidityMint();
+  const solTokenReserve =
+    collReserve.getLiquidityMint() === WRAPPED_SOL_MINT
+      ? collReserve
+      : debtReserve.getLiquidityMint() === WRAPPED_SOL_MINT
+      ? debtReserve
+      : undefined;
   const flashLoanFee = collReserve.getFlashLoanFee() || new Decimal(0);
 
-  const selectedTokenIsCollToken = selectedTokenMint === collTokenMint;
-  const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint === solTokenReserve!.getLiquidityMint();
+  const selectedTokenIsCollToken = selectedTokenMint === collReserve.getLiquidityMint();
+  const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint === solTokenReserve.getLiquidityMint();
 
   const calcs = depositLeverageCalcs({
     depositAmount: depositAmount,
@@ -110,7 +119,12 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 
   console.log('Ops Calcs', toJson(calcs));
 
-  const obligationType = checkObligationType(obligationTypeTagOverride, collTokenMint, debtTokenMint, kaminoMarket);
+  const obligationType = checkObligationType(
+    obligationTypeTagOverride,
+    collReserve.address,
+    debtReserve.address,
+    kaminoMarket
+  );
 
   // Build the repay & withdraw collateral tx to get the number of accounts
   const klendIxs: LeverageIxsOutput = (
@@ -187,8 +201,8 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 export async function getDepositWithLeverageIxs<QuoteResponse>({
   owner,
   kaminoMarket,
-  debtTokenMint,
-  collTokenMint,
+  debtReserveAddress,
+  collReserveAddress,
   depositAmount,
   priceDebtToColl,
   slippagePct,
@@ -209,8 +223,8 @@ export async function getDepositWithLeverageIxs<QuoteResponse>({
   const { swapInputs, initialInputs } = await getDepositWithLeverageSwapInputs({
     owner,
     kaminoMarket,
-    debtTokenMint,
-    collTokenMint,
+    debtReserveAddress,
+    collReserveAddress,
     depositAmount,
     priceDebtToColl,
     slippagePct,
@@ -233,15 +247,20 @@ export async function getDepositWithLeverageIxs<QuoteResponse>({
 
   // Strategy lookup table logic removed
 
-  const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const collReserve = kaminoMarket.getExistingReserveByAddress(collReserveAddress);
+  const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
+  const solTokenReserve =
+    collReserve.getLiquidityMint() === WRAPPED_SOL_MINT
+      ? collReserve
+      : debtReserve.getLiquidityMint() === WRAPPED_SOL_MINT
+      ? debtReserve
+      : undefined;
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint === solTokenReserve!.getLiquidityMint();
 
   const depositWithLeverageIxs = await buildDepositWithLeverageIxs(
     kaminoMarket,
-    debtReserve!,
-    collReserve!,
+    debtReserve,
+    collReserve,
     owner,
     initialInputs.obligation,
     referrer,
@@ -338,23 +357,23 @@ async function buildDepositWithLeverageIxs<QuoteResponse>(
   });
 
   // 3. Deposit initial tokens + borrowed tokens into reserve
-  const kaminoDepositAndBorrowAction = await KaminoAction.buildDepositAndBorrowTxns(
-    market,
-    toLamports(calcs.collTokenToDeposit, collReserve.stats.decimals).floor().toString(),
-    collTokenMint,
-    toLamports(calcs.debtTokenToBorrow, debtReserve.stats.decimals).ceil().toString(),
-    debtTokenMint,
+  const kaminoDepositAndBorrowAction = await KaminoAction.buildDepositAndBorrowTxns({
+    kaminoMarket: market,
+    depositAmount: toLamports(calcs.collTokenToDeposit, collReserve.stats.decimals).floor().toString(),
+    depositReserveAddress: collReserve.address,
+    borrowAmount: toLamports(calcs.debtTokenToBorrow, debtReserve.stats.decimals).ceil().toString(),
+    borrowReserveAddress: debtReserve.address,
     owner,
-    obligation!,
+    obligation: obligation!,
     useV2Ixs,
-    undefined,
-    0,
-    false,
-    elevationGroupOverride === 0 ? false : true, // emode
-    { skipInitialization: true, skipLutCreation: true }, // to be checked and created in a setup tx in the UI
+    scopeRefreshConfig: undefined,
+    extraComputeBudget: 0,
+    includeAtaIxs: false,
+    requestElevationGroup: elevationGroupOverride === 0 ? false : true, // emode
+    initUserMetadata: { skipInitialization: true, skipLutCreation: true }, // to be checked and created in a setup tx in the UI
     referrer,
-    currentSlot
-  );
+    currentSlot,
+  });
 
   return swapQuoteIxsArray.map((swapQuoteIxs) => {
     // 4. Swap
@@ -385,8 +404,8 @@ async function buildDepositWithLeverageIxs<QuoteResponse>(
 export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   owner,
   kaminoMarket,
-  debtTokenMint,
-  collTokenMint,
+  debtReserveAddress,
+  collReserveAddress,
   deposited,
   borrowed,
   obligation,
@@ -408,17 +427,19 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   flashLoanInfo: FlashLoanInfo;
   initialInputs: WithdrawLeverageInitialInputs<QuoteResponse>;
 }> {
-  const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
+  const collReserve = kaminoMarket.getExistingReserveByAddress(collReserveAddress);
+  const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
+  const collTokenMint = collReserve.getLiquidityMint();
+  const debtTokenMint = debtReserve.getLiquidityMint();
   const flashLoanFee = debtReserve!.getFlashLoanFee() || new Decimal(0);
-  const selectedTokenIsCollToken = selectedTokenMint === collTokenMint;
+  const selectedTokenIsCollToken = selectedTokenMint === collReserve.getLiquidityMint();
 
   const inputTokenIsSol = selectedTokenMint === WRAPPED_SOL_MINT;
 
   const calcs = withdrawLeverageCalcs(
     kaminoMarket,
-    collReserve!,
-    debtReserve!,
+    collReserve,
+    debtReserve,
     priceCollToDebt,
     withdrawAmount,
     deposited,
@@ -435,8 +456,8 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   const klendIxs = (
     await buildWithdrawWithLeverageIxs(
       kaminoMarket,
-      debtReserve!,
-      collReserve!,
+      debtReserve,
+      collReserve,
       owner,
       obligation,
       referrer,
@@ -514,8 +535,8 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
 export async function getWithdrawWithLeverageIxs<QuoteResponse>({
   owner,
   kaminoMarket,
-  debtTokenMint,
-  collTokenMint,
+  debtReserveAddress,
+  collReserveAddress,
   obligation,
   deposited,
   borrowed,
@@ -534,15 +555,15 @@ export async function getWithdrawWithLeverageIxs<QuoteResponse>({
   useV2Ixs,
   userSolBalanceLamports,
 }: WithdrawWithLeverageProps<QuoteResponse>): Promise<Array<WithdrawLeverageIxsResponse<QuoteResponse>>> {
-  const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
+  const collReserve = kaminoMarket.getExistingReserveByAddress(collReserveAddress);
+  const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
 
   const inputTokenIsSol = selectedTokenMint === WRAPPED_SOL_MINT;
   const { swapInputs, initialInputs } = await getWithdrawWithLeverageSwapInputs({
     owner,
     kaminoMarket,
-    debtTokenMint,
-    collTokenMint,
+    debtReserveAddress,
+    collReserveAddress,
     deposited,
     borrowed,
     obligation,
@@ -569,8 +590,8 @@ export async function getWithdrawWithLeverageIxs<QuoteResponse>({
 
   const withdrawWithLeverageIxs = await buildWithdrawWithLeverageIxs<QuoteResponse>(
     kaminoMarket,
-    debtReserve!,
-    collReserve!,
+    debtReserve,
+    collReserve,
     owner,
     obligation,
     referrer,
@@ -687,25 +708,27 @@ export async function buildWithdrawWithLeverageIxs<QuoteResponse>(
   });
 
   // 3. Repay borrowed tokens and Withdraw tokens from reserve that will be swapped to repay flash loan
-  const repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawTxns(
-    market,
-    isClosingPosition ? U64_MAX : toLamports(calcs.repayAmount, debtReserve!.stats.decimals).floor().toString(),
-    debtTokenMint,
-    isClosingPosition
+  const repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawTxns({
+    kaminoMarket: market,
+    repayAmount: isClosingPosition
+      ? U64_MAX
+      : toLamports(calcs.repayAmount, debtReserve.stats.decimals).floor().toString(),
+    repayReserveAddress: debtReserve.address,
+    withdrawAmount: isClosingPosition
       ? U64_MAX
       : toLamports(calcs.depositTokenWithdrawAmount, collReserve!.stats.decimals).ceil().toString(),
-    collTokenMint,
-    owner,
+    withdrawReserveAddress: collReserve.address,
+    payer: owner,
     currentSlot,
     obligation,
     useV2Ixs,
-    undefined,
-    0,
-    false,
-    false,
-    { skipInitialization: true, skipLutCreation: true }, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
-    referrer
-  );
+    scopeRefreshConfig: undefined,
+    extraComputeBudget: 0,
+    includeAtaIxs: false,
+    requestElevationGroup: false,
+    initUserMetadata: { skipInitialization: true, skipLutCreation: true }, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
+    referrer,
+  });
 
   return swapQuoteIxsArray.map((swapQuoteIxs) => {
     const swapInstructions = removeBudgetIxs(swapQuoteIxs.swapIxs);
@@ -733,8 +756,8 @@ export async function buildWithdrawWithLeverageIxs<QuoteResponse>(
 export async function getAdjustLeverageSwapInputs<QuoteResponse>({
   owner,
   kaminoMarket,
-  debtTokenMint,
-  collTokenMint,
+  debtReserveAddress,
+  collReserveAddress,
   obligation,
   depositedLamports,
   borrowedLamports,
@@ -756,8 +779,10 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
   flashLoanInfo: FlashLoanInfo;
   initialInputs: AdjustLeverageInitialInputs<QuoteResponse>;
 }> {
-  const collReserve = kaminoMarket.getReserveByMint(collTokenMint)!;
-  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint)!;
+  const collReserve = kaminoMarket.getExistingReserveByAddress(collReserveAddress);
+  const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
+  const collTokenMint = collReserve.getLiquidityMint();
+  const debtTokenMint = debtReserve.getLiquidityMint();
   const deposited = fromLamports(depositedLamports, collReserve.stats.decimals);
   const borrowed = fromLamports(borrowedLamports, debtReserve.stats.decimals);
 
@@ -799,8 +824,8 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
       await buildIncreaseLeverageIxs(
         owner,
         kaminoMarket,
-        collTokenMint,
-        debtTokenMint,
+        collReserveAddress,
+        debtReserveAddress,
         obligation,
         referrer,
         currentSlot,
@@ -880,8 +905,8 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
       await buildDecreaseLeverageIxs(
         owner,
         kaminoMarket,
-        collTokenMint,
-        debtTokenMint,
+        collReserveAddress,
+        debtReserveAddress,
         obligation,
         referrer,
         currentSlot,
@@ -966,8 +991,8 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
 export async function getAdjustLeverageIxs<QuoteResponse>({
   owner,
   kaminoMarket,
-  debtTokenMint,
-  collTokenMint,
+  debtReserveAddress,
+  collReserveAddress,
   obligation,
   depositedLamports,
   borrowedLamports,
@@ -989,8 +1014,8 @@ export async function getAdjustLeverageIxs<QuoteResponse>({
   const { swapInputs, initialInputs } = await getAdjustLeverageSwapInputs({
     owner,
     kaminoMarket,
-    debtTokenMint,
-    collTokenMint,
+    debtReserveAddress,
+    collReserveAddress,
     obligation,
     depositedLamports,
     borrowedLamports,
@@ -1017,8 +1042,8 @@ export async function getAdjustLeverageIxs<QuoteResponse>({
     const increaseLeverageIxs = await buildIncreaseLeverageIxs(
       owner,
       kaminoMarket,
-      collTokenMint,
-      debtTokenMint,
+      collReserveAddress,
+      debtReserveAddress,
       obligation,
       referrer,
       currentSlot,
@@ -1056,8 +1081,8 @@ export async function getAdjustLeverageIxs<QuoteResponse>({
     const decreaseLeverageIxs = await buildDecreaseLeverageIxs(
       owner,
       kaminoMarket,
-      collTokenMint,
-      debtTokenMint,
+      collReserveAddress,
+      debtReserveAddress,
       obligation,
       referrer,
       currentSlot,
@@ -1096,8 +1121,8 @@ export async function getAdjustLeverageIxs<QuoteResponse>({
 async function buildIncreaseLeverageIxs<QuoteResponse>(
   owner: TransactionSigner,
   kaminoMarket: KaminoMarket,
-  collTokenMint: Address,
-  debtTokenMint: Address,
+  collReserveAddress: Address,
+  debtReserveAddress: Address,
   obligation: KaminoObligation,
   referrer: Option<Address>,
   currentSlot: Slot,
@@ -1107,8 +1132,10 @@ async function buildIncreaseLeverageIxs<QuoteResponse>(
   budgetAndPriorityFeeIxs: Instruction[] | undefined,
   useV2Ixs: boolean
 ): Promise<LeverageIxsOutput[]> {
-  const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
-  const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
+  const collReserve = kaminoMarket.getExistingReserveByAddress(collReserveAddress);
+  const collTokenMint = collReserve.getLiquidityMint();
+  const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
+  const debtTokenMint = debtReserve.getLiquidityMint();
   const collTokenAta = await getAssociatedTokenAddress(
     collTokenMint,
     owner.address,
@@ -1140,38 +1167,38 @@ async function buildIncreaseLeverageIxs<QuoteResponse>(
     programId: kaminoMarket.programId,
   });
 
-  const depositAction = await KaminoAction.buildDepositTxns(
+  const depositAction = await KaminoAction.buildDepositTxns({
     kaminoMarket,
-    toLamports(calcs.adjustDepositPosition, collReserve!.stats.decimals).floor().toString(),
-    collTokenMint,
+    amount: toLamports(calcs.adjustDepositPosition, collReserve.stats.decimals).floor().toString(),
+    reserveAddress: collReserve.address,
     owner,
     obligation,
     useV2Ixs,
-    undefined,
-    0,
-    false,
-    false,
-    { skipInitialization: true, skipLutCreation: true },
+    scopeRefreshConfig: undefined,
+    extraComputeBudget: 0,
+    includeAtaIxs: false,
+    requestElevationGroup: false,
+    initUserMetadata: { skipInitialization: true, skipLutCreation: true },
     referrer,
-    currentSlot
-  );
+    currentSlot,
+  });
 
   // 4. Borrow tokens in borrow token reserve that will be swapped to repay flash loan
-  const borrowAction = await KaminoAction.buildBorrowTxns(
+  const borrowAction = await KaminoAction.buildBorrowTxns({
     kaminoMarket,
-    toLamports(calcs.borrowAmount, debtReserve!.stats.decimals).ceil().toString(),
-    debtTokenMint,
+    amount: toLamports(calcs.borrowAmount, debtReserve.stats.decimals).ceil().toString(),
+    reserveAddress: debtReserve.address,
     owner,
     obligation,
     useV2Ixs,
-    undefined,
-    0,
-    false,
-    false,
-    { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    scopeRefreshConfig: undefined,
+    extraComputeBudget: 0,
+    includeAtaIxs: false,
+    requestElevationGroup: false,
+    initUserMetadata: { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
-    currentSlot
-  );
+    currentSlot,
+  });
 
   return swapQuoteIxsArray.map((swapQuoteIxs) => {
     const swapInstructions = removeBudgetIxs(swapQuoteIxs.swapIxs);
@@ -1206,8 +1233,8 @@ async function buildIncreaseLeverageIxs<QuoteResponse>(
 async function buildDecreaseLeverageIxs<QuoteResponse>(
   owner: TransactionSigner,
   kaminoMarket: KaminoMarket,
-  collTokenMint: Address,
-  debtTokenMint: Address,
+  collReserveAddress: Address,
+  debtReserveAddress: Address,
   obligation: KaminoObligation,
   referrer: Option<Address>,
   currentSlot: Slot,
@@ -1219,8 +1246,10 @@ async function buildDecreaseLeverageIxs<QuoteResponse>(
   withdrawSlotOffset: number = WITHDRAW_SLOT_OFFSET,
   userSolBalanceLamports: number
 ): Promise<LeverageIxsOutput[]> {
-  const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
-  const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
+  const collReserve = kaminoMarket.getExistingReserveByAddress(collReserveAddress);
+  const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
+  const collTokenMint = collReserve.getLiquidityMint();
+  const debtTokenMint = debtReserve.getLiquidityMint();
   const [debtTokenAta] = await findAssociatedTokenPda({
     owner: owner.address,
     mint: debtTokenMint,
@@ -1282,40 +1311,40 @@ async function buildDecreaseLeverageIxs<QuoteResponse>(
   });
 
   // 4. Actually do the repay of the flash borrowed amounts
-  const repayAction = await KaminoAction.buildRepayTxns(
+  const repayAction = await KaminoAction.buildRepayTxns({
     kaminoMarket,
-    toLamports(Decimal.abs(calcs.adjustBorrowPosition), debtReserve!.stats.decimals).floor().toString(),
-    debtTokenMint,
+    amount: toLamports(Decimal.abs(calcs.adjustBorrowPosition), debtReserve!.stats.decimals).floor().toString(),
+    reserveAddress: debtReserve.address,
     owner,
     obligation,
     useV2Ixs,
-    undefined,
+    scopeRefreshConfig: undefined,
     currentSlot,
-    undefined,
-    0,
-    false,
-    false,
-    { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
-    referrer
-  );
+    payer: undefined,
+    extraComputeBudget: 0,
+    includeAtaIxs: false,
+    requestElevationGroup: false,
+    initUserMetadata: { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    referrer,
+  });
 
   const withdrawSlot = currentSlot - BigInt(withdrawSlotOffset);
   // 6. Withdraw collateral (a little bit more to be able to pay for the slippage on swap)
-  const withdrawAction = await KaminoAction.buildWithdrawTxns(
+  const withdrawAction = await KaminoAction.buildWithdrawTxns({
     kaminoMarket,
-    toLamports(calcs.withdrawAmountWithSlippageAndFlashLoanFee, collReserve!.stats.decimals).ceil().toString(),
-    collTokenMint,
+    amount: toLamports(calcs.withdrawAmountWithSlippageAndFlashLoanFee, collReserve!.stats.decimals).ceil().toString(),
+    reserveAddress: collReserve.address,
     owner,
     obligation,
     useV2Ixs,
-    undefined,
-    0,
-    false,
-    false,
-    { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
+    scopeRefreshConfig: undefined,
+    extraComputeBudget: 0,
+    includeAtaIxs: false,
+    requestElevationGroup: false,
+    initUserMetadata: { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer,
-    withdrawSlot
-  );
+    currentSlot: withdrawSlot,
+  });
 
   return swapQuoteIxsArray.map((swapQuoteIxs) => {
     const swapInstructions = removeBudgetIxs(swapQuoteIxs.swapIxs);
@@ -1404,10 +1433,14 @@ export const getScopeRefreshIxForObligationAndReserves = async (
 
 const checkObligationType = (
   obligationTypeTag: ObligationTypeTag,
-  collTokenMint: Address,
-  debtTokenMint: Address,
+  collReserveAddress: Address,
+  debtReserveAddress: Address,
   kaminoMarket: KaminoMarket
 ) => {
+  const collReserve = kaminoMarket.getExistingReserveByAddress(collReserveAddress);
+  const debtReserve = kaminoMarket.getExistingReserveByAddress(debtReserveAddress);
+  const collTokenMint = collReserve.getLiquidityMint();
+  const debtTokenMint = debtReserve.getLiquidityMint();
   let obligationType: ObligationType;
   if (obligationTypeTag === ObligationTypeTag.Multiply) {
     // multiply
@@ -1415,6 +1448,12 @@ const checkObligationType = (
   } else if (obligationTypeTag === ObligationTypeTag.Leverage) {
     // leverage
     obligationType = new LeverageObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
+  } else if (obligationTypeTag === ObligationTypeTag.MultiplyFixedRate) {
+    // multiply fixed rate
+    obligationType = new MultiplyObligationFixedRate(collReserveAddress, debtReserveAddress, kaminoMarket.programId);
+  } else if (obligationTypeTag === ObligationTypeTag.LeverageFixedRate) {
+    // leverage fixed rate
+    obligationType = new LeverageObligationFixedRate(collReserveAddress, debtReserveAddress, kaminoMarket.programId);
   } else {
     throw Error('Obligation type tag not supported for leverage, please use 1 - multiply or 3 - leverage');
   }

package/src/leverage/types.ts

@@ -65,8 +65,8 @@ export type LeverageInitialInputs<LeverageCalcsResult, QuoteResponse> = {
 export interface BaseLeverageSwapInputsProps<QuoteResponse> {
   owner: TransactionSigner;
   kaminoMarket: KaminoMarket;
-  debtTokenMint: Address;
-  collTokenMint: Address;
+  debtReserveAddress: Address;
+  collReserveAddress: Address;
   referrer: Option<Address>;
   currentSlot: Slot;
   slippagePct: Decimal;

package/src/manager/client_kamino_manager.ts

@@ -537,7 +537,6 @@ async function main() {
         signer,
         [
           instructions.updateVaultConfigIx,
-          ...instructions.updateLUTIxs,
           ...getPriorityFeeAndCuIxs({
             priorityFeeMultiplier: 2500,
           }),
@@ -1421,7 +1420,6 @@ async function main() {
       );
       const txInstructions = [
         instructions.updateReserveAllocationIx,
-        ...instructions.updateLUTIxs,
         ...getPriorityFeeAndCuIxs({
           priorityFeeMultiplier: 2500,
         }),

package/src/obligation_orders/price_based.ts

@@ -246,10 +246,12 @@ function collectReserveAddresses(
   symbolOrMintAddresses: SymbolOrMintAddress[]
 ): Set<Address> {
   return new Set<Address>(
-    symbolOrMintAddresses.map((symbolOrMintAddress) =>
-      typeof symbolOrMintAddress === 'string'
-        ? kaminoMarket.getExistingReserveBySymbol(symbolOrMintAddress).address
-        : kaminoMarket.getExistingReserveByMint(symbolOrMintAddress).address
-    )
+    symbolOrMintAddresses
+      .map((symbolOrMintAddress) =>
+        typeof symbolOrMintAddress === 'string'
+          ? kaminoMarket.getExistingReservesBySymbol(symbolOrMintAddress).map((r) => r.address)
+          : kaminoMarket.getExistingReservesByMint(symbolOrMintAddress).map((r) => r.address)
+      )
+      .flat()
   );
 }

package/src/utils/Logger.ts

@@ -0,0 +1,14 @@
+export interface Logger {
+  info(message: string, ...args: any[]): void;
+  warn(message: string, ...args: any[]): void;
+  error(message: string, ...args: any[]): void;
+  debug(message: string, ...args: any[]): void;
+}
+
+export enum LogLevel {
+  INFO = 'info',
+  WARN = 'warn',
+  ERROR = 'error',
+  DEBUG = 'debug',
+  NONE = 'none',
+}