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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/klend-sdk",
-  "version": "5.11.0-beta.0",
+  "version": "5.11.1",
   "description": "Typescript SDK for interacting with the Kamino Lending (klend) protocol",
   "repository": {
     "type": "git",
@@ -31,8 +31,8 @@
     "build": "rm -rf dist/; tsc",
     "build:test": "yarn tsc --project ./tests/tsconfig.json",
     "build:watch": "yarn tsc --watch",
-    "test": "npx ts-mocha ./tests/**/*.test.ts ./tests/*.test.ts --parallel --exit",
-    "test-v2": "USE_V2=true npx ts-mocha ./tests/**/*.test.ts ./tests/*.test.ts --parallel --exit",
+    "test": "yarn ts-mocha ./tests/**/*.test.ts ./tests/*.test.ts --parallel --exit",
+    "test-v2": "USE_V2=true yarn ts-mocha ./tests/**/*.test.ts ./tests/*.test.ts --parallel --exit",
     "watch": "tsc --watch",
     "coverage": "jest --coverage",
     "clean": "rm -rf dist/",
@@ -56,8 +56,8 @@
   "dependencies": {
     "@coral-xyz/anchor": "^0.28.0",
     "@coral-xyz/borsh": "^0.28.0",
-    "@kamino-finance/farms-sdk": "2.3.4",
-    "@kamino-finance/kliquidity-sdk": "^7.0.1",
+    "@kamino-finance/farms-sdk": "2.4.2",
+    "@kamino-finance/kliquidity-sdk": "^7.0.13",
     "@kamino-finance/scope-sdk": "^8.0.3",
     "@solana/buffer-layout": "^4.0.0",
     "@solana/spl-token": "^0.4.8",
@@ -77,7 +77,7 @@
   "devDependencies": {
     "@orca-so/sdk": "^1.2.25",
     "@orca-so/whirlpool-sdk": "^0.4.2",
-    "@raydium-io/raydium-sdk": "^1.3.1-beta.54",
+    "@raydium-io/raydium-sdk-v2": "=0.1.111-alpha",
     "@types/bn.js": "^5.1.1",
     "@types/bs58": "^4.0.1",
     "@types/chai": "^4.3.5",
@@ -107,7 +107,7 @@
     "ts-node": "^10.9.2",
     "tsx": "^4.19.1",
     "typedoc": "^0.22.10",
-    "typescript": "^5.7.2",
+    "typescript": "^5.7.3",
     "typescript-eslint": "^0.0.1-alpha.0"
   }
 }

package/src/classes/action.ts

@@ -60,11 +60,9 @@ import {
   createLookupTableIx,
   isNotNullPubkey,
   PublicKeySet,
-  WRAPPED_SOL_MINT,
   getAssociatedTokenAddress,
   ScopeRefresh,
   createAtasIdempotent,
-  POSITION_LIMIT,
   obligationFarmStatePda,
 } from '../utils';
 import { KaminoMarket } from './market';
@@ -329,10 +327,6 @@ export class KaminoAction {
         ...(action === 'depositAndBorrow' ? [outflowReserve!] : []),
       ]).toArray().length;
 
-    if (distinctReserveCount > POSITION_LIMIT) {
-      throw Error(`Obligation already has max number of positions: ${POSITION_LIMIT}`);
-    }
-
     return {
       kaminoObligation,
       depositReserves,
@@ -421,6 +415,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false, // to be requested *before* the deposit
     includeUserMetadata: boolean = true, // if true it includes user metadata
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' },
@@ -459,6 +454,7 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
+      createLookupTable,
       undefined,
       overrideElevationGroupRequest
     );
@@ -521,6 +517,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' },
@@ -559,6 +556,7 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
+      createLookupTable,
       undefined,
       overrideElevationGroupRequest
     );
@@ -581,7 +579,6 @@ export class KaminoAction {
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
-    includeUserMetadata: boolean = true, // if true it includes user metadata
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
@@ -617,8 +614,9 @@ export class KaminoAction {
       'mint',
       includeAtaIxns,
       requestElevationGroup,
-      includeUserMetadata,
+      false,
       addInitObligationForFarm,
+      false,
       false
     );
     axn.addDepositReserveLiquidityIx();
@@ -635,7 +633,6 @@ export class KaminoAction {
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
-    includeUserMetadata: boolean = true, // if true it includes user metadata,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
@@ -671,8 +668,9 @@ export class KaminoAction {
       'redeem',
       includeAtaIxns,
       requestElevationGroup,
-      includeUserMetadata,
+      false,
       addInitObligationForFarm,
+      false,
       false
     );
     axn.addRedeemReserveCollateralIx();
@@ -691,6 +689,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
@@ -728,7 +727,8 @@ export class KaminoAction {
       requestElevationGroup,
       includeUserMetadata,
       addInitObligationForFarm,
-      useV2Ixs
+      useV2Ixs,
+      createLookupTable
     );
     if (useV2Ixs) {
       axn.addDepositObligationCollateralIxV2();
@@ -752,6 +752,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata,
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
@@ -796,6 +797,7 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarmForDeposit,
       useV2Ixs,
+      createLookupTable,
       twoTokenAction
     );
 
@@ -829,6 +831,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata,
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
@@ -871,13 +874,17 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarmForRepay,
       useV2Ixs,
+      createLookupTable,
       twoTokenAction
     );
+
+    const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve!, axn.outflowAmount!);
     if (useV2Ixs) {
-      await axn.addRepayAndWithdrawIxsV2();
+      await axn.addRepayAndWithdrawIxsV2(withdrawCollateralAmount);
     } else {
-      await axn.addRepayAndWithdrawIxs();
+      await axn.addRepayAndWithdrawIxs(withdrawCollateralAmount);
     }
+
     await axn.addInBetweenIxs(
       'repayAndWithdraw',
       includeAtaIxns,
@@ -900,6 +907,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false, // to be requested *after* the withdraw
     includeUserMetadata: boolean = true, // if true it includes user metadata
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh | undefined = undefined,
@@ -946,14 +954,18 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
+      createLookupTable,
       false,
       overrideElevationGroupRequest
     );
+
+    const collateralAmount = axn.getWithdrawCollateralAmount(axn.reserve, axn.amount);
     if (useV2Ixs) {
-      await axn.addWithdrawIxV2();
+      await axn.addWithdrawIxV2(collateralAmount);
     } else {
-      await axn.addWithdrawIx();
+      await axn.addWithdrawIx(collateralAmount);
     }
+
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
 
     return axn;
@@ -987,6 +999,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true,
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true,
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
@@ -1024,7 +1037,8 @@ export class KaminoAction {
       requestElevationGroup,
       includeUserMetadata,
       addInitObligationForFarm,
-      useV2Ixs
+      useV2Ixs,
+      createLookupTable
     );
     if (useV2Ixs) {
       await axn.addRepayIxV2();
@@ -1050,6 +1064,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     maxAllowedLtvOverridePercent: number = 0,
     currentSlot: number = 0,
@@ -1092,7 +1107,8 @@ export class KaminoAction {
       requestElevationGroup,
       includeUserMetadata,
       addInitObligationForFarm,
-      useV2Ixs
+      useV2Ixs,
+      createLookupTable
     );
     if (useV2Ixs) {
       await axn.addLiquidateIxV2(maxAllowedLtvOverridePercent);
@@ -1505,16 +1521,7 @@ export class KaminoAction {
   }
 
   /// @deprecated -- use addWithdrawIxV2 instead
-  async addWithdrawIx() {
-    const collateralExchangeRate = this.reserve.getEstimatedCollateralExchangeRate(
-      this.currentSlot,
-      this.kaminoMarket.state.referralFeeBps
-    );
-
-    const collateralAmount = this.amount.eq(new BN(U64_MAX))
-      ? this.amount
-      : new BN(new Decimal(this.amount.toString()).mul(collateralExchangeRate).ceil().toString());
-
+  async addWithdrawIx(collateralAmount: BN) {
     this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
     this.lendingIxs.push(
       withdrawObligationCollateralAndRedeemReserveCollateral(
@@ -1542,17 +1549,7 @@ export class KaminoAction {
     );
   }
 
-  async addWithdrawIxV2() {
-    const collateralExchangeRate = this.reserve.getEstimatedCollateralExchangeRate(
-      this.currentSlot,
-      this.kaminoMarket.state.referralFeeBps
-    );
-
-    // TODO: Move this side effect from here...
-    const collateralAmount = this.amount.eq(new BN(U64_MAX))
-      ? this.amount
-      : new BN(new Decimal(this.amount.toString()).mul(collateralExchangeRate).ceil().toString());
-
+  async addWithdrawIxV2(collateralAmount: BN) {
     const farmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
       ? {
           obligationFarmUserState: PROGRAM_ID,
@@ -1872,7 +1869,7 @@ export class KaminoAction {
     this.lendingIxs.push(borrowIx);
   }
 
-  async addRepayAndWithdrawIxs() {
+  async addRepayAndWithdrawIxs(withdrawCollateralAmount: BN) {
     this.lendingIxsLabels.push(
       `repayObligationLiquidity(reserve=${this.reserve!.address})(obligation=${this.getObligationPda()})`
     );
@@ -1916,17 +1913,10 @@ export class KaminoAction {
       throw new Error(`outflowAmount not set`);
     }
 
-    const collateralExchangeRate = this.outflowReserve.getEstimatedCollateralExchangeRate(
-      this.currentSlot,
-      this.kaminoMarket.state.referralFeeBps
-    );
-
     this.lendingIxs.push(
       withdrawObligationCollateralAndRedeemReserveCollateral(
         {
-          collateralAmount: this.outflowAmount.eq(new BN(U64_MAX))
-            ? this.outflowAmount
-            : new BN(new Decimal(this.outflowAmount.toString()).mul(collateralExchangeRate).ceil().toString()),
+          collateralAmount: withdrawCollateralAmount,
         },
         {
           owner: this.owner,
@@ -1949,7 +1939,7 @@ export class KaminoAction {
     );
   }
 
-  async addRepayAndWithdrawIxsV2() {
+  async addRepayAndWithdrawIxsV2(withdrawCollateralAmount: BN) {
     this.lendingIxsLabels.push(
       `repayObligationLiquidityV2(reserve=${this.reserve!.address})(obligation=${this.getObligationPda()})`
     );
@@ -2009,11 +1999,6 @@ export class KaminoAction {
       throw new Error(`outflowAmount not set`);
     }
 
-    const collateralExchangeRate = this.outflowReserve.getEstimatedCollateralExchangeRate(
-      this.currentSlot,
-      this.kaminoMarket.state.referralFeeBps
-    );
-
     const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(PublicKey.default)
       ? {
           obligationFarmUserState: PROGRAM_ID,
@@ -2030,9 +2015,7 @@ export class KaminoAction {
     this.lendingIxs.push(
       withdrawObligationCollateralAndRedeemReserveCollateralV2(
         {
-          collateralAmount: this.outflowAmount.eq(new BN(U64_MAX))
-            ? this.outflowAmount
-            : new BN(new Decimal(this.outflowAmount.toString()).mul(collateralExchangeRate).ceil().toString()),
+          collateralAmount: withdrawCollateralAmount,
         },
         {
           withdrawAccounts: {
@@ -2517,13 +2500,24 @@ export class KaminoAction {
     includeUserMetadata: boolean,
     addInitObligationForFarm: boolean,
     useV2Ixs: boolean,
+    createLookupTable: boolean,
     twoTokenAction: boolean = false,
     overrideElevationGroupRequest?: number
   ) {
     if (!['mint', 'redeem'].includes(action)) {
       const [, ownerUserMetadata] = await this.kaminoMarket.getUserMetadata(this.owner);
       if (!ownerUserMetadata && includeUserMetadata) {
-        await this.addInitUserMetadataIxs();
+        let lookupTable: PublicKey = PublicKey.default;
+        if (createLookupTable) {
+          const [createLutIx, lookupTableAddress] = await createLookupTableIx(
+            this.kaminoMarket.getConnection(),
+            this.owner
+          );
+          lookupTable = lookupTableAddress;
+          this.setupIxs.push(createLutIx);
+          this.setupIxsLabels.push(`createUserLutIx[${lookupTableAddress.toString()}]`);
+        }
+        this.addInitUserMetadataIxs(lookupTable);
       }
 
       if (['borrow', 'withdrawReferrerFees'].includes(action)) {
@@ -2931,10 +2925,7 @@ export class KaminoAction {
     }
   }
 
-  private async addInitUserMetadataIxs() {
-    const [createLutIx, lookupTableAddress] = await createLookupTableIx(this.kaminoMarket.getConnection(), this.owner);
-    this.setupIxs.push(createLutIx);
-    this.setupIxsLabels.push(`createUserLutIx[${lookupTableAddress.toString()}]`);
+  private addInitUserMetadataIxs(lookupTableAddress: PublicKey) {
     const [userMetadataAddress, _bump] = userMetadataPda(this.owner, this.kaminoMarket.programId);
     const referrerUserMetadataAddress = this.referrer.equals(PublicKey.default)
       ? this.kaminoMarket.programId
@@ -3014,11 +3005,11 @@ export class KaminoAction {
   }
 
   private async addAtaIxs(action: ActionType) {
-    if (this.mint.equals(WRAPPED_SOL_MINT) || this.secondaryMint?.equals(WRAPPED_SOL_MINT)) {
+    if (this.mint.equals(NATIVE_MINT) || this.secondaryMint?.equals(NATIVE_MINT)) {
       await this.updateWSOLAccount(action);
     }
 
-    if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(WRAPPED_SOL_MINT)) {
+    if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(NATIVE_MINT)) {
       const [, createUserTokenAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
         this.owner,
         this.reserve.getLiquidityMint(),
@@ -3027,13 +3018,8 @@ export class KaminoAction {
         this.userTokenAccountAddress
       );
 
-      if (this.positions === POSITION_LIMIT) {
-        this.preTxnIxs.push(createUserTokenAccountIx);
-        this.preTxnIxsLabels.push(`CreateLiquidityUserAta[${this.owner}]`);
-      } else {
-        this.setupIxs.unshift(createUserTokenAccountIx);
-        this.setupIxsLabels.unshift(`CreateLiquidityUserAta[${this.owner}]`);
-      }
+      this.setupIxs.unshift(createUserTokenAccountIx);
+      this.setupIxsLabels.unshift(`CreateLiquidityUserAta[${this.owner}]`);
     }
 
     if (action === 'liquidate') {
@@ -3048,13 +3034,9 @@ export class KaminoAction {
         this.outflowReserve.getLiquidityTokenProgram(),
         this.userTokenAccountAddress
       );
-      if (this.positions === POSITION_LIMIT && this.mint.equals(WRAPPED_SOL_MINT)) {
-        this.preTxnIxs.push(createUserTokenAccountIx);
-        this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
-      } else {
-        this.setupIxs.unshift(createUserTokenAccountIx);
-        this.setupIxsLabels.unshift(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
-      }
+
+      this.setupIxs.unshift(createUserTokenAccountIx);
+      this.setupIxsLabels.unshift(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
 
       const [, createUserCollateralAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
         this.owner,
@@ -3064,23 +3046,15 @@ export class KaminoAction {
         this.userCollateralAccountAddress
       );
 
-      if (this.positions === POSITION_LIMIT && this.mint.equals(WRAPPED_SOL_MINT)) {
-        this.preTxnIxs.push(createUserCollateralAccountIx);
-        this.preTxnIxsLabels.push(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-      } else {
-        this.setupIxs.unshift(createUserCollateralAccountIx);
-        this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-      }
+      this.setupIxs.unshift(createUserCollateralAccountIx);
+      this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
 
       if (!this.additionalTokenAccountAddress) {
         throw new Error(`Additional token account address not found ${this.mint}`);
       }
     }
 
-    if (
-      action === 'depositAndBorrow' ||
-      (action === 'repayAndWithdraw' && !this.secondaryMint?.equals(WRAPPED_SOL_MINT))
-    ) {
+    if (action === 'depositAndBorrow' || (action === 'repayAndWithdraw' && !this.secondaryMint?.equals(NATIVE_MINT))) {
       if (!this.additionalTokenAccountAddress) {
         throw new Error(`Additional token account address not found ${this.secondaryMint}`);
       }
@@ -3128,13 +3102,8 @@ export class KaminoAction {
         this.userCollateralAccountAddress
       );
 
-      if (this.positions === POSITION_LIMIT && this.mint.equals(WRAPPED_SOL_MINT)) {
-        this.preTxnIxs.push(createUserCollateralAccountIx);
-        this.preTxnIxsLabels.push(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-      } else {
-        this.setupIxs.unshift(createUserCollateralAccountIx);
-        this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-      }
+      this.setupIxs.unshift(createUserCollateralAccountIx);
+      this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
     }
   }
 
@@ -3177,7 +3146,7 @@ export class KaminoAction {
     }
 
     let userTokenAccountAddress = this.userTokenAccountAddress;
-    if (this.secondaryMint?.equals(WRAPPED_SOL_MINT)) {
+    if (this.secondaryMint?.equals(NATIVE_MINT)) {
       if (!this.additionalTokenAccountAddress) {
         throw new Error(`Additional token account address not found ${this.secondaryMint}`);
       }
@@ -3193,7 +3162,7 @@ export class KaminoAction {
       action === 'deposit' ||
       action === 'repay' ||
       action === 'mint' ||
-      (action === 'liquidate' && this.secondaryMint?.equals(WRAPPED_SOL_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
+      (action === 'liquidate' && this.secondaryMint?.equals(NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
 
     const transferLamportsIx = SystemProgram.transfer({
       fromPubkey: this.owner,
@@ -3236,14 +3205,6 @@ export class KaminoAction {
       postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
     }
 
-    // TODO: Consider for liquidations and other types of actions if we have to split up some ixs in 2-3 txs
-    // if (this.positions && this.positions >= POSITION_LIMIT) {
-    //   this.preTxnIxs.push(...preIxs);
-    //   this.preTxnIxsLabels.push(...preIxsLabels);
-    //   this.postTxnIxs.push(...postIxs);
-    //   this.postTxnIxsLabels.push(...postIxsLabels);
-    // } else {
-    // }
     this.setupIxs.unshift(...preIxs);
     this.setupIxsLabels.unshift(...preIxsLabels);
     this.cleanupIxs.push(...postIxs);
@@ -3384,6 +3345,17 @@ export class KaminoAction {
     };
   }
 
+  getWithdrawCollateralAmount(reserve: KaminoReserve, amount: BN): BN {
+    const collateralExchangeRate = reserve.getEstimatedCollateralExchangeRate(
+      this.currentSlot,
+      this.kaminoMarket.state.referralFeeBps
+    );
+
+    return amount.eq(new BN(U64_MAX))
+      ? amount
+      : new BN(new Decimal(amount.toString()).mul(collateralExchangeRate).ceil().toString());
+  }
+
   getObligationPda(): PublicKey {
     return this.obligation
       ? this.obligation.obligationAddress

package/src/classes/manager.ts

@@ -76,6 +76,7 @@ import { getProgramAccounts } from '../utils/rpc';
 import { VaultConfigField, VaultConfigFieldKind } from '../idl_codegen_kamino_vault/types';
 import {
   AcceptVaultOwnershipIxs,
+  APYs,
   DepositIxs,
   InitVaultIxs,
   ReserveAllocationOverview,
@@ -186,6 +187,7 @@ export class KaminoManager {
     const createReserveInstructions = await createReserveIxs(
       this._connection,
       params.admin,
+      params.adminLiquiditySource,
       params.marketAddress,
       params.assetConfig.mint,
       reserveAccount.publicKey,
@@ -621,6 +623,15 @@ export class KaminoManager {
     });
   }
 
+  /**
+   * Get a list of kaminoVaults
+   * @param vaults - a list of vaults to get the states for; if not provided, all vaults will be fetched
+   * @returns a list of KaminoVaults
+   */
+  async getVaults(vaults?: Array<PublicKey>): Promise<Array<KaminoVault | null>> {
+    return this._vaultClient.getVaults(vaults);
+  }
+
   /**
    * Get all token accounts that hold shares for a specific share mint
    * @param shareMint
@@ -769,14 +780,14 @@ export class KaminoManager {
    * This will return the APY of the vault under the assumption that all the available tokens in the vault are all the time invested in the reserves as ratio; for percentage it needs multiplication by 100
    * @param vault - the kamino vault to get APY for
    * @param slot - current slot
-   * @param vaultReserves - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
-   * @returns APY for the vault
+   * @param [vaultReservesMap] - hashmap from each reserve pubkey to the reserve state. Optional. If provided the function will be significantly faster as it will not have to fetch the reserves
+   * @returns a struct containing estimated gross APY and net APY (gross - vault fees) for the vault
    */
   async getVaultTheoreticalAPY(
     vault: VaultState,
     slot: number,
     vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>
-  ): Promise<Decimal> {
+  ): Promise<APYs> {
     return this._vaultClient.getVaultTheoreticalAPY(vault, slot, vaultReserves);
   }
 
@@ -854,6 +865,15 @@ export class KaminoManager {
     return this._vaultClient.loadVaultReserves(vaultState);
   }
 
+  /**
+   * This will load the onchain state for all the reserves that the vaults have allocations for, deduplicating the reserves
+   * @param vaults - the vault states to load reserves for
+   * @returns a hashmap from each reserve pubkey to the reserve state
+   */
+  async loadVaultsReserves(vaults: VaultState[]): Promise<PubkeyHashMap<PublicKey, KaminoReserve>> {
+    return this._vaultClient.loadVaultsReserves(vaults);
+  }
+
   /**
    * This will load the onchain state for all the reserves that the vault has allocations for
    * @param vaultState - the vault state to load reserves for
@@ -1248,6 +1268,17 @@ const updateLendingMarketConfig = (
         });
       }
       break;
+    case 'minInitialDepositAmount':
+      if (!market.minInitialDepositAmount.eq(newMarket.minInitialDepositAmount)) {
+        updateLendingMarketIxnsArgs.push({
+          mode: UpdateLendingMarketMode.UpdateInitialDepositAmount.discriminator,
+          value: updateMarketConfigEncodedValue(
+            UpdateLendingMarketMode.UpdateInitialDepositAmount.discriminator,
+            newMarket.minInitialDepositAmount.toNumber()
+          ),
+        });
+      }
+      break;
     default:
       assertNever(key);
   }
@@ -1312,6 +1343,7 @@ function updateMarketConfigEncodedValue(
     case UpdateLendingMarketMode.UpdateMinValueBfSkipPriorityLiqCheck.discriminator:
     case UpdateLendingMarketMode.UpdateMinValueLtvSkipPriorityLiqCheck.discriminator:
     case UpdateLendingMarketMode.UpdateIndividualAutodeleverageMarginCallPeriodSecs.discriminator:
+    case UpdateLendingMarketMode.UpdateInitialDepositAmount.discriminator:
       value = value as number;
       buffer.writeBigUint64LE(BigInt(value), 0);
       break;

package/src/classes/obligation.ts

@@ -105,6 +105,7 @@ export class KaminoObligation {
   ) {
     this.obligationAddress = obligationAddress;
     this.state = obligation;
+
     const { borrows, deposits, refreshedStats } = this.calculatePositions(
       market,
       obligation.deposits,
@@ -784,20 +785,23 @@ export class KaminoObligation {
     return new Decimal(0);
   };
 
-  private calculatePositions(
+  static getOraclePx = (reserve: KaminoReserve) => {
+    return reserve.getOracleMarketPrice();
+  };
+
+  calculatePositions(
     market: KaminoMarket,
     obligationDeposits: ObligationCollateral[],
     obligationBorrows: ObligationLiquidity[],
     elevationGroup: number,
     collateralExchangeRates: Map<PublicKey, Decimal>,
-    cumulativeBorrowRates: Map<PublicKey, Decimal> | null
+    cumulativeBorrowRates: Map<PublicKey, Decimal> | null,
+    getOraclePx: (reserve: KaminoReserve) => Decimal = KaminoObligation.getOraclePx
   ): {
     borrows: Map<PublicKey, Position>;
     deposits: Map<PublicKey, Position>;
     refreshedStats: ObligationStats;
   } {
-    const getOraclePx = (reserve: KaminoReserve) => reserve.getOracleMarketPrice();
-
     const depositStatsOraclePrice = KaminoObligation.calculateObligationDeposits(
       market,
       obligationDeposits,