@kamino-finance/klend-sdk 5.3.0 → 5.4.1

package/dist/utils/rpc.js

@@ -8,19 +8,21 @@ exports.getAccountOwner = getAccountOwner;
 const web3_js_1 = require("@solana/web3.js");
 const buffer_1 = require("buffer");
 const axios_1 = __importDefault(require("axios"));
-const zstd_wasm_1 = require("@bokuweb/zstd-wasm");
 const uuid_1 = require("uuid");
+const zstddec_1 = require("zstddec");
+const decoder = new zstddec_1.ZSTDDecoder();
 (async () => {
-    await (0, zstd_wasm_1.init)();
+    await decoder.init();
 })();
 /**
  * Uses zstd compression when fetching all accounts owned by a program for a smaller response size
  * Uses axios instead of node-fetch to work around a bug in node-fetch that causes subsequent requests with different encoding to fail
  * @param connection
  * @param programId
+ * @param structSize - the size of the decompressed account data struct
  * @param configOrCommitment
  */
-async function getProgramAccounts(connection, programId, configOrCommitment) {
+async function getProgramAccounts(connection, programId, structSize, configOrCommitment) {
     const programIdStr = programId.toBase58();
     const { commitment, config } = extractCommitmentFromConfig(configOrCommitment);
     const { encoding: _encoding, ...configWithoutEncoding } = config || {};
@@ -52,7 +54,7 @@ async function getProgramAccounts(connection, programId, configOrCommitment) {
     }
     const res = unsafeRes;
     const deser = res.result.map(async (account) => ({
-        account: await deserializeAccountInfo(account.account),
+        account: await deserializeAccountInfo(account.account, structSize),
         pubkey: new web3_js_1.PublicKey(account.pubkey),
     }));
     const x = await Promise.all(deser);
@@ -65,8 +67,8 @@ async function getAccountOwner(connection, address) {
     }
     return acc.owner;
 }
-async function deserializeAccountInfo(accountInfo) {
-    const data = (0, zstd_wasm_1.decompress)(buffer_1.Buffer.from(accountInfo.data[0], 'base64'));
+async function deserializeAccountInfo(accountInfo, size) {
+    const data = decoder.decode(buffer_1.Buffer.from(accountInfo.data[0], 'base64'), size);
     return {
         owner: accountInfo.owner,
         lamports: accountInfo.lamports,

package/dist/utils/rpc.js.map

@@ -1 +1 @@
-{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/utils/rpc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"rpc.js","sourceRoot":"","sources":["../../src/utils/rpc.ts"],"names":[],"mappings":";;;;;AA2BA,gDAgDC;AAED,0CAMC;AAnFD,6CAQyB;AACzB,mCAAgC;AAChC,kDAA0B;AAC1B,+BAAoC;AACpC,qCAAsC;AAEtC,MAAM,OAAO,GAAG,IAAI,qBAAW,EAAE,CAAC;AAClC,CAAC,KAAK,IAAI,EAAE;IACV,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC,CAAC,EAAE,CAAC;AAEL;;;;;;;GAOG;AACI,KAAK,UAAU,kBAAkB,CACtC,UAAsB,EACtB,SAAoB,EACpB,UAAkB,EAClB,kBAA0D;IAE1D,MAAM,YAAY,GAAG,SAAS,CAAC,QAAQ,EAAE,CAAC;IAC1C,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,2BAA2B,CAAC,kBAAkB,CAAC,CAAC;IAC/E,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,qBAAqB,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;IACvE,oHAAoH;IACpH,uDAAuD;IACvD,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAC/B,UAAU,CAAC,WAAW,EACtB;QACE,MAAM,EAAE,oBAAoB;QAC5B,OAAO,EAAE,KAAK;QACd,MAAM,EAAE;YACN,YAAY;YACZ;gBACE,QAAQ,EAAE,aAAa;gBACvB,UAAU;gBACV,GAAG,qBAAqB;aACzB;SACF;QACD,EAAE,EAAE,IAAA,SAAM,GAAE;KACb,EACD;QACE,OAAO,EAAE;YACP,MAAM,EAAE,kBAAkB;YAC1B,cAAc,EAAE,kBAAkB;YAClC,iBAAiB,EAAE,eAAe;YAClC,eAAe,EAAE,UAAU;SAC5B;KACF,CACF,CAAC;IAEF,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC;IAChC,IAAI,OAAO,IAAI,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,4BAAkB,CAAC,SAAS,CAAC,KAAK,EAAE,4CAA4C,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAC9G,CAAC;IAED,MAAM,GAAG,GAAG,SAAsB,CAAC;IACnC,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAC/C,OAAO,EAAE,MAAM,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC;QAClE,MAAM,EAAE,IAAI,mBAAS,CAAC,OAAO,CAAC,MAAM,CAAC;KACtC,CAAC,CAAC,CAAC;IACJ,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnC,OAAO,CAA+B,CAAC;AACzC,CAAC;AAEM,KAAK,UAAU,eAAe,CAAC,UAAsB,EAAE,OAAkB;IAC9E,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IACrD,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAChB,MAAM,KAAK,CAAC,wBAAwB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,GAAG,CAAC,KAAK,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,sBAAsB,CAAC,WAAkC,EAAE,IAAY;IACpF,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,eAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IAC9E,OAAO;QACL,KAAK,EAAE,WAAW,CAAC,KAAK;QACxB,QAAQ,EAAE,WAAW,CAAC,QAAQ;QAC9B,UAAU,EAAE,WAAW,CAAC,UAAU;QAClC,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,IAAI,EAAE,eAAM,CAAC,IAAI,CAAC,IAAI,CAAC;KACxB,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAClC,kBAAyE;IAEzE,IAAI,UAAkC,CAAC;IACvC,IAAI,MAA+C,CAAC;IACpD,IAAI,OAAO,kBAAkB,KAAK,QAAQ,EAAE,CAAC;QAC3C,UAAU,GAAG,kBAAkB,CAAC;IAClC,CAAC;SAAM,IAAI,kBAAkB,EAAE,CAAC;QAC9B,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,GAAG,eAAe,EAAE,GAAG,kBAAkB,CAAC;QACnF,UAAU,GAAG,mBAAmB,CAAC;QACjC,MAAM,GAAG,eAAe,CAAC;IAC3B,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AAChC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/klend-sdk",
-  "version": "5.3.0",
+  "version": "5.4.1",
   "description": "Typescript SDK for interacting with the Kamino Lending (klend) protocol",
   "repository": {
     "type": "git",
@@ -29,6 +29,7 @@
     "docs": "typedoc",
     "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",
     "watch": "tsc --watch",
     "coverage": "jest --coverage",
@@ -43,10 +44,11 @@
     "start-validator": "solana-test-validator $(./deps/test-validator-params.sh)",
     "start-validator-and-test": "yarn start-server-and-test 'yarn start-validator' http://127.0.0.1:8899/health test",
     "dump-programs": "./deps/dump-from-mainnet.sh",
-    "kamino-manager": "tsx src/client_kamino_manager.ts"
+    "kamino-manager": "tsx src/client_kamino_manager.ts",
+    "dev": "concurrently \"yarn build:watch\" \"nodemon --watch dist -e js,ts --exec 'yarn dev:push-and-update'\"",
+    "dev:push-and-update": "yalc publish && cd examples && yalc update"
   },
   "dependencies": {
-    "@bokuweb/zstd-wasm": "^0.0.20",
     "@coral-xyz/anchor": "^0.28.0",
     "@coral-xyz/borsh": "^0.28.0",
     "@kamino-finance/farms-sdk": "^2.0.3",
@@ -64,7 +66,8 @@
     "commander": "^9.3.0",
     "decimal.js": "^10.4.3",
     "exponential-backoff": "^3.1.1",
-    "uuid": "^10.0.0"
+    "uuid": "^10.0.0",
+    "zstddec": "^0.1.0"
   },
   "devDependencies": {
     "@orca-so/sdk": "^1.2.25",
@@ -81,6 +84,7 @@
     "anchor-client-gen": "^0.28.1",
     "chai": "^4.3.7",
     "chai-bignumber": "^3.1.0",
+    "concurrently": "^9.1.0",
     "eslint": "^8.4.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-airbnb-typescript": "^16.1.0",
@@ -90,6 +94,7 @@
     "jest": "^27.4.3",
     "jest-fetch-mock": "^3.0.3",
     "mocha": "^10.2.0",
+    "nodemon": "^3.1.7",
     "prettier": "^2.8.8",
     "start-server-and-test": "^2.0.0",
     "ts-jest": "^28.0.7",

package/src/classes/action.ts

@@ -58,6 +58,7 @@ import {
   getAssociatedTokenAddress,
   ScopeRefresh,
   createAtasIdempotent,
+  POSITION_LIMIT,
 } from '../utils';
 import { KaminoMarket } from './market';
 import { KaminoObligation } from './obligation';
@@ -69,10 +70,6 @@ import { VanillaObligation } from '../utils/ObligationType';
 import { PROGRAM_ID } from '../lib';
 import { U16_MAX } from '@kamino-finance/scope-sdk';
 
-export const POSITION_LIMIT = 10;
-export const BORROWS_LIMIT = 5;
-export const DEPOSITS_LIMIT = 8;
-
 const SOL_PADDING_FOR_INTEREST = new BN('1000000');
 
 export type ActionType =

package/src/classes/manager.ts

@@ -17,6 +17,8 @@ import {
   MarketOverview,
   ReserveAllocationConfig,
   ReserveOverview,
+  SimulatedVaultHoldingsWithEarnedInterest,
+  VaultFees,
   VaultFeesPct,
   VaultHolder,
   VaultHoldings,
@@ -495,20 +497,18 @@ export class KaminoManager {
 
   /**
    * Get all vaults
-   * @param useOptimisedRPCCall - if set to true, it will use the optimized getProgramAccounts RPC call, which is more efficient but doesn't work in web environments
    * @returns an array of all vaults
    */
-  async getAllVaults(useOptimisedRPCCall: boolean = true): Promise<KaminoVault[]> {
-    return this._vaultClient.getAllVaults(useOptimisedRPCCall);
+  async getAllVaults(): Promise<KaminoVault[]> {
+    return this._vaultClient.getAllVaults();
   }
 
   /**
    * Get all vaults for owner
    * @param owner the pubkey of the vaults owner
-   * @param useOptimisedRPCCall - if set to true, it will use the optimized getProgramAccounts RPC call, which is more efficient but doesn't work in web environments
    * @returns an array of all vaults owned by a given pubkey
    */
-  async getAllVaultsForOwner(owner: PublicKey, useOptimisedRPCCall: boolean = true): Promise<KaminoVault[]> {
+  async getAllVaultsForOwner(owner: PublicKey): Promise<KaminoVault[]> {
     const filters = [
       {
         dataSize: VaultState.layout.span + 8,
@@ -527,16 +527,15 @@ export class KaminoManager {
       },
     ];
 
-    let kaminoVaults: GetProgramAccountsResponse = [];
-
-    if (useOptimisedRPCCall) {
-      kaminoVaults = await getProgramAccounts(this._connection, this._kaminoVaultProgramId, {
+    const kaminoVaults: GetProgramAccountsResponse = await getProgramAccounts(
+      this._connection,
+      this._kaminoVaultProgramId,
+      VaultState.layout.span + 8,
+      {
         commitment: this._connection.commitment ?? 'processed',
         filters,
-      });
-    } else {
-      kaminoVaults = await this._connection.getProgramAccounts(this._kaminoVaultProgramId, { filters });
-    }
+      }
+    );
 
     return kaminoVaults.map((kaminoVault) => {
       if (kaminoVault.account === null) {
@@ -704,6 +703,32 @@ export class KaminoManager {
     return this._vaultClient.getVaultCumulativeInterest(vaultState);
   }
 
+  /**
+   * 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
+   * @returns a struct of simulated vault holdings and earned interest
+   */
+  async calculateSimulatedHoldingsWithInterest(
+    vaultState: VaultState,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>
+  ): Promise<SimulatedVaultHoldingsWithEarnedInterest> {
+    return this._vaultClient.calculateSimulatedHoldingsWithInterest(vaultState, vaultReserves);
+  }
+
+  /**
+   * 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
+   * @returns a struct of simulated management and interest fees
+   */
+  async calculateSimulatedFees(
+    vaultState: VaultState,
+    simulatedCurrentHoldingsWithInterest?: SimulatedVaultHoldingsWithEarnedInterest
+  ): Promise<VaultFees> {
+    return this._vaultClient.calculateSimulatedFees(vaultState, simulatedCurrentHoldingsWithInterest);
+  }
+
   /**
    * 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

package/src/classes/market.ts

@@ -1,4 +1,4 @@
-import { AccountInfo, Connection, GetProgramAccountsResponse, PublicKey } from '@solana/web3.js';
+import { AccountInfo, Connection, PublicKey } from '@solana/web3.js';
 import { KaminoObligation } from './obligation';
 import { KaminoReserve } from './reserve';
 import { LendingMarket, Obligation, UserMetadata, ReferrerTokenState, Reserve } from '../idl_codegen/accounts';
@@ -21,6 +21,7 @@ import {
   PubkeyHashMap,
   CandidatePrice,
   PublicKeySet,
+  DEPOSITS_LIMIT,
 } from '../utils';
 import base58 from 'bs58';
 import { BN } from '@coral-xyz/anchor';
@@ -531,9 +532,8 @@ export class KaminoMarket {
    * This function will likely require an RPC capable of returning more than the default 100k rows in a single scan
    *
    * @param tag
-   * @param useOptimisedRPCCall - use the optimised RPC call (compressed) to get all obligations
    */
-  async getAllObligationsForMarket(tag?: number, useOptimisedRPCCall: boolean = true): Promise<KaminoObligation[]> {
+  async getAllObligationsForMarket(tag?: number): Promise<KaminoObligation[]> {
     const filters = [
       {
         dataSize: Obligation.layout.span + 8,
@@ -558,26 +558,14 @@ export class KaminoMarket {
     const collateralExchangeRates = new PubkeyHashMap<PublicKey, Decimal>();
     const cumulativeBorrowRates = new PubkeyHashMap<PublicKey, Decimal>();
 
-    let obligations: GetProgramAccountsResponse = [];
-    let slot = 0;
-    const slotPromise = this.connection.getSlot();
-
-    if (useOptimisedRPCCall) {
-      [slot, obligations] = await Promise.all([
-        slotPromise,
-        getProgramAccounts(this.connection, this.programId, {
-          commitment: this.connection.commitment ?? 'processed',
-          filters,
-          dataSlice: { offset: 0, length: ObligationZP.layout.span + 8 }, // truncate the padding
-        }),
-      ]);
-    } else {
-      const obligationsPromise = this.connection.getProgramAccounts(this.programId, {
+    const [slot, obligations] = await Promise.all([
+      this.connection.getSlot(),
+      getProgramAccounts(this.connection, this.programId, ObligationZP.layout.span + 8, {
+        commitment: this.connection.commitment ?? 'processed',
         filters,
         dataSlice: { offset: 0, length: ObligationZP.layout.span + 8 }, // truncate the padding
-      });
-      [slot, obligations] = await Promise.all([slotPromise, obligationsPromise]);
-    }
+      }),
+    ]);
 
     return obligations.map((obligation) => {
       if (obligation.account === null) {
@@ -740,6 +728,70 @@ export class KaminoMarket {
     });
   }
 
+  async getAllObligationsByDepositedReserve(reserve: PublicKey) {
+    const finalObligations: KaminoObligation[] = [];
+    for (let i = 0; i < DEPOSITS_LIMIT; i++) {
+      const [slot, obligations] = await Promise.all([
+        this.connection.getSlot(),
+        this.connection.getProgramAccounts(this.programId, {
+          filters: [
+            {
+              dataSize: Obligation.layout.span + 8,
+            },
+            {
+              memcmp: {
+                offset: 96 + 136 * i,
+                bytes: reserve.toBase58(),
+              },
+            },
+            {
+              memcmp: {
+                offset: 32,
+                bytes: this.address,
+              },
+            },
+          ],
+        }),
+      ]);
+
+      const collateralExchangeRates = new PubkeyHashMap<PublicKey, Decimal>();
+      const cumulativeBorrowRates = new PubkeyHashMap<PublicKey, Decimal>();
+
+      const obligationsBatch = obligations.map((obligation) => {
+        if (obligation.account === null) {
+          throw new Error('Invalid account');
+        }
+        if (!obligation.account.owner.equals(this.programId)) {
+          throw new Error("account doesn't belong to this program");
+        }
+
+        const obligationAccount = Obligation.decode(obligation.account.data);
+
+        if (!obligationAccount) {
+          throw Error('Could not parse obligation.');
+        }
+
+        KaminoObligation.addRatesForObligation(
+          this,
+          obligationAccount,
+          collateralExchangeRates,
+          cumulativeBorrowRates,
+          slot
+        );
+
+        return new KaminoObligation(
+          this,
+          obligation.pubkey,
+          obligationAccount,
+          collateralExchangeRates,
+          cumulativeBorrowRates
+        );
+      });
+      finalObligations.push(...obligationsBatch);
+    }
+    return finalObligations;
+  }
+
   async getAllUserObligations(user: PublicKey) {
     const [currentSlot, obligations] = await Promise.all([
       this.connection.getSlot(),

package/src/classes/vault.ts

@@ -58,7 +58,7 @@ import { withdraw } from '../idl_codegen_kamino_vault/instructions';
 import { PROGRAM_ID } from '../idl_codegen/programId';
 import { DEFAULT_RECENT_SLOT_DURATION_MS, ReserveWithAddress } from './reserve';
 import { Fraction } from './fraction';
-import { createAtasIdempotent, lendingMarketAuthPda, PublicKeySet } from '../utils';
+import { createAtasIdempotent, lendingMarketAuthPda, PublicKeySet, SECONDS_PER_YEAR } from '../utils';
 import bs58 from 'bs58';
 import { getAccountOwner, getProgramAccounts } from '../utils/rpc';
 import {
@@ -69,6 +69,7 @@ import {
   UpdateVaultConfigIxs,
 } from './types';
 import { collToLamportsDecimal } from '@kamino-finance/kliquidity-sdk';
+import { FullBPSDecimal } from '@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters';
 
 export const kaminoVaultId = new PublicKey('kvauTFR8qm1dhniz6pYuBZkuene3Hfrs1VQhVRgCNrr');
 export const kaminoVaultStagingId = new PublicKey('STkvh7ostar39Fwr4uZKASs1RNNuYMFMTsE77FiRsL2');
@@ -1349,16 +1350,14 @@ export class KaminoVaultClient {
    * @param vaultsOverride - a list of vaults to get the tokens per share for; if provided with state it will not fetch the state again
    * @param vaultReservesMap - optional parameter; a hashmap from pubkey to reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
    * @param slot - current slot, used to estimate the interest earned in the different reserves with allocation from the vault
-   * @param useOptimisedRPCCall - if set to true, it will use the optimized getProgramAccounts RPC call, which is more efficient but doesn't work in web environments
    * @returns - token per share value
    */
   async getTokensPerShareAllVaults(
     slot: number,
     vaultsOverride?: Array<KaminoVault>,
-    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>,
-    useOptimisedRPCCall: boolean = true
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>
   ): Promise<PubkeyHashMap<PublicKey, Decimal>> {
-    const vaults = vaultsOverride ? vaultsOverride : await this.getAllVaults(useOptimisedRPCCall);
+    const vaults = vaultsOverride ? vaultsOverride : await this.getAllVaults();
     const vaultTokensPerShare = new PubkeyHashMap<PublicKey, Decimal>();
     for (const vault of vaults) {
       const tokensPerShare = await this.getTokensPerShareSingleVault(vault, slot, vaultReservesMap);
@@ -1370,10 +1369,9 @@ export class KaminoVaultClient {
 
   /**
    * Get all vaults
-   * @param useOptimisedRPCCall - if set to true, it will use the optimized getProgramAccounts RPC call, which is more efficient but doesn't work in web environments
    * @returns an array of all vaults
    */
-  async getAllVaults(useOptimisedRPCCall: boolean = true): Promise<KaminoVault[]> {
+  async getAllVaults(): Promise<KaminoVault[]> {
     const filters = [
       {
         dataSize: VaultState.layout.span + 8,
@@ -1386,16 +1384,15 @@ export class KaminoVaultClient {
       },
     ];
 
-    let kaminoVaults: GetProgramAccountsResponse = [];
-
-    if (useOptimisedRPCCall) {
-      kaminoVaults = await getProgramAccounts(this._connection, this._kaminoVaultProgramId, {
+    const kaminoVaults: GetProgramAccountsResponse = await getProgramAccounts(
+      this._connection,
+      this._kaminoVaultProgramId,
+      VaultState.layout.span + 8,
+      {
         commitment: this._connection.commitment ?? 'processed',
         filters,
-      });
-    } else {
-      kaminoVaults = await this._connection.getProgramAccounts(this._kaminoVaultProgramId, { filters });
-    }
+      }
+    );
 
     return kaminoVaults.map((kaminoVault) => {
       if (kaminoVault.account === null) {
@@ -1926,6 +1923,70 @@ export class KaminoVaultClient {
     const netYieldLamports = new Fraction(vaultState.cumulativeEarnedInterestSf).toDecimal();
     return lamportsToDecimal(netYieldLamports, vaultState.tokenMintDecimals.toString());
   }
+
+  /**
+   * 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
+   * @returns a struct of simulated vault holdings and earned interest
+   */
+  async calculateSimulatedHoldingsWithInterest(
+    vaultState: VaultState,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>
+  ): Promise<SimulatedVaultHoldingsWithEarnedInterest> {
+    const latestUpdateTs = vaultState.lastFeeChargeTimestamp.toNumber();
+    const lastUpdateSlot = latestUpdateTs / this.recentSlotDurationMs;
+
+    const currentSlot = await this._connection.getSlot('confirmed');
+
+    const lastUpdateHoldingsPromise = this.getVaultHoldings(vaultState, lastUpdateSlot, vaultReserves);
+    const currentHoldingsPromise = this.getVaultHoldings(vaultState, currentSlot, vaultReserves);
+    const [lastUpdateHoldings, currentHoldings] = await Promise.all([
+      lastUpdateHoldingsPromise,
+      currentHoldingsPromise,
+    ]);
+
+    const earnedInterest = currentHoldings.total.sub(lastUpdateHoldings.total);
+
+    return {
+      holdings: currentHoldings,
+      earnedInterest: earnedInterest,
+    };
+  }
+
+  /**
+   * 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
+   * @returns a struct of simulated management and interest fees
+   */
+  async calculateSimulatedFees(
+    vaultState: VaultState,
+    simulatedCurrentHoldingsWithInterest?: SimulatedVaultHoldingsWithEarnedInterest
+  ): Promise<VaultFees> {
+    const timestampNow = new Date().getTime();
+    const timestampLastUpdate = vaultState.lastFeeChargeTimestamp.toNumber();
+    const timeElapsed = timestampNow - timestampLastUpdate;
+
+    const simulatedCurrentHoldings = simulatedCurrentHoldingsWithInterest
+      ? simulatedCurrentHoldingsWithInterest
+      : await this.calculateSimulatedHoldingsWithInterest(vaultState);
+
+    const performanceFee = simulatedCurrentHoldings.earnedInterest.mul(
+      new Decimal(vaultState.performanceFeeBps.toString()).div(FullBPSDecimal)
+    );
+
+    const managementFeeFactor = new Decimal(timeElapsed)
+      .mul(new Decimal(vaultState.managementFeeBps.toString()))
+      .div(new Decimal(SECONDS_PER_YEAR));
+    const prevAUM = new Fraction(vaultState.prevAumSf).toDecimal();
+    const mgmtFee = prevAUM.mul(managementFeeFactor);
+
+    return {
+      managementFee: mgmtFee,
+      performanceFee: performanceFee,
+    };
+  }
 } // KaminoVaultClient
 
 export class KaminoVault {
@@ -2046,6 +2107,11 @@ export type VaultHoldings = {
   total: Decimal;
 };
 
+export type SimulatedVaultHoldingsWithEarnedInterest = {
+  holdings: VaultHoldings;
+  earnedInterest: Decimal;
+};
+
 export type VaultHoldingsWithUSDValue = {
   holdings: VaultHoldings;
   availableUSD: Decimal;
@@ -2095,3 +2161,8 @@ export type VaultFeesPct = {
   managementFeePct: Decimal;
   performanceFeePct: Decimal;
 };
+
+export type VaultFees = {
+  managementFee: Decimal;
+  performanceFee: Decimal;
+};

package/src/client_kamino_manager.ts

@@ -922,10 +922,30 @@ async function main() {
     const env = initializeClient(false, false);
     const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
 
-    const allVaults = await kaminoManager.getAllVaults(true);
+    const allVaults = await kaminoManager.getAllVaults();
     console.log('all vaults', allVaults);
   });
 
+  commands
+    .command('get-simulated-interest-and-fees')
+    .requiredOption('--vault <string>', 'Vault address')
+    .action(async ({ vault }) => {
+      const env = initializeClient(false, false);
+
+      const vaultAddress = new PublicKey(vault);
+
+      const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+      const vaultState = await new KaminoVault(vaultAddress, undefined, env.kVaultProgramId).getState(env.connection);
+
+      const simulatedHoldings = await kaminoManager.calculateSimulatedHoldingsWithInterest(vaultState);
+
+      console.log('Simulated holdings with interest', simulatedHoldings);
+
+      const simulatedFees = await kaminoManager.calculateSimulatedFees(vaultState, simulatedHoldings);
+
+      console.log('Simulated fees', simulatedFees);
+    });
+
   commands
     .command('download-lending-market-config')
     .requiredOption('--lending-market <string>', 'Lending Market Address')

package/src/idl_codegen_kamino_vault/accounts/VaultState.ts

@@ -36,6 +36,8 @@ export interface VaultStateFields {
   name: Array<number>
   vaultLookupTable: PublicKey
   vaultFarm: PublicKey
+  creationTimestamp: BN
+  padding1: BN
   padding2: Array<BN>
 }
 
@@ -71,6 +73,8 @@ export interface VaultStateJSON {
   name: Array<number>
   vaultLookupTable: string
   vaultFarm: string
+  creationTimestamp: string
+  padding1: string
   padding2: Array<string>
 }
 
@@ -106,6 +110,8 @@ export class VaultState {
   readonly name: Array<number>
   readonly vaultLookupTable: PublicKey
   readonly vaultFarm: PublicKey
+  readonly creationTimestamp: BN
+  readonly padding1: BN
   readonly padding2: Array<BN>
 
   static readonly discriminator = Buffer.from([
@@ -144,7 +150,9 @@ export class VaultState {
     borsh.array(borsh.u8(), 40, "name"),
     borsh.publicKey("vaultLookupTable"),
     borsh.publicKey("vaultFarm"),
-    borsh.array(borsh.u128(), 245, "padding2"),
+    borsh.u64("creationTimestamp"),
+    borsh.u64("padding1"),
+    borsh.array(borsh.u128(), 244, "padding2"),
   ])
 
   constructor(fields: VaultStateFields) {
@@ -181,6 +189,8 @@ export class VaultState {
     this.name = fields.name
     this.vaultLookupTable = fields.vaultLookupTable
     this.vaultFarm = fields.vaultFarm
+    this.creationTimestamp = fields.creationTimestamp
+    this.padding1 = fields.padding1
     this.padding2 = fields.padding2
   }
 
@@ -263,6 +273,8 @@ export class VaultState {
       name: dec.name,
       vaultLookupTable: dec.vaultLookupTable,
       vaultFarm: dec.vaultFarm,
+      creationTimestamp: dec.creationTimestamp,
+      padding1: dec.padding1,
       padding2: dec.padding2,
     })
   }
@@ -302,6 +314,8 @@ export class VaultState {
       name: this.name,
       vaultLookupTable: this.vaultLookupTable.toString(),
       vaultFarm: this.vaultFarm.toString(),
+      creationTimestamp: this.creationTimestamp.toString(),
+      padding1: this.padding1.toString(),
       padding2: this.padding2.map((item) => item.toString()),
     }
   }
@@ -341,6 +355,8 @@ export class VaultState {
       name: obj.name,
       vaultLookupTable: new PublicKey(obj.vaultLookupTable),
       vaultFarm: new PublicKey(obj.vaultFarm),
+      creationTimestamp: new BN(obj.creationTimestamp),
+      padding1: new BN(obj.padding1),
       padding2: obj.padding2.map((item) => new BN(item)),
     })
   }