@kamino-finance/klend-sdk 5.10.0 → 5.10.2

package/dist/utils/ata.js

@@ -104,6 +104,7 @@ async function getTokenAccountBalance(provider, tokenAccount) {
     const tokenAccountBalance = await provider.connection.getTokenAccountBalance(tokenAccount);
     return Number(tokenAccountBalance.value.amount).valueOf();
 }
+/// Get the balance of a token account in decimal format (tokens, not lamports)
 async function getTokenAccountBalanceDecimal(connection, mint, owner, tokenProgram = spl_token_1.TOKEN_PROGRAM_ID) {
     const ata = getAssociatedTokenAddress(mint, owner, true, tokenProgram);
     const accInfo = await connection.getAccountInfo(ata);

package/dist/utils/ata.js.map

@@ -1 +1 @@
-{"version":3,"file":"ata.js","sourceRoot":"","sources":["../../src/utils/ata.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ata.js","sourceRoot":"","sources":["../../src/utils/ata.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/klend-sdk",
-  "version": "5.10.0",
+  "version": "5.10.2",
   "description": "Typescript SDK for interacting with the Kamino Lending (klend) protocol",
   "repository": {
     "type": "git",
@@ -31,7 +31,7 @@
     "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 --exit",
+    "test": "npx ts-mocha ./tests/**/*.test.ts ./tests/*.test.ts --parallel --exit",
     "watch": "tsc --watch",
     "coverage": "jest --coverage",
     "clean": "rm -rf dist/",
@@ -52,7 +52,7 @@
   "dependencies": {
     "@coral-xyz/anchor": "^0.28.0",
     "@coral-xyz/borsh": "^0.28.0",
-    "@kamino-finance/farms-sdk": "^2.3.0",
+    "@kamino-finance/farms-sdk": "2.3.4",
     "@kamino-finance/kliquidity-sdk": "^6.4.0",
     "@kamino-finance/scope-sdk": "^8.0.2",
     "@solana/buffer-layout": "^4.0.0",
@@ -78,7 +78,7 @@
     "@types/bs58": "^4.0.1",
     "@types/chai": "^4.3.5",
     "@types/jest": "^27.0.3",
-    "@types/mocha": "^10.0.6",
+    "@types/mocha": "^10.0.10",
     "@types/node-fetch": "^2.6.7",
     "@typescript-eslint/eslint-plugin": "^5.5.0",
     "@typescript-eslint/parser": "^5.5.0",
@@ -94,7 +94,7 @@
     "eslint-plugin-react": "^7.27.1",
     "jest": "^27.4.3",
     "jest-fetch-mock": "^3.0.3",
-    "mocha": "^10.2.0",
+    "mocha": "^10.7.0",
     "nodemon": "^3.1.7",
     "prettier": "^2.8.8",
     "start-server-and-test": "^2.0.0",
@@ -103,7 +103,7 @@
     "ts-node": "^10.9.2",
     "tsx": "^4.19.1",
     "typedoc": "^0.22.10",
-    "typescript": "^5.4.5",
+    "typescript": "^5.7.2",
     "typescript-eslint": "^0.0.1-alpha.0"
   }
 }

package/src/classes/farm_utils.ts

@@ -0,0 +1,155 @@
+import {
+  Farms,
+  FarmState,
+  getUserStatePDA,
+  UserState,
+  FarmConfigOption,
+  lamportsToCollDecimal,
+  scaleDownWads,
+  WAD,
+} from '@kamino-finance/farms-sdk';
+import { Connection, Keypair, PublicKey, TransactionInstruction } from '@solana/web3.js';
+import Decimal from 'decimal.js/decimal';
+
+export const FARMS_GLOBAL_CONFIG_MAINNET: PublicKey = new PublicKey('6UodrBjL2ZreDy7QdR4YV1oxqMBjVYSEyrFpctqqwGwL');
+
+export async function getFarmStakeIxs(
+  connection: Connection,
+  user: PublicKey,
+  lamportsToStake: Decimal,
+  farmAddress: PublicKey,
+  fetchedFarmState?: FarmState
+): Promise<TransactionInstruction[]> {
+  const farmState = fetchedFarmState ? fetchedFarmState : await FarmState.fetch(connection, farmAddress);
+  if (!farmState) {
+    throw new Error(`Farm state not found for ${farmAddress}`);
+  }
+
+  const farmClient = new Farms(connection);
+  const scopePricesArg = farmState.scopePrices.equals(PublicKey.default)
+    ? farmClient.getProgramID()
+    : farmState!.scopePrices;
+
+  const stakeIxs: TransactionInstruction[] = [];
+  const userState = getUserStatePDA(farmClient.getProgramID(), farmAddress, user);
+  const userStateExists = await connection.getAccountInfo(userState);
+  if (!userStateExists) {
+    const createUserIx = farmClient.createNewUserIx(user, farmAddress);
+    stakeIxs.push(createUserIx);
+  }
+
+  const stakeIx = farmClient.stakeIx(user, farmAddress, lamportsToStake, farmState.token.mint, scopePricesArg);
+  stakeIxs.push(stakeIx);
+
+  return stakeIxs;
+}
+
+export async function getFarmUserStatePDA(
+  connection: Connection,
+  user: PublicKey,
+  farm: PublicKey
+): Promise<PublicKey> {
+  const farmClient = new Farms(connection);
+  return getUserStatePDA(farmClient.getProgramID(), farm, user);
+}
+
+export async function getFarmUnstakeIx(
+  connection: Connection,
+  user: PublicKey,
+  lamportsToUnstake: Decimal,
+  farmAddress: PublicKey,
+  fetchedFarmState?: FarmState
+): Promise<TransactionInstruction> {
+  const farmState = fetchedFarmState ? fetchedFarmState : await FarmState.fetch(connection, farmAddress);
+  if (!farmState) {
+    throw new Error(`Farm state not found for ${farmAddress}`);
+  }
+
+  const farmClient = new Farms(connection);
+  const scopePricesArg = farmState.scopePrices.equals(PublicKey.default)
+    ? farmClient.getProgramID()
+    : farmState!.scopePrices;
+  const userState = getUserStatePDA(farmClient.getProgramID(), farmAddress, user);
+  if (!userState) {
+    throw new Error(`User state not found for ${user}`);
+  }
+
+  const x = new Decimal(lamportsToUnstake.toString()).mul(WAD);
+  console.log('lamportsToUnstake', lamportsToUnstake.toString());
+  return farmClient.unstakeIx(user, farmAddress, x.toString(), scopePricesArg);
+}
+
+// withdrawing from a farm is a 2 step operation: first we unstake the tokens from the farm, then we withdraw them
+export async function getFarmWithdrawUnstakedDepositIx(
+  connection: Connection,
+  user: PublicKey,
+  farm: PublicKey,
+  stakeTokenMint: PublicKey
+): Promise<TransactionInstruction> {
+  const farmClient = new Farms(connection);
+
+  const userState = getUserStatePDA(farmClient.getProgramID(), farm, user);
+  return farmClient.withdrawUnstakedDepositIx(user, userState, farm, stakeTokenMint);
+}
+
+export async function getFarmUnstakeAndWithdrawIxs(
+  connection: Connection,
+  user: PublicKey,
+  lamportsToUnstake: Decimal,
+  farmAddress: PublicKey,
+  fetchedFarmState?: FarmState
+): Promise<UnstakeAndWithdrawFromFarmIxs> {
+  const farmState = fetchedFarmState ? fetchedFarmState : await FarmState.fetch(connection, farmAddress);
+  if (!farmState) {
+    throw new Error(`Farm state not found for ${farmAddress}`);
+  }
+
+  const unstakeIx = await getFarmUnstakeIx(connection, user, lamportsToUnstake, farmAddress, farmState);
+  const withdrawIx = await getFarmWithdrawUnstakedDepositIx(connection, user, farmAddress, farmState.token.mint);
+  return { unstakeIx, withdrawIx };
+}
+
+export async function getSetupFarmIxsWithFarm(
+  connection: Connection,
+  farmAdmin: Keypair,
+  farmTokenMint: PublicKey
+): Promise<SetupFarmIxsWithFarm> {
+  const farmClient = new Farms(connection);
+  const farm = new Keypair();
+  const ixs = await farmClient.createFarmIx(farmAdmin.publicKey, farm, FARMS_GLOBAL_CONFIG_MAINNET, farmTokenMint);
+  return { farm, setupFarmIxs: ixs };
+}
+
+export async function getUserSharesInFarm(
+  connection: Connection,
+  user: PublicKey,
+  farm: PublicKey,
+  farmTokenDecimals: number
+): Promise<Decimal> {
+  const farmClient = new Farms(connection);
+  return farmClient.getUserTokensInUndelegatedFarm(user, farm, farmTokenDecimals);
+}
+
+export async function setVaultIdForFarmIx(
+  connection: Connection,
+  farmAdmin: PublicKey,
+  farm: PublicKey,
+  vault: PublicKey
+): Promise<TransactionInstruction> {
+  const farmClient = new Farms(connection);
+  return farmClient.updateFarmConfigIx(farmAdmin, farm, PublicKey.default, new FarmConfigOption.UpdateVaultId(), vault);
+}
+
+export function getSharesInFarmUserPosition(userState: UserState, tokenDecimals: number): Decimal {
+  return lamportsToCollDecimal(new Decimal(scaleDownWads(userState.activeStakeScaled)), tokenDecimals);
+}
+
+export type SetupFarmIxsWithFarm = {
+  farm: Keypair;
+  setupFarmIxs: TransactionInstruction[];
+};
+
+export type UnstakeAndWithdrawFromFarmIxs = {
+  unstakeIx: TransactionInstruction;
+  withdrawIx: TransactionInstruction;
+};

package/src/classes/lut_utils.ts

@@ -0,0 +1,63 @@
+import { AddressLookupTableProgram, Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
+
+/**
+ * This method retuns an instruction that creates a lookup table, alongside the pubkey of the lookup table
+ * @param payer - the owner of the lookup table
+ * @param slot - the current slot
+ * @returns - the instruction to create the lookup table and its address
+ */
+export function initLookupTableIx(payer: PublicKey, slot: number): [TransactionInstruction, PublicKey] {
+  const [ixn, address] = AddressLookupTableProgram.createLookupTable({
+    authority: payer,
+    payer,
+    recentSlot: slot,
+  });
+
+  return [ixn, address];
+}
+
+/**
+ * This method retuns an instruction that deactivates a lookup table, which is needed to close it
+ * @param payer - the owner of the lookup table
+ * @param lookupTable - the lookup table to deactivate
+ * @returns - the instruction to deactivate the lookup table
+ */
+export function deactivateLookupTableIx(payer: PublicKey, lookupTable: PublicKey): TransactionInstruction {
+  const ixn = AddressLookupTableProgram.deactivateLookupTable({
+    authority: payer,
+    lookupTable: lookupTable,
+  });
+
+  return ixn;
+}
+
+/**
+ * This method returns an instruction that closes a lookup table. That lookup table needs to be disabled at least 500 blocks before closing it.
+ * @param payer - the owner of the lookup table
+ * @param lookupTable - the lookup table to close
+ * @returns - the instruction to close the lookup table
+ */
+/// this require the LUT to be deactivated at least 500 blocks before
+export function closeLookupTableIx(payer: PublicKey, lookupTable: PublicKey): TransactionInstruction {
+  const ixn = AddressLookupTableProgram.closeLookupTable({
+    authority: payer,
+    recipient: payer,
+    lookupTable: lookupTable,
+  });
+
+  return ixn;
+}
+
+/**
+ * Returns the accounts in a lookup table
+ * @param lookupTable - lookup table to get the accounts from
+ * @returns - an array of accounts in the lookup table
+ */
+export async function getAccountsInLUT(connection: Connection, lookupTable: PublicKey): Promise<PublicKey[]> {
+  const lutState = await connection.getAddressLookupTable(lookupTable);
+  if (!lutState || !lutState.value) {
+    throw new Error(`Lookup table ${lookupTable} not found`);
+  }
+
+  return lutState.value.state.addresses;
+}

package/src/classes/manager.ts

@@ -69,11 +69,15 @@ import { getProgramAccounts } from '../utils/rpc';
 import { VaultConfigFieldKind } from '../idl_codegen_kamino_vault/types';
 import {
   AcceptVaultOwnershipIxs,
+  DepositIxs,
   InitVaultIxs,
   SyncVaultLUTIxs,
   UpdateReserveAllocationIxs,
   UpdateVaultConfigIxs,
+  UserSharesForVault,
+  WithdrawIxs,
 } from './types';
+import { FarmState } from '@kamino-finance/farms-sdk/dist';
 
 /**
  * KaminoManager is a class that provides a high-level interface to interact with the Kamino Lend and Kamino Vault programs, in order to create and manage a market, as well as vaults
@@ -198,7 +202,6 @@ export class KaminoManager {
   /**
    * This method will create a vault with a given config. The config can be changed later on, but it is recommended to set it up correctly from the start
    * @param vaultConfig - the config object used to create a vault
-   * @returns vault - keypair, should be used to sign the transaction which creates the vault account
    * @returns vault: the keypair of the vault, used to sign the initialization transaction; initVaultIxs: a struct with ixs to initialize the vault and its lookup table + populateLUTIxs, a list to populate the lookup table which has to be executed in a separate transaction
    */
   async createVaultIxs(vaultConfig: KaminoVaultConfig): Promise<{ vault: Keypair; initVaultIxs: InitVaultIxs }> {
@@ -209,7 +212,7 @@ export class KaminoManager {
    * This method updates the vault reserve allocation cofnig for an exiting vault reserve, or adds a new reserve to the vault if it does not exist.
    * @param vault - vault to be updated
    * @param reserveAllocationConfig - new reserve allocation config
-   * @returns - a struct of instructions
+   * @returns - a struct with an instruction to update the reserve allocation and an optional list of instructions to update the lookup table for the allocation changes
    */
   async updateVaultReserveAllocationIxs(
     vault: KaminoVault,
@@ -325,21 +328,38 @@ export class KaminoManager {
   /**
    * This function creates instructions to deposit into a vault. It will also create ATA creation instructions for the vault shares that the user receives in return
    * @param user - user to deposit
-   * @param vault - vault to deposit into
+   * @param vault - vault to deposit into (if the state is not provided, it will be fetched)
    * @param tokenAmount - token amount to be deposited, in decimals (will be converted in lamports)
-   * @param tokenProgramIDOverride - optional param; should be passed if token to be deposited is token22
-   * @param vaultReservesMap - 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 - an array of instructions to be used to be executed
+   * @param [vaultReservesMap] - optional parameter; a 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
+   * @param [farmState] - the state of the vault farm, if the vault has a farm. Optional. If not provided, it will be fetched
+   * @returns - an instance of DepositIxs which contains the instructions to deposit in vault and the instructions to stake the shares in the farm if the vault has a farm
    */
   async depositToVaultIxs(
     user: PublicKey,
     vault: KaminoVault,
     tokenAmount: Decimal,
     vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>
-  ): Promise<TransactionInstruction[]> {
+  ): Promise<DepositIxs> {
     return this._vaultClient.depositIxs(user, vault, tokenAmount, vaultReservesMap);
   }
 
+  /**
+   * This function creates instructions to stake the shares in the vault farm if the vault has a farm
+   * @param user - user to stake
+   * @param vault - vault to deposit into its farm (if the state is not provided, it will be fetched)
+   * @param [sharesAmount] - token amount to be deposited, in decimals (will be converted in lamports). Optional. If not provided, the user's share balance will be used
+   * @param [farmState] - the state of the vault farm, if the vault has a farm. Optional. If not provided, it will be fetched
+   * @returns - a list of instructions for the user to stake shares into the vault's farm, including the creation of prerequisite accounts if needed
+   */
+  async stakeSharesIxs(
+    user: PublicKey,
+    vault: KaminoVault,
+    sharesAmount?: Decimal,
+    farmState?: FarmState
+  ): Promise<TransactionInstruction[]> {
+    return this._vaultClient.stakeSharesIxs(user, vault, sharesAmount, farmState);
+  }
+
   /**
    * Update a field of the vault. If the field is a pubkey it will return an extra instruction to add that account into the lookup table
    * @param vault the vault to update
@@ -355,10 +375,23 @@ export class KaminoManager {
     return this._vaultClient.updateVaultConfigIxs(vault, mode, value);
   }
 
+  /** Sets the farm where the shares can be staked. This is store in vault state and a vault can only have one farm, so the new farm will ovveride the old farm
+   * @param vault - vault to set the farm for
+   * @param farm - the farm where the vault shares can be staked
+   * @param [errorOnOverride] - if true, the function will throw an error if the vault already has a farm. If false, it will override the farm
+   */
+  async setVaultFarm(
+    vault: KaminoVault,
+    farm: PublicKey,
+    errorOnOverride: boolean = true
+  ): Promise<UpdateVaultConfigIxs> {
+    return this._vaultClient.setVaultFarm(vault, farm, errorOnOverride);
+  }
+
   /**
-   * This function creates the instruction for the `pendingAdmin` of the vault to accept to become the owner of the vault (step 2/2 of the ownership transfer) and the instructions to sync the vault LUT to the new state
+   * This function creates the instruction for the `pendingAdmin` of the vault to accept to become the owner of the vault (step 2/2 of the ownership transfer)
    * @param vault - vault to change the ownership for
-   * @returns - an instruction to be used to be executed
+   * @returns - an instruction to accept the ownership of the vault and a list of instructions to update the lookup table
    */
   async acceptVaultOwnershipIxs(vault: KaminoVault): Promise<AcceptVaultOwnershipIxs> {
     return this._vaultClient.acceptVaultOwnershipIxs(vault);
@@ -368,7 +401,7 @@ export class KaminoManager {
    * This function creates the instruction for the admin to give up a part of the pending fees (which will be accounted as part of the vault)
    * @param vault - vault to give up pending fees for
    * @param maxAmountToGiveUp - the maximum amount of fees to give up, in tokens
-   * @returns - an instruction to be used to be executed
+   * @returns - an instruction to give up the specified pending fees
    */
   async giveUpPendingFeesIx(vault: KaminoVault, maxAmountToGiveUp: Decimal): Promise<TransactionInstruction> {
     return this._vaultClient.giveUpPendingFeesIx(vault, maxAmountToGiveUp);
@@ -380,14 +413,15 @@ export class KaminoManager {
    * @param vault - vault to withdraw from
    * @param shareAmount - share amount to withdraw, in order to withdraw everything, any value > user share amount
    * @param slot - current slot, used to estimate the interest earned in the different reserves with allocation from the vault
-   * @returns an array of instructions to be executed
+   * @param [vaultReservesMap] - 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 an array of instructions to create missing ATAs if needed and the withdraw instructions
    */
   async withdrawFromVaultIxs(
     user: PublicKey,
     vault: KaminoVault,
     shareAmount: Decimal,
     slot: number
-  ): Promise<TransactionInstruction[]> {
+  ): Promise<WithdrawIxs> {
     return this._vaultClient.withdrawIxs(user, vault, shareAmount, slot);
   }
 
@@ -395,20 +429,22 @@ export class KaminoManager {
    * This method withdraws all the pending fees from the vault to the owner's token ATA
    * @param vault - vault for which the admin withdraws the pending fees
    * @param slot - current slot, used to estimate the interest earned in the different reserves with allocation from the vault
-   * @returns - list of instructions to withdraw all pending fees
+   * @param [vaultReservesMap] - a 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 - list of instructions to withdraw all pending fees, including the ATA creation instructions if needed
    */
   async withdrawPendingFeesIxs(vault: KaminoVault, slot: number): Promise<TransactionInstruction[]> {
     return this._vaultClient.withdrawPendingFeesIxs(vault, slot);
   }
 
   /**
-   * This method append the given keys to the lookup table
-   * @param payer - the owner of the lookup table
-   * @param slot - the LUT into which the keys will be inserted
-   * @param keys - the keys to be inserted
-   * @returns - list of instructions to insert the keys into the lookup table
+   * This method inserts the missing keys from the provided keys into an existent lookup table
+   * @param payer - payer wallet pubkey
+   * @param lookupTable - lookup table to insert the keys into
+   * @param keys - keys to insert into the lookup table
+   * @param [accountsInLUT] - the existent accounts in the lookup table. Optional. If provided, the function will not fetch the accounts in the lookup table
+   * @returns - an array of instructions to insert the missing keys into the lookup table
    */
-  async insertIntoLUT(payer: PublicKey, lut: PublicKey, keys: PublicKey[]): Promise<TransactionInstruction[]> {
+  async insertIntoLUTIxs(payer: PublicKey, lut: PublicKey, keys: PublicKey[]): Promise<TransactionInstruction[]> {
     return this._vaultClient.insertIntoLookupTableIxs(payer, lut, keys);
   }
 
@@ -416,13 +452,14 @@ export class KaminoManager {
    * Sync a vault for lookup table; create and set the LUT for the vault if needed and fill it with all the needed accounts
    * @param vault the vault to sync and set the LUT for if needed
    * @param vaultReserves optional; the state of the reserves in the vault allocation
+   * @param [vaultReservesMap] - optional parameter; a 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 that contains a list of ix to create the LUT and assign it to the vault if needed + a list of ixs to insert all the accounts in the LUT
    */
-  async syncVaultLUT(
+  async syncVaultLUTIxs(
     vault: KaminoVault,
     vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>
   ): Promise<SyncVaultLUTIxs> {
-    return this._vaultClient.syncVaultLookupTable(vault, vaultReserves);
+    return this._vaultClient.syncVaultLookupTableIxs(vault, vaultReserves);
   }
 
   /**
@@ -451,9 +488,9 @@ export class KaminoManager {
    * This method returns the user shares balance for a given vault
    * @param user - user to calculate the shares balance for
    * @param vault - vault to calculate shares balance for
-   * @returns - user share balance in decimal (not lamports)
+   * @returns - a struct of user share balance (staked in vault farm if the vault has a farm and unstaked) in decimal (not lamports)
    */
-  async getUserSharesBalanceSingleVault(user: PublicKey, vault: KaminoVault): Promise<Decimal> {
+  async getUserSharesBalanceSingleVault(user: PublicKey, vault: KaminoVault): Promise<UserSharesForVault> {
     return this._vaultClient.getUserSharesBalanceSingleVault(user, vault);
   }
 
@@ -466,7 +503,7 @@ export class KaminoManager {
   async getUserSharesBalanceAllVaults(
     user: PublicKey,
     vaultsOverride?: KaminoVault[]
-  ): Promise<PubkeyHashMap<PublicKey, Decimal>> {
+  ): Promise<PubkeyHashMap<PublicKey, UserSharesForVault>> {
     return this._vaultClient.getUserSharesBalanceAllVaults(user, vaultsOverride);
   }
 
@@ -707,26 +744,30 @@ export class KaminoManager {
    * Simulate the current holdings of the vault and the earned interest
    * @param vaultState the kamino vault state to get simulated holdings and earnings for
    * @param vaultReserves optional; the state of the reserves in the vault allocation
+   * @param [currentSlot] - the current slot. Optional. If not provided it will fetch the current slot
    * @returns a struct of simulated vault holdings and earned interest
    */
   async calculateSimulatedHoldingsWithInterest(
     vaultState: VaultState,
-    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>,
+    currentSlot?: number
   ): Promise<SimulatedVaultHoldingsWithEarnedInterest> {
-    return this._vaultClient.calculateSimulatedHoldingsWithInterest(vaultState, vaultReserves);
+    return this._vaultClient.calculateSimulatedHoldingsWithInterest(vaultState, vaultReserves, currentSlot);
   }
 
   /**
    * Simulate the current holdings and compute the fees that would be charged
    * @param vaultState the kamino vault state to get simulated fees for
    * @param simulatedCurrentHoldingsWithInterest optional; the simulated holdings and interest earned by the vault
+   * @param [currentTimestamp] the current timestamp. Optional. If not provided it will fetch the current unix timestamp
    * @returns a struct of simulated management and interest fees
    */
   async calculateSimulatedFees(
     vaultState: VaultState,
-    simulatedCurrentHoldingsWithInterest?: SimulatedVaultHoldingsWithEarnedInterest
+    simulatedCurrentHoldingsWithInterest?: SimulatedVaultHoldingsWithEarnedInterest,
+    currentTimestamp?: number
   ): Promise<VaultFees> {
-    return this._vaultClient.calculateSimulatedFees(vaultState, simulatedCurrentHoldingsWithInterest);
+    return this._vaultClient.calculateSimulatedFees(vaultState, simulatedCurrentHoldingsWithInterest, currentTimestamp);
   }
 
   /**
@@ -777,16 +818,19 @@ export class KaminoManager {
 
   /**
    * This will trigger invest by balancing, based on weights, the reserve allocation of the vault. It can either withdraw or deposit into the given reserve to balance it
-   * @param kaminoVault - vault to invest from
+   * @param payer wallet pubkey
+   * @param vault - vault to invest from
    * @param reserve - reserve to invest into or disinvest from
+   * @param [vaultReservesMap] - 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 - an array of invest instructions for each invest action required for the vault reserves
    */
   async investSingleReserve(
     payer: PublicKey,
     kaminoVault: KaminoVault,
-    reserveWithAddress: ReserveWithAddress
+    reserveWithAddress: ReserveWithAddress,
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>
   ): Promise<TransactionInstruction[]> {
-    return this._vaultClient.investSingleReserveIxs(payer, kaminoVault, reserveWithAddress);
+    return this._vaultClient.investSingleReserveIxs(payer, kaminoVault, reserveWithAddress, vaultReservesMap);
   }
 
   /**

package/src/classes/types.ts

@@ -1,4 +1,5 @@
 import { TransactionInstruction } from '@solana/web3.js';
+import Decimal from 'decimal.js/decimal';
 
 /** the populateLUTIxs should be executed in a separate transaction as we cannot create and populate a lookup table in the same tx */
 export type InitVaultIxs = {
@@ -21,7 +22,24 @@ export type UpdateVaultConfigIxs = {
   updateLUTIxs: TransactionInstruction[];
 };
 
+/** If there are ixs to setup the LUT it means it doesn't already exist and it needs to be created in a separate tx before inserting into it */
 export type SyncVaultLUTIxs = {
   setupLUTIfNeededIxs: TransactionInstruction[];
   syncLUTIxs: TransactionInstruction[];
 };
+
+export type DepositIxs = {
+  depositIxs: TransactionInstruction[];
+  stakeInFarmIfNeededIxs: TransactionInstruction[];
+};
+
+export type WithdrawIxs = {
+  unstakeFromFarmIfNeededIxs: TransactionInstruction[];
+  withdrawIxs: TransactionInstruction[];
+};
+
+/** The shares an user has in a vault (staked and unstaked), in tokens */
+export type UserSharesForVault = {
+  unstakedShares: Decimal;
+  stakedShares: Decimal;
+};

package/src/classes/utils.ts

@@ -240,3 +240,13 @@ export function getTokenBalanceFromAccountInfoLamports(accountInfo: AccountInfo<
 export function bpsToPct(bps: Decimal): Decimal {
   return bps.div(100);
 }
+
+/**
+ * Truncate ( not round ) number to keep up to max amount of decimals
+ * @param num
+ * @param maxDecimals
+ */
+export function truncateDecimals(num: Decimal.Value, maxDecimals: number): Decimal {
+  const factor = new Decimal(10).pow(maxDecimals);
+  return new Decimal(num).times(factor).floor().dividedBy(factor);
+}