@kamino-finance/klend-sdk 5.2.11 → 5.2.13

package/src/idl_codegen_kamino_vault/types/VaultConfigField.ts

@@ -95,25 +95,25 @@ export class MinWithdrawAmount {
   }
 }
 
-export interface MintInvestAmountJSON {
-  kind: "MintInvestAmount"
+export interface MinInvestAmountJSON {
+  kind: "MinInvestAmount"
 }
 
-export class MintInvestAmount {
+export class MinInvestAmount {
   static readonly discriminator = 4
-  static readonly kind = "MintInvestAmount"
+  static readonly kind = "MinInvestAmount"
   readonly discriminator = 4
-  readonly kind = "MintInvestAmount"
+  readonly kind = "MinInvestAmount"
 
-  toJSON(): MintInvestAmountJSON {
+  toJSON(): MinInvestAmountJSON {
     return {
-      kind: "MintInvestAmount",
+      kind: "MinInvestAmount",
     }
   }
 
   toEncodable() {
     return {
-      MintInvestAmount: {},
+      MinInvestAmount: {},
     }
   }
 }
@@ -187,6 +187,75 @@ export class PendingVaultAdmin {
   }
 }
 
+export interface NameJSON {
+  kind: "Name"
+}
+
+export class Name {
+  static readonly discriminator = 8
+  static readonly kind = "Name"
+  readonly discriminator = 8
+  readonly kind = "Name"
+
+  toJSON(): NameJSON {
+    return {
+      kind: "Name",
+    }
+  }
+
+  toEncodable() {
+    return {
+      Name: {},
+    }
+  }
+}
+
+export interface LookupTableJSON {
+  kind: "LookupTable"
+}
+
+export class LookupTable {
+  static readonly discriminator = 9
+  static readonly kind = "LookupTable"
+  readonly discriminator = 9
+  readonly kind = "LookupTable"
+
+  toJSON(): LookupTableJSON {
+    return {
+      kind: "LookupTable",
+    }
+  }
+
+  toEncodable() {
+    return {
+      LookupTable: {},
+    }
+  }
+}
+
+export interface FarmJSON {
+  kind: "Farm"
+}
+
+export class Farm {
+  static readonly discriminator = 10
+  static readonly kind = "Farm"
+  readonly discriminator = 10
+  readonly kind = "Farm"
+
+  toJSON(): FarmJSON {
+    return {
+      kind: "Farm",
+    }
+  }
+
+  toEncodable() {
+    return {
+      Farm: {},
+    }
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.VaultConfigFieldKind {
   if (typeof obj !== "object") {
@@ -205,8 +274,8 @@ export function fromDecoded(obj: any): types.VaultConfigFieldKind {
   if ("MinWithdrawAmount" in obj) {
     return new MinWithdrawAmount()
   }
-  if ("MintInvestAmount" in obj) {
-    return new MintInvestAmount()
+  if ("MinInvestAmount" in obj) {
+    return new MinInvestAmount()
   }
   if ("MinInvestDelaySlots" in obj) {
     return new MinInvestDelaySlots()
@@ -217,6 +286,15 @@ export function fromDecoded(obj: any): types.VaultConfigFieldKind {
   if ("PendingVaultAdmin" in obj) {
     return new PendingVaultAdmin()
   }
+  if ("Name" in obj) {
+    return new Name()
+  }
+  if ("LookupTable" in obj) {
+    return new LookupTable()
+  }
+  if ("Farm" in obj) {
+    return new Farm()
+  }
 
   throw new Error("Invalid enum object")
 }
@@ -237,8 +315,8 @@ export function fromJSON(
     case "MinWithdrawAmount": {
       return new MinWithdrawAmount()
     }
-    case "MintInvestAmount": {
-      return new MintInvestAmount()
+    case "MinInvestAmount": {
+      return new MinInvestAmount()
     }
     case "MinInvestDelaySlots": {
       return new MinInvestDelaySlots()
@@ -249,6 +327,15 @@ export function fromJSON(
     case "PendingVaultAdmin": {
       return new PendingVaultAdmin()
     }
+    case "Name": {
+      return new Name()
+    }
+    case "LookupTable": {
+      return new LookupTable()
+    }
+    case "Farm": {
+      return new Farm()
+    }
   }
 }
 
@@ -258,10 +345,13 @@ export function layout(property?: string) {
     borsh.struct([], "ManagementFeeBps"),
     borsh.struct([], "MinDepositAmount"),
     borsh.struct([], "MinWithdrawAmount"),
-    borsh.struct([], "MintInvestAmount"),
+    borsh.struct([], "MinInvestAmount"),
     borsh.struct([], "MinInvestDelaySlots"),
     borsh.struct([], "CrankFundFeePerReserve"),
     borsh.struct([], "PendingVaultAdmin"),
+    borsh.struct([], "Name"),
+    borsh.struct([], "LookupTable"),
+    borsh.struct([], "Farm"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/idl_codegen_kamino_vault/types/index.ts

@@ -56,19 +56,25 @@ export type VaultConfigFieldKind =
   | VaultConfigField.ManagementFeeBps
   | VaultConfigField.MinDepositAmount
   | VaultConfigField.MinWithdrawAmount
-  | VaultConfigField.MintInvestAmount
+  | VaultConfigField.MinInvestAmount
   | VaultConfigField.MinInvestDelaySlots
   | VaultConfigField.CrankFundFeePerReserve
   | VaultConfigField.PendingVaultAdmin
+  | VaultConfigField.Name
+  | VaultConfigField.LookupTable
+  | VaultConfigField.Farm
 export type VaultConfigFieldJSON =
   | VaultConfigField.PerformanceFeeBpsJSON
   | VaultConfigField.ManagementFeeBpsJSON
   | VaultConfigField.MinDepositAmountJSON
   | VaultConfigField.MinWithdrawAmountJSON
-  | VaultConfigField.MintInvestAmountJSON
+  | VaultConfigField.MinInvestAmountJSON
   | VaultConfigField.MinInvestDelaySlotsJSON
   | VaultConfigField.CrankFundFeePerReserveJSON
   | VaultConfigField.PendingVaultAdminJSON
+  | VaultConfigField.NameJSON
+  | VaultConfigField.LookupTableJSON
+  | VaultConfigField.FarmJSON
 
 export { VaultAllocation } from "./VaultAllocation"
 export type {

package/src/lending_operations/repay_with_collateral_calcs.ts

@@ -1,6 +1,7 @@
 import Decimal from 'decimal.js';
 import { KaminoMarket, KaminoObligation, KaminoReserve, numberToLamportsDecimal } from '../classes';
 import { PublicKey } from '@solana/web3.js';
+import { lamportsToDecimal } from '../classes/utils';
 
 export function calcRepayAmountWithSlippage(
   kaminoMarket: KaminoMarket,
@@ -23,9 +24,25 @@ export function calcRepayAmountWithSlippage(
     )
     .toDecimalPlaces(debtReserve.state.liquidity.mintDecimals.toNumber(), Decimal.ROUND_CEIL);
   // add 0.1% to irSlippageBpsForDebt because we don't want to estimate slightly less than SC and end up not reapying enough
-  const repayAmount = amount
+  const repayAmountIrAdjusted = amount
     .mul(irSlippageBpsForDebt.mul(new Decimal('1.001')))
     .toDecimalPlaces(debtReserve.state.liquidity.mintDecimals.toNumber(), Decimal.ROUND_CEIL);
+
+  let repayAmount: Decimal;
+  // Ensure when repaying close to the full amount, we repay the full amount as otherwise we might end up having a small amount left
+  if (
+    repayAmountIrAdjusted.greaterThanOrEqualTo(
+      lamportsToDecimal(
+        obligation.borrows.get(debtReserve.address)?.amount || new Decimal(0),
+        debtReserve.stats.decimals
+      )
+    )
+  ) {
+    repayAmount = repayAmountIrAdjusted;
+  } else {
+    repayAmount = amount;
+  }
+
   const repayAmountLamports = numberToLamportsDecimal(repayAmount, debtReserve.stats.decimals);
 
   const { flashRepayAmountLamports } = calcFlashRepayAmount({

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -108,13 +108,6 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     .ceil();
   const inputAmountLamports = Decimal.min(withdrawableCollLamports, maxCollNeededFromOracle);
 
-  const swapQuoteInputs: SwapInputs = {
-    inputAmountLamports,
-    inputMint: collTokenMint,
-    outputMint: debtTokenMint,
-    amountDebtAtaBalance: new Decimal(0), // only used for kTokens
-  };
-
   // Build the repay & withdraw collateral tx to get the number of accounts
   const klendIxs = await buildRepayWithCollateralIxs(
     kaminoMarket,
@@ -135,6 +128,14 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     inputAmountLamports
   );
   const uniqueKlendAccounts = uniqueAccounts(klendIxs);
+
+  const swapQuoteInputs: SwapInputs = {
+    inputAmountLamports,
+    inputMint: collTokenMint,
+    outputMint: debtTokenMint,
+    amountDebtAtaBalance: new Decimal(0), // only used for kTokens
+  };
+
   const swapQuote = await quoter(swapQuoteInputs, uniqueKlendAccounts);
 
   const swapQuotePxDebtToColl = swapQuote.priceAInB;
@@ -147,6 +148,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   return {
     swapInputs: {
       inputAmountLamports: collSwapInLamports,
+      minOutAmountLamports: flashRepayAmountLamports,
       inputMint: collTokenMint,
       outputMint: debtTokenMint,
       amountDebtAtaBalance: new Decimal(0), // only used for kTokens

package/src/leverage/operations.ts

@@ -86,10 +86,10 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
   swapInputs: SwapInputs;
   initialInputs: DepositLeverageInitialInputs<QuoteResponse>;
 }> {
-  const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
+  const collReserve = kaminoMarket.getReserveByMint(collTokenMint)!;
+  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint)!;
   const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
-  const flashLoanFee = collReserve!.getFlashLoanFee() || new Decimal(0);
+  const flashLoanFee = collReserve.getFlashLoanFee() || new Decimal(0);
 
   const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
@@ -129,8 +129,8 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
   // Build the repay & withdraw collateral tx to get the number of accounts
   const klendIxs = await buildDepositWithLeverageIxns(
     kaminoMarket,
-    debtReserve!,
-    collReserve!,
+    debtReserve,
+    collReserve,
     owner,
     obligation ? obligation : obligationType,
     referrer,
@@ -152,7 +152,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 
   const swapInputAmount = toLamports(
     !collIsKtoken ? calcs.swapDebtTokenIn : calcs.singleSidedDepositKtokenOnly,
-    debtReserve!.stats.decimals
+    debtReserve.stats.decimals
   ).ceil();
 
   const swapInputsForQuote: SwapInputs = {
@@ -182,7 +182,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 
   const swapInputAmountQuotePrice = toLamports(
     !collIsKtoken ? quotePriceCalcs.swapDebtTokenIn : quotePriceCalcs.singleSidedDepositKtokenOnly,
-    debtReserve!.stats.decimals
+    debtReserve.stats.decimals
   ).ceil();
 
   let expectedDebtTokenAtaBalance = new Decimal(0);
@@ -201,14 +201,18 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
       kaminoMarket.getConnection(),
       debtTokenMint,
       owner,
-      toLamports(futureBalanceInAta.toDecimalPlaces(debtReserve!.stats.decimals), debtReserve!.stats.decimals),
-      debtReserve!.state.liquidity.mintDecimals.toNumber()
+      toLamports(futureBalanceInAta.toDecimalPlaces(debtReserve.stats.decimals), debtReserve.stats.decimals),
+      debtReserve.state.liquidity.mintDecimals.toNumber()
     );
   }
 
   return {
     swapInputs: {
       inputAmountLamports: swapInputAmountQuotePrice,
+      minOutAmountLamports: toLamports(
+        !collIsKtoken ? quotePriceCalcs.flashBorrowInCollToken : quotePriceCalcs.flashBorrowInDebtTokenKtokenOnly,
+        !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals
+      ),
       inputMint: debtTokenMint,
       outputMint: collTokenMint,
       amountDebtAtaBalance: expectedDebtTokenAtaBalance,
@@ -410,8 +414,18 @@ async function buildDepositWithLeverageIxns(
   const budgetIxns = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxns(3000000);
   const collTokenMint = collReserve.getLiquidityMint();
   const debtTokenMint = debtReserve.getLiquidityMint();
-  const collTokenAta = getAssociatedTokenAddressSync(collTokenMint, owner);
-  const debtTokenAta = getAssociatedTokenAddressSync(debtTokenMint, owner);
+  const collTokenAta = getAssociatedTokenAddressSync(
+    collTokenMint,
+    owner,
+    false,
+    collReserve.getLiquidityTokenProgram()
+  );
+  const debtTokenAta = getAssociatedTokenAddressSync(
+    debtTokenMint,
+    owner,
+    false,
+    debtReserve.getLiquidityTokenProgram()
+  );
 
   // 1. Create atas & budget txns
   let mintsToCreateAtas: Array<{ mint: PublicKey; tokenProgram: PublicKey }>;
@@ -640,7 +654,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
     kaminoMarket,
     collReserve!,
     debtReserve!,
-    collIsKtoken ? swapQuote.priceAInB : priceCollToDebt,
+    !collIsKtoken ? swapQuote.priceAInB : priceCollToDebt,
     withdrawAmount,
     deposited,
     borrowed,
@@ -661,6 +675,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   return {
     swapInputs: {
       inputAmountLamports: swapInputAmountQuotePrice,
+      minOutAmountLamports: calcsQuotePrice.repayAmount,
       inputMint: collTokenMint,
       outputMint: debtTokenMint,
       amountDebtAtaBalance: new Decimal(0), // Only needed for ktokens deposits
@@ -807,7 +822,12 @@ export async function buildWithdrawWithLeverageIxns(
 ): Promise<TransactionInstruction[]> {
   const collTokenMint = collReserve.getLiquidityMint();
   const debtTokenMint = debtReserve.getLiquidityMint();
-  const debtTokenAta = getAssociatedTokenAddressSync(debtTokenMint, owner);
+  const debtTokenAta = getAssociatedTokenAddressSync(
+    debtTokenMint,
+    owner,
+    false,
+    debtReserve.getLiquidityTokenProgram()
+  );
   // 1. Create atas & budget txns & user metadata
   let mintsToCreateAtas: Array<{ mint: PublicKey; tokenProgram: PublicKey }>;
   if (collIsKtoken) {
@@ -957,10 +977,10 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
   swapInputs: SwapInputs;
   initialInputs: AdjustLeverageInitialInputs<QuoteResponse>;
 }> {
-  const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-  const deposited = fromLamports(depositedLamports, collReserve!.stats.decimals);
-  const borrowed = fromLamports(borrowedLamports, debtReserve!.stats.decimals);
+  const collReserve = kaminoMarket.getReserveByMint(collTokenMint)!;
+  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint)!;
+  const deposited = fromLamports(depositedLamports, collReserve.stats.decimals);
+  const borrowed = fromLamports(borrowedLamports, debtReserve.stats.decimals);
   const collIsKtoken = await isKtoken(collTokenMint);
   const strategy = collIsKtoken ? (await kamino!.getStrategyByKTokenMint(collTokenMint))! : undefined;
 
@@ -969,9 +989,9 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
   const isDepositViaLeverage = targetLeverage.gte(new Decimal(currentLeverage));
   let flashLoanFee;
   if (isDepositViaLeverage) {
-    flashLoanFee = collReserve!.getFlashLoanFee() || new Decimal(0);
+    flashLoanFee = collReserve.getFlashLoanFee() || new Decimal(0);
   } else {
-    flashLoanFee = debtReserve!.getFlashLoanFee() || new Decimal(0);
+    flashLoanFee = debtReserve.getFlashLoanFee() || new Decimal(0);
   }
 
   const { adjustDepositPosition, adjustBorrowPosition } = calcAdjustAmounts({
@@ -1025,7 +1045,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
 
     const swapInputAmount = toLamports(
       !collIsKtoken ? calcs.borrowAmount : calcs.amountToFlashBorrowDebt,
-      debtReserve!.state.liquidity.mintDecimals.toNumber()
+      debtReserve.stats.decimals,
     ).ceil();
 
     const swapInputsForQuote: SwapInputs = {
@@ -1051,7 +1071,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
     const calcsQuotePrice = await adjustDepositLeverageCalcs(
       kaminoMarket,
       owner,
-      debtReserve!,
+      debtReserve,
       adjustDepositPositionQuotePrice,
       adjustBorrowPositionQuotePrice,
       swapQuote.priceAInB,
@@ -1062,7 +1082,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
 
     const swapInputAmountQuotePrice = toLamports(
       !collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt,
-      debtReserve!.state.liquidity.mintDecimals.toNumber()
+      debtReserve.state.liquidity.mintDecimals.toNumber()
     ).ceil();
 
     let expectedDebtTokenAtaBalance = new Decimal(0);
@@ -1073,15 +1093,19 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
         owner,
         toLamports(
           !collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt,
-          debtReserve!.stats.decimals
+          debtReserve.stats.decimals
         ).floor(),
-        debtReserve!.state.liquidity.mintDecimals.toNumber()
+        debtReserve.state.liquidity.mintDecimals.toNumber()
       );
     }
 
     return {
       swapInputs: {
         inputAmountLamports: swapInputAmountQuotePrice,
+        minOutAmountLamports: toLamports(
+          !collIsKtoken ? calcsQuotePrice.adjustDepositPosition : calcsQuotePrice.amountToFlashBorrowDebt,
+          !collIsKtoken ? collReserve.stats.decimals : debtReserve!.stats.decimals
+        ),
         inputMint: debtTokenMint,
         outputMint: collTokenMint,
         amountDebtAtaBalance: expectedDebtTokenAtaBalance,
@@ -1124,7 +1148,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
 
     const swapInputAmount = toLamports(
       calcs.withdrawAmountWithSlippageAndFlashLoanFee,
-      collReserve!.state.liquidity.mintDecimals.toNumber()
+      collReserve.state.liquidity.mintDecimals.toNumber()
     ).ceil();
 
     const swapInputsForQuote: SwapInputs = {
@@ -1156,12 +1180,13 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
 
     const swapInputAmountQuotePrice = toLamports(
       calcsQuotePrice.withdrawAmountWithSlippageAndFlashLoanFee,
-      collReserve!.state.liquidity.mintDecimals.toNumber()
+      collReserve.state.liquidity.mintDecimals.toNumber()
     ).ceil();
 
     return {
       swapInputs: {
         inputAmountLamports: swapInputAmountQuotePrice,
+        minOutAmountLamports: toLamports(calcsQuotePrice.adjustBorrowPosition.abs(), debtReserve.stats.decimals),
         inputMint: collTokenMint,
         outputMint: debtTokenMint,
         amountDebtAtaBalance: new Decimal(0), // Only needed for ktokens deposits
@@ -1349,8 +1374,18 @@ async function buildIncreaseLeverageIxns(
 ): Promise<TransactionInstruction[]> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-  const debtTokenAta = getAssociatedTokenAddressSync(debtTokenMint, owner);
-  const collTokenAta = getAssociatedTokenAddressSync(collTokenMint, owner);
+  const debtTokenAta = getAssociatedTokenAddressSync(
+    debtTokenMint,
+    owner,
+    false,
+    debtReserve!.getLiquidityTokenProgram()
+  );
+  const collTokenAta = getAssociatedTokenAddressSync(
+    collTokenMint,
+    owner,
+    false,
+    collReserve!.getLiquidityTokenProgram()
+  );
 
   // 1. Create atas & budget txns
   const budgetIxns = budgetAndPriorityFeeIxns || getComputeBudgetAndPriorityFeeIxns(3000000);
@@ -1504,7 +1539,12 @@ async function buildDecreaseLeverageIxns(
 ): Promise<TransactionInstruction[]> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-  const debtTokenAta = getAssociatedTokenAddressSync(debtTokenMint, owner);
+  const debtTokenAta = getAssociatedTokenAddressSync(
+    debtTokenMint,
+    owner,
+    false,
+    debtReserve!.getLiquidityTokenProgram()
+  );
 
   // 1. Create atas & budget txns
   const budgetIxns = budgetAndPriorityFeeIxns || getComputeBudgetAndPriorityFeeIxns(3000000);

package/src/leverage/types.ts

@@ -32,6 +32,7 @@ export type IsKtokenProvider = (token: PublicKey | string) => Promise<boolean>;
 
 export type SwapInputs = {
   inputAmountLamports: Decimal;
+  minOutAmountLamports?: Decimal;
   inputMint: PublicKey;
   outputMint: PublicKey;
   amountDebtAtaBalance: Decimal | undefined;