@kamino-finance/klend-sdk 5.13.9 → 5.13.10

package/src/leverage/types.ts

@@ -1,7 +1,7 @@
 import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 import { KaminoMarket, KaminoObligation } from '../classes';
-import { InstructionsWithLookupTables, Kamino, StrategyWithAddress } from '@kamino-finance/kliquidity-sdk';
+import { Kamino, StrategyWithAddress } from '@kamino-finance/kliquidity-sdk';
 import { ObligationType, ObligationTypeTag, ScopePriceRefreshConfig } from '../utils';
 
 export type SwapQuoteProvider<QuoteResponse> = (
@@ -48,27 +48,15 @@ export type SwapInputs = {
   amountDebtAtaBalance: Decimal | undefined;
 };
 
-export type KaminoDepositSwapOverride = (
-  kaminoMarket: KaminoMarket,
-  kamino: Kamino,
-  depositor: PublicKey,
-  amountInMint: PublicKey,
-  amountOutMint: PublicKey,
-  amountIn: Decimal,
-  slippageFactor: Decimal,
-  amountDebtAtaBalance: Decimal
-) => Promise<InstructionsWithLookupTables>;
-
-export type DepositLeverageIxsResponse<QuoteResponse> = {
+export type BaseLeverageIxsResponse = {
   ixs: TransactionInstruction[];
   lookupTables: AddressLookupTableAccount[];
   swapInputs: SwapInputs;
   flashLoanInfo: FlashLoanInfo;
-  initialInputs: DepositLeverageInitialInputs<QuoteResponse>;
 };
 
-export type DepositLeverageInitialInputs<QuoteResponse> = {
-  calcs: DepositLeverageCalcsResult;
+export type LeverageInitialInputs<LeverageCalcsResult, QuoteResponse> = {
+  calcs: LeverageCalcsResult;
   swapQuote: SwapQuote<QuoteResponse>;
   currentSlot: number;
   klendAccounts: Array<PublicKey>;
@@ -77,31 +65,48 @@ export type DepositLeverageInitialInputs<QuoteResponse> = {
   strategy: StrategyWithAddress | undefined;
 };
 
-export interface DepositWithLeverageSwapInputsProps<QuoteResponse> {
+export interface BaseLeverageSwapInputsProps<QuoteResponse> {
   owner: PublicKey;
   kaminoMarket: KaminoMarket;
   debtTokenMint: PublicKey;
   collTokenMint: PublicKey;
-  obligation: KaminoObligation | null;
-  obligationTypeTagOverride: ObligationTypeTag;
   referrer: PublicKey;
   currentSlot: number;
-  depositAmount: Decimal;
-  priceDebtToColl: Decimal;
   slippagePct: Decimal;
-  targetLeverage: Decimal;
-  selectedTokenMint: PublicKey;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
   kamino: Kamino | undefined;
   scopeRefreshConfig?: ScopePriceRefreshConfig;
   quoteBufferBps: Decimal;
-  priceAinB: PriceAinBProvider;
   isKtoken: IsKtokenProvider;
   quoter: SwapQuoteProvider<QuoteResponse>;
+  useV2Ixs: boolean;
+}
+
+export type DepositLeverageIxsResponse<QuoteResponse> = BaseLeverageIxsResponse & {
+  initialInputs: LeverageInitialInputs<DepositLeverageCalcsResult, QuoteResponse>;
+};
+
+export type DepositLeverageInitialInputs<QuoteResponse> = {
+  calcs: DepositLeverageCalcsResult;
+  swapQuote: SwapQuote<QuoteResponse>;
+  currentSlot: number;
+  klendAccounts: Array<PublicKey>;
+  collIsKtoken: boolean;
+  obligation: KaminoObligation | ObligationType | undefined;
+  strategy: StrategyWithAddress | undefined;
+};
+
+export interface DepositWithLeverageSwapInputsProps<QuoteResponse> extends BaseLeverageSwapInputsProps<QuoteResponse> {
+  obligation: KaminoObligation | null;
+  obligationTypeTagOverride: ObligationTypeTag;
+  depositAmount: Decimal;
+  priceDebtToColl: Decimal;
+  targetLeverage: Decimal;
+  selectedTokenMint: PublicKey;
+  priceAinB: PriceAinBProvider;
   // currently only used to disable requesting elevation group when this value is 0
   // to be implemented properly in the future
   elevationGroupOverride?: number;
-  useV2Ixs: boolean;
 }
 
 export interface DepositWithLeverageProps<QuoteResponse> extends DepositWithLeverageSwapInputsProps<QuoteResponse> {
@@ -120,12 +125,8 @@ export type DepositLeverageCalcsResult = {
   requiredCollateralKtokenOnly: Decimal;
 };
 
-export type WithdrawLeverageIxsResponse<QuoteResponse> = {
-  ixs: TransactionInstruction[];
-  lookupTables: AddressLookupTableAccount[];
-  swapInputs: SwapInputs;
-  flashLoanInfo: FlashLoanInfo;
-  initialInputs: WithdrawLeverageInitialInputs<QuoteResponse>;
+export type WithdrawLeverageIxsResponse<QuoteResponse> = BaseLeverageIxsResponse & {
+  initialInputs: LeverageInitialInputs<WithdrawLeverageCalcsResult, QuoteResponse>;
 };
 
 export type WithdrawLeverageInitialInputs<QuoteResponse> = {
@@ -138,28 +139,14 @@ export type WithdrawLeverageInitialInputs<QuoteResponse> = {
   strategy: StrategyWithAddress | undefined;
 };
 
-export interface WithdrawWithLeverageSwapInputsProps<QuoteResponse> {
-  owner: PublicKey;
-  kaminoMarket: KaminoMarket;
-  debtTokenMint: PublicKey;
-  collTokenMint: PublicKey;
+export interface WithdrawWithLeverageSwapInputsProps<QuoteResponse> extends BaseLeverageSwapInputsProps<QuoteResponse> {
   obligation: KaminoObligation;
   deposited: Decimal;
   borrowed: Decimal;
-  referrer: PublicKey;
-  currentSlot: number;
   withdrawAmount: Decimal;
   priceCollToDebt: Decimal;
-  slippagePct: Decimal;
   isClosingPosition: boolean;
   selectedTokenMint: PublicKey;
-  budgetAndPriorityFeeIxs?: TransactionInstruction[];
-  kamino: Kamino | undefined;
-  scopeRefreshConfig?: ScopePriceRefreshConfig;
-  quoteBufferBps: Decimal;
-  isKtoken: IsKtokenProvider;
-  quoter: SwapQuoteProvider<QuoteResponse>;
-  useV2Ixs: boolean;
 }
 
 export interface WithdrawWithLeverageProps<QuoteResponse> extends WithdrawWithLeverageSwapInputsProps<QuoteResponse> {
@@ -174,12 +161,10 @@ export type WithdrawLeverageCalcsResult = {
   debtTokenExpectedSwapOut: Decimal;
 };
 
-export type AdjustLeverageIxsResponse<QuoteResponse> = {
-  ixs: TransactionInstruction[];
-  lookupTables: AddressLookupTableAccount[];
-  swapInputs: SwapInputs;
-  flashLoanInfo: FlashLoanInfo;
-  initialInputs: AdjustLeverageInitialInputs<QuoteResponse>;
+export type AdjustLeverageIxsResponse<QuoteResponse> = BaseLeverageIxsResponse & {
+  initialInputs: LeverageInitialInputs<AdjustLeverageCalcsResult, QuoteResponse> & {
+    isDeposit: boolean;
+  };
 };
 
 export type AdjustLeverageInitialInputs<QuoteResponse> = {
@@ -193,28 +178,14 @@ export type AdjustLeverageInitialInputs<QuoteResponse> = {
   strategy: StrategyWithAddress | undefined;
 };
 
-export interface AdjustLeverageSwapInputsProps<QuoteResponse> {
-  owner: PublicKey;
-  kaminoMarket: KaminoMarket;
-  debtTokenMint: PublicKey;
-  collTokenMint: PublicKey;
+export interface AdjustLeverageSwapInputsProps<QuoteResponse> extends BaseLeverageSwapInputsProps<QuoteResponse> {
   obligation: KaminoObligation;
   depositedLamports: Decimal;
   borrowedLamports: Decimal;
-  referrer: PublicKey;
-  currentSlot: number;
   targetLeverage: Decimal;
   priceCollToDebt: Decimal;
   priceDebtToColl: Decimal;
-  slippagePct: Decimal;
-  budgetAndPriorityFeeIxs?: TransactionInstruction[];
-  kamino: Kamino | undefined;
-  scopeRefreshConfig?: ScopePriceRefreshConfig;
-  quoteBufferBps: Decimal;
   priceAinB: PriceAinBProvider;
-  isKtoken: IsKtokenProvider;
-  quoter: SwapQuoteProvider<QuoteResponse>;
-  useV2Ixs: boolean;
 }
 
 export interface AdjustLeverageProps<QuoteResponse> extends AdjustLeverageSwapInputsProps<QuoteResponse> {

package/src/leverage/utils.ts

@@ -40,7 +40,7 @@ export async function getTokenToKtokenSwapper<QuoteResponse>(
     quote: SwapQuote<QuoteResponse>
   ): Promise<SwapIxs> => {
     const slippageBps = new Decimal(slippagePct).mul('100');
-    const mintInDecimals = kaminoMarket.getReserveByMint(inputs.inputMint)!.state.liquidity.mintDecimals.toNumber();
+    const mintInDecimals = kaminoMarket.getExistingReserveByMint(inputs.inputMint).getMintDecimals();
     const amountIn = lamportsToNumberDecimal(inputs.inputAmountLamports, mintInDecimals);
     console.debug('Depositing token', inputs.inputMint.toString(), ' for ', inputs.outputMint.toString(), 'ktoken');
     if (inputs.amountDebtAtaBalance === undefined) {
@@ -134,7 +134,7 @@ export async function getKtokenToTokenSwapper<QuoteResponse>(
   swapper: SwapIxsProvider<QuoteResponse>
 ): Promise<SwapIxsProvider<QuoteResponse>> {
   return async (inputs: SwapInputs, klendAccounts: Array<PublicKey>, quote: SwapQuote<QuoteResponse>) => {
-    const amountInDecimals = kaminoMarket.getReserveByMint(inputs.inputMint)!.state.liquidity.mintDecimals.toNumber();
+    const amountInDecimals = kaminoMarket.getExistingReserveByMint(inputs.inputMint).getMintDecimals();
     const amountToWithdraw = lamportsToNumberDecimal(inputs.inputAmountLamports, amountInDecimals);
     const kaminoStrategy = await kamino.getStrategyByKTokenMint(inputs.inputMint);
 
@@ -298,13 +298,13 @@ export const getExpectedTokenBalanceAfterBorrow = async (
   mint: PublicKey,
   owner: PublicKey,
   amountToBorrowLamports: Decimal,
-  amountToBorrowmintDecimals: number
+  amountToBorrowMintDecimals: number
 ) => {
   const initialUserTokenABalance = await getTokenAccountBalanceDecimal(connection, mint, owner);
 
   return initialUserTokenABalance
-    .add(lamportsToNumberDecimal(amountToBorrowLamports, amountToBorrowmintDecimals))
-    .toDecimalPlaces(amountToBorrowmintDecimals);
+    .add(lamportsToNumberDecimal(amountToBorrowLamports, amountToBorrowMintDecimals))
+    .toDecimalPlaces(amountToBorrowMintDecimals);
 };
 
 export const isBorrowingEnabled = (reserve: KaminoReserve) => {

package/src/utils/ata.ts

@@ -7,14 +7,7 @@ import {
   createCloseAccountInstruction,
   getAssociatedTokenAddressSync,
 } from '@solana/spl-token';
-import {
-  AccountInfo,
-  ComputeBudgetProgram,
-  Connection,
-  PublicKey,
-  SystemProgram,
-  TransactionInstruction,
-} from '@solana/web3.js';
+import { AccountInfo, Connection, PublicKey, SystemProgram, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
 import { collToLamportsDecimal, DECIMALS_SOL } from '@kamino-finance/kliquidity-sdk/dist';
 
@@ -137,24 +130,6 @@ export function getTransferWsolIxs(owner: PublicKey, ata: PublicKey, amountLampo
   return ixs;
 }
 
-export function removeBudgetAndAtaIxs(ixs: TransactionInstruction[], mints: string[]): TransactionInstruction[] {
-  return ixs.filter((ix) => {
-    const { programId, keys } = ix;
-
-    if (programId.equals(ComputeBudgetProgram.programId)) {
-      return false;
-    }
-
-    if (programId.equals(ASSOCIATED_TOKEN_PROGRAM_ID)) {
-      const mint = keys[3];
-
-      return !mints.includes(mint.pubkey.toString());
-    }
-
-    return true;
-  });
-}
-
 export async function getTokenAccountBalance(connection: Connection, tokenAccount: PublicKey): Promise<number> {
   const tokenAccountBalance = await connection.getTokenAccountBalance(tokenAccount);
 

package/src/utils/instruction.ts

@@ -281,3 +281,15 @@ export function uniqueAccountsWithProgramIds(
 
   return uniqueAccounts.toArray();
 }
+
+export function removeBudgetIxs(ixs: TransactionInstruction[]): TransactionInstruction[] {
+  return ixs.filter((ix) => {
+    const { programId } = ix;
+
+    if (programId.equals(ComputeBudgetProgram.programId)) {
+      return false;
+    }
+
+    return true;
+  });
+}