@kamino-finance/klend-sdk 5.11.0-beta.0 → 5.11.0

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -318,6 +318,7 @@ async function buildRepayWithCollateralIxs(
     false,
     requestElevationGroup,
     undefined,
+    undefined,
     referrer,
     scopeRefresh
   );

package/src/lending_operations/swap_collateral_operations.ts

@@ -16,11 +16,10 @@ import {
   ScopeRefresh,
   U64_MAX,
   uniqueAccounts,
-  WRAPPED_SOL_MINT,
 } from '../utils';
 import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js';
-import { createCloseAccountInstruction, TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { createCloseAccountInstruction, NATIVE_MINT, TOKEN_PROGRAM_ID } from '@solana/spl-token';
 
 /**
  * Inputs to the `getSwapCollIxns()` operation.
@@ -330,11 +329,11 @@ function getAtaCreationIxns(context: SwapCollContext<any>) {
 function getAtaCloseIxns(context: SwapCollContext<any>) {
   const ataCloseIxns: TransactionInstruction[] = [];
   if (
-    context.sourceCollReserve.getLiquidityMint().equals(WRAPPED_SOL_MINT) ||
-    context.targetCollReserve.getLiquidityMint().equals(WRAPPED_SOL_MINT)
+    context.sourceCollReserve.getLiquidityMint().equals(NATIVE_MINT) ||
+    context.targetCollReserve.getLiquidityMint().equals(NATIVE_MINT)
   ) {
     const owner = context.obligation.state.owner;
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
     ataCloseIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
   }
   return ataCloseIxns;
@@ -385,6 +384,7 @@ async function getDepositTargetCollIxns(
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     removesElevationGroup, // we may need to (temporarily) remove the elevation group; the same or a different one will be set on withdraw, if requested
     false, // we are dealing with an existing obligation, no need to create user metadata
+    false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
     context.scopeRefresh,
@@ -434,6 +434,7 @@ async function getWithdrawSourceCollIxns(
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     requestedElevationGroup !== undefined, // the `elevationGroupIdToRequestAfterWithdraw()` has already decided on this
     false, // we are dealing with an existing obligation, no need to create user metadata
+    false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
     undefined, // we have refreshed scope already, during depositing

package/src/leverage/calcs.ts

@@ -65,7 +65,8 @@ export async function calculateMultiplyEffects(
     debtBorrowFactorPct,
     priceCollToDebt,
     priceDebtToColl,
-  }: LeverageFormsCalcsArgs
+  }: LeverageFormsCalcsArgs,
+  logEstimations = false
 ): Promise<FormsCalcsResult> {
   // calculate estimations for deposit operation
   const {
@@ -107,18 +108,20 @@ export async function calculateMultiplyEffects(
     flashLoanFee: flashBorrowReserveFlashLoanFeePercentage, // TODO: is this the right flash borrow?
   });
 
-  console.log(
-    'Estimations',
-    toJson({
-      activeTab,
-      depositModeEstimatedDepositAmount,
-      depositModeEstimatedBorrowAmount,
-      withdrawModeEstimatedDepositTokenWithdrawn,
-      withdrawModeEstimatedBorrowTokenWithdrawn,
-      adjustModeEstimatedDepositAmount,
-      adjustModeEstimateBorrowAmount,
-    })
-  );
+  if (logEstimations) {
+    console.log(
+      'Estimations',
+      toJson({
+        activeTab,
+        depositModeEstimatedDepositAmount,
+        depositModeEstimatedBorrowAmount,
+        withdrawModeEstimatedDepositTokenWithdrawn,
+        withdrawModeEstimatedBorrowTokenWithdrawn,
+        adjustModeEstimatedDepositAmount,
+        adjustModeEstimateBorrowAmount,
+      })
+    );
+  }
 
   let [isClosingPosition, totalDeposited, totalBorrowed] = [false, new Decimal(0), new Decimal(0)];
 

package/src/leverage/instructions.ts

@@ -1,4 +1,5 @@
 import { PublicKey, SYSVAR_INSTRUCTIONS_PUBKEY } from '@solana/web3.js';
+import * as anchor from '@coral-xyz/anchor';
 import { KaminoReserve } from '../classes';
 import {
   FlashBorrowReserveLiquidityArgs,
@@ -9,12 +10,6 @@ import {
   flashRepayReserveLiquidity,
 } from '../lib';
 import Decimal from 'decimal.js';
-import * as anchor from '@coral-xyz/anchor';
-
-export const SOL_MINTS: Array<PublicKey> = [
-  new PublicKey('So11111111111111111111111111111111111111111'),
-  new PublicKey('So11111111111111111111111111111111111111112'),
-];
 
 export const getFlashLoanInstructions = (args: {
   borrowIxnIndex: number;

package/src/leverage/operations.ts

@@ -17,11 +17,10 @@ import {
   ObligationTypeTag,
   SOL_DECIMALS,
   U64_MAX,
-  WRAPPED_SOL_MINT,
   createAtasIdempotent,
   getAssociatedTokenAddress,
   getComputeBudgetAndPriorityFeeIxns,
-  getDepositWsolIxns,
+  getTransferWsolIxns,
   getLookupTableAccount,
   removeBudgetAndAtaIxns,
   uniqueAccounts,
@@ -35,7 +34,12 @@ import {
   toJson,
   withdrawLeverageCalcs,
 } from './calcs';
-import { TOKEN_PROGRAM_ID, createCloseAccountInstruction, getAssociatedTokenAddressSync } from '@solana/spl-token';
+import {
+  NATIVE_MINT,
+  TOKEN_PROGRAM_ID,
+  createCloseAccountInstruction,
+  getAssociatedTokenAddressSync,
+} from '@solana/spl-token';
 import { Kamino, StrategyWithAddress } from '@kamino-finance/kliquidity-sdk';
 import { getExpectedTokenBalanceAfterBorrow, getKtokenToTokenSwapper, getTokenToKtokenSwapper } from './utils';
 import { FullBPS } from '@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters';
@@ -90,7 +94,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 }> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint)!;
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint)!;
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const flashLoanFee = collReserve.getFlashLoanFee() || new Decimal(0);
 
   const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
@@ -193,7 +197,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
 
   if (collIsKtoken) {
     let futureBalanceInAta = new Decimal(0);
-    if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
+    if (debtTokenMint.equals(NATIVE_MINT)) {
       futureBalanceInAta = futureBalanceInAta.add(
         !collIsKtoken ? quotePriceCalcs.initDepositInSol : quotePriceCalcs.initDepositInSol
       );
@@ -370,7 +374,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
 
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
 
   const ixs = await buildDepositWithLeverageIxns(
@@ -491,9 +495,9 @@ async function buildDepositWithLeverageIxns(
   const fillWsolAtaIxns: TransactionInstruction[] = [];
   if (depositTokenIsSol) {
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(
+      ...getTransferWsolIxns(
         owner,
-        getAssociatedTokenAddressSync(WRAPPED_SOL_MINT, owner),
+        getAssociatedTokenAddressSync(NATIVE_MINT, owner),
         toLamports(calcs.initDepositInSol, SOL_DECIMALS).ceil()
       )
     );
@@ -537,6 +541,7 @@ async function buildDepositWithLeverageIxns(
     false,
     elevationGroupOverride === 0 ? false : true, // emode
     false, // to be checked and created in a setup tx in the UI
+    false, // to be checked and created in a setup tx in the UI
     referrer,
     currentSlot,
     scopeRefresh
@@ -606,7 +611,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   const collIsKtoken = await isKtoken(collTokenMint);
   const strategy = collIsKtoken ? (await kamino!.getStrategyByKTokenMint(collTokenMint))! : undefined;
 
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
 
   const calcs = withdrawLeverageCalcs(
@@ -734,7 +739,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
 
-  const solTokenReserve = kaminoMarket.getReserveByMint(WRAPPED_SOL_MINT);
+  const solTokenReserve = kaminoMarket.getReserveByMint(NATIVE_MINT);
   const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve!.getLiquidityMint());
   const { swapInputs, initialInputs } = await getWithdrawWithLeverageSwapInputs({
     owner,
@@ -898,8 +903,8 @@ export async function buildWithdrawWithLeverageIxns(
   const atasAndCreateIxns = createAtasIdempotent(owner, mintsToCreateAtas);
 
   const closeWsolAtaIxns: TransactionInstruction[] = [];
-  if (depositTokenIsSol || debtTokenMint.equals(WRAPPED_SOL_MINT)) {
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+  if (depositTokenIsSol || debtTokenMint.equals(NATIVE_MINT)) {
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
     closeWsolAtaIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
   }
 
@@ -908,13 +913,13 @@ export async function buildWithdrawWithLeverageIxns(
   // TODO: Might be worth removing as it's only needed for Ktokens
   // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
   const fillWsolAtaIxns: TransactionInstruction[] = [];
-  if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
+  if (debtTokenMint.equals(NATIVE_MINT)) {
     const halfSolBalance = (await market.getConnection().getBalance(owner)) / LAMPORTS_PER_SOL / 2;
     const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(
+      ...getTransferWsolIxns(
         owner,
-        getAssociatedTokenAddressSync(WRAPPED_SOL_MINT, owner),
+        getAssociatedTokenAddressSync(NATIVE_MINT, owner),
         toLamports(balanceToWrap, SOL_DECIMALS).ceil()
       )
     );
@@ -953,6 +958,7 @@ export async function buildWithdrawWithLeverageIxns(
     0,
     false,
     false, // 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)
+    false, // 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)
     isClosingPosition,
     referrer,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1496,6 +1502,7 @@ async function buildIncreaseLeverageIxns(
     false,
     false,
     false, // 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)
+    false, // 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,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1513,6 +1520,7 @@ async function buildIncreaseLeverageIxns(
     false,
     false,
     false, // 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)
+    false, // 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,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }
@@ -1633,15 +1641,15 @@ async function buildDecreaseLeverageIxns(
   // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
   const closeWsolAtaIxns: TransactionInstruction[] = [];
   const fillWsolAtaIxns: TransactionInstruction[] = [];
-  if (debtTokenMint.equals(WRAPPED_SOL_MINT)) {
-    const wsolAta = getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner, false);
+  if (debtTokenMint.equals(NATIVE_MINT)) {
+    const wsolAta = getAssociatedTokenAddress(NATIVE_MINT, owner, false);
 
     closeWsolAtaIxns.push(createCloseAccountInstruction(wsolAta, owner, owner, [], TOKEN_PROGRAM_ID));
 
     const halfSolBalance = (await kaminoMarket.getConnection().getBalance(owner)) / LAMPORTS_PER_SOL / 2;
     const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
     fillWsolAtaIxns.push(
-      ...getDepositWsolIxns(owner, wsolAta, toLamports(balanceToWrap, debtReserve!.stats.decimals).ceil())
+      ...getTransferWsolIxns(owner, wsolAta, toLamports(balanceToWrap, debtReserve!.stats.decimals).ceil())
     );
   }
 
@@ -1675,6 +1683,7 @@ async function buildDecreaseLeverageIxns(
     false,
     false,
     false, // 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)
+    false, // 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,
     scopeRefresh
   );
@@ -1691,6 +1700,7 @@ async function buildDecreaseLeverageIxns(
     false,
     false,
     false, // 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)
+    false, // 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,
     { includeScopeRefresh: true, scopeFeed: scopeFeed! }

package/src/utils/ata.ts

@@ -98,7 +98,7 @@ export function createAtasIdempotent(
   return res;
 }
 
-export function getDepositWsolIxns(owner: PublicKey, ata: PublicKey, amountLamports: Decimal) {
+export function getTransferWsolIxns(owner: PublicKey, ata: PublicKey, amountLamports: Decimal) {
   const ixns: TransactionInstruction[] = [];
 
   ixns.push(

package/src/utils/constants.ts

@@ -72,22 +72,16 @@ export const SLOTS_PER_YEAR = SLOTS_PER_DAY * 365;
  */
 export const MIN_AUTODELEVERAGE_BONUS_BPS = 50;
 
-/**
- * WSOL Mint
- */
-export const WRAPPED_SOL_MINT = new PublicKey('So11111111111111111111111111111111111111112');
-
 export const SOL_DECIMALS = 9;
 
-/**
- * USDC Mint
- */
-export const USDC_MAINNET_MINT = new PublicKey('EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v');
-
 export const MAINNET_BETA_CHAIN_ID = 101;
 
-export const POSITION_LIMIT = 10;
 export const BORROWS_LIMIT = 5;
 export const DEPOSITS_LIMIT = 8;
 
 export const DEFAULT_MAX_COMPUTE_UNITS = 1_400_000;
+
+/**
+ * Minimum initial deposit required for the initialization of a reserve
+ */
+export const MIN_INITIAL_DEPOSIT = 100_000;

package/src/utils/instruction.ts

@@ -38,7 +38,7 @@ export async function buildAndSendTxnWithLogs(
     });
     console.log('Transaction Hash:', withDescription, sig);
     if (withLogsIfSuccess) {
-      await sleep(5000);
+      await sleep(1000);
       const res = await c.getTransaction(sig, {
         commitment: 'confirmed',
         maxSupportedTransactionVersion: 6,
@@ -49,7 +49,6 @@ export async function buildAndSendTxnWithLogs(
   } catch (e: any) {
     console.log(e);
     process.stdout.write(e.logs.toString());
-    await sleep(5000);
     const sig = e.toString().split(' failed ')[0].split('Transaction ')[1];
     const res: VersionedTransactionResponse | null = await c.getTransaction(sig, {
       commitment: 'confirmed',
@@ -115,7 +114,6 @@ export async function simulateTxn(c: Connection, tx: Transaction, owner: Keypair
   } catch (e: any) {
     console.log(e);
     process.stdout.write(e.logs.toString());
-    await sleep(5000);
     const sig = e.toString().split(' failed ')[0].split('Transaction ')[1];
     const res: TransactionResponse | null = await c.getTransaction(sig, {
       commitment: 'confirmed',

package/src/utils/managerTypes.ts

@@ -37,6 +37,7 @@ export type CreateKaminoMarketParams = {
 
 export type AddAssetToMarketParams = {
   admin: PublicKey;
+  adminLiquiditySource: PublicKey;
   marketAddress: PublicKey;
   assetConfig: AssetConfig;
 };

package/src/utils/userMetadata.ts

@@ -6,11 +6,11 @@ import {
   Connection,
   GetProgramAccountsFilter,
 } from '@solana/web3.js';
+import { NATIVE_MINT } from '@solana/spl-token';
 import { KaminoMarket, KaminoObligation } from '../classes';
 import {
   LeverageObligation,
   MultiplyObligation,
-  WRAPPED_SOL_MINT,
   createLookupTableIx,
   extendLookupTableIxs,
   getAssociatedTokenAddress,
@@ -259,7 +259,7 @@ function getMultiplyObligationAndObligationFarmStateAddresses(
     const collMintString = collMint.toString();
     const debtMintString = debtMint.toString();
     if (collReserve && debtReserve) {
-      const multiplyObligation = new MultiplyObligation(collMint, WRAPPED_SOL_MINT, kaminoMarket.programId);
+      const multiplyObligation = new MultiplyObligation(collMint, NATIVE_MINT, kaminoMarket.programId);
       obligationPdas.push({
         address: multiplyObligation.toPda(kaminoMarket.getAddress(), user),
         log: 'multiply obligation coll: ' + collMintString + ' debt: ' + debtMintString,