@kamino-finance/klend-sdk 5.1.2 → 5.1.4

package/dist/utils/rpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../src/utils/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,UAAU,EACV,UAAU,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,SAAS,EAEV,MAAM,iBAAiB,CAAC;AAUzB;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,kBAAkB,CAAC,EAAE,wBAAwB,GAAG,UAAU,GACzD,OAAO,CAAC,0BAA0B,CAAC,CA2CrC;AAiCD,MAAM,MAAM,MAAM,GAAG,SAAS,QAAQ,CAAC;IACrC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/B,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,EAAE,CAAC"}
+{"version":3,"file":"rpc.d.ts","sourceRoot":"","sources":["../../src/utils/rpc.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,UAAU,EACV,UAAU,EACV,wBAAwB,EACxB,0BAA0B,EAC1B,SAAS,EAEV,MAAM,iBAAiB,CAAC;AAUzB;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,kBAAkB,CAAC,EAAE,wBAAwB,GAAG,UAAU,GACzD,OAAO,CAAC,0BAA0B,CAAC,CA2CrC;AAED,wBAAsB,eAAe,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,CAMpG;AAiCD,MAAM,MAAM,MAAM,GAAG,SAAS,QAAQ,CAAC;IACrC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IAC/B,mDAAmD;IACnD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC,EAAE,CAAC"}

package/dist/utils/rpc.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProgramAccounts = getProgramAccounts;
+exports.getAccountOwner = getAccountOwner;
 const web3_js_1 = require("@solana/web3.js");
 const buffer_1 = require("buffer");
 const axios_1 = __importDefault(require("axios"));
@@ -57,6 +58,13 @@ async function getProgramAccounts(connection, programId, configOrCommitment) {
     const x = await Promise.all(deser);
     return x;
 }
+async function getAccountOwner(connection, address) {
+    const acc = await connection.getAccountInfo(address);
+    if (acc == null) {
+        throw Error(`Could not fetch mint ${address.toString()}`);
+    }
+    return acc.owner;
+}
 async function deserializeAccountInfo(accountInfo) {
     const data = (0, zstd_wasm_1.decompress)(buffer_1.Buffer.from(accountInfo.data[0], 'base64'));
     return {

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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/klend-sdk",
-  "version": "5.1.2",
+  "version": "5.1.4",
   "description": "Typescript SDK for interacting with the Kamino Lending (klend) protocol",
   "repository": {
     "type": "git",

package/src/classes/manager.ts

@@ -1,6 +1,7 @@
 import {
   AccountInfo,
   Connection,
+  GetProgramAccountsResponse,
   Keypair,
   ParsedAccountData,
   PublicKey,
@@ -430,17 +431,20 @@ 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(): Promise<KaminoVault[]> {
-    return this._vaultClient.getAllVaults();
+  async getAllVaults(useOptimisedRPCCall: boolean = true): Promise<KaminoVault[]> {
+    return this._vaultClient.getAllVaults(useOptimisedRPCCall);
   }
 
   /**
    * 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): Promise<KaminoVault[]> {
+  async getAllVaultsForOwner(owner: PublicKey, useOptimisedRPCCall: boolean = true): Promise<KaminoVault[]> {
     const filters = [
       {
         dataSize: VaultState.layout.span + 8,
@@ -459,12 +463,16 @@ export class KaminoManager {
       },
     ];
 
-    const [kaminoVaults] = await Promise.all([
-      getProgramAccounts(this._connection, this._kaminoVaultProgramId, {
+    let kaminoVaults: GetProgramAccountsResponse = [];
+
+    if (useOptimisedRPCCall) {
+      kaminoVaults = await getProgramAccounts(this._connection, this._kaminoVaultProgramId, {
         commitment: this._connection.commitment ?? 'processed',
         filters,
-      }),
-    ]);
+      });
+    } else {
+      kaminoVaults = await this._connection.getProgramAccounts(this._kaminoVaultProgramId, { filters });
+    }
 
     return kaminoVaults.map((kaminoVault) => {
       if (kaminoVault.account === null) {

package/src/classes/market.ts

@@ -1,4 +1,4 @@
-import { AccountInfo, Connection, PublicKey } from '@solana/web3.js';
+import { AccountInfo, Connection, GetProgramAccountsResponse, PublicKey } from '@solana/web3.js';
 import { KaminoObligation } from './obligation';
 import { KaminoReserve } from './reserve';
 import { LendingMarket, Obligation, UserMetadata, ReferrerTokenState, Reserve } from '../idl_codegen/accounts';
@@ -531,8 +531,9 @@ 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): Promise<KaminoObligation[]> {
+  async getAllObligationsForMarket(tag?: number, useOptimisedRPCCall: boolean = true): Promise<KaminoObligation[]> {
     const filters = [
       {
         dataSize: Obligation.layout.span + 8,
@@ -557,14 +558,26 @@ export class KaminoMarket {
     const collateralExchangeRates = new PubkeyHashMap<PublicKey, Decimal>();
     const cumulativeBorrowRates = new PubkeyHashMap<PublicKey, Decimal>();
 
-    const [slot, obligations] = await Promise.all([
-      this.connection.getSlot(),
-      getProgramAccounts(this.connection, this.programId, {
-        commitment: this.connection.commitment ?? 'processed',
+    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, {
         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) {

package/src/classes/vault.ts

@@ -2,11 +2,12 @@ import { BN } from '@coral-xyz/anchor';
 import {
   AccountMeta,
   Connection,
+  GetProgramAccountsResponse,
   Keypair,
   PublicKey,
+  SystemProgram,
   SYSVAR_INSTRUCTIONS_PUBKEY,
   SYSVAR_RENT_PUBKEY,
-  SystemProgram,
   TransactionInstruction,
 } from '@solana/web3.js';
 import { TOKEN_PROGRAM_ID, unpackAccount } from '@solana/spl-token';
@@ -23,8 +24,6 @@ import {
   WRAPPED_SOL_MINT,
 } from '../lib';
 import {
-  // closeVault,
-  // CloseVaultAccounts,
   DepositAccounts,
   DepositArgs,
   giveUpPendingFees,
@@ -51,12 +50,12 @@ import { VaultConfigFieldKind } from '../idl_codegen_kamino_vault/types';
 import { VaultState } from '../idl_codegen_kamino_vault/accounts';
 import Decimal from 'decimal.js';
 import { numberToLamportsDecimal, parseTokenSymbol } from './utils';
-import { deposit } from '../idl_codegen_kamino_vault/instructions/deposit';
-import { withdraw } from '../idl_codegen_kamino_vault/instructions/withdraw';
+import { deposit } from '../idl_codegen_kamino_vault/instructions';
+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 { lendingMarketAuthPda } from '../utils/seeds';
+import { lendingMarketAuthPda } from '../utils';
 import bs58 from 'bs58';
 import { getProgramAccounts } from '../utils/rpc';
 
@@ -390,7 +389,7 @@ export class KaminoVaultClient {
    * @param user - user to deposit
    * @param vault - vault to deposit into
    * @param tokenAmount - token amount to be deposited, in decimals (will be converted in lamports)
-   * @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
+   * @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
    */
   async depositIxs(
@@ -574,7 +573,8 @@ export class KaminoVaultClient {
 
   /**
    * This will trigger invest by balancing, based on weights, the reserve allocations of the vault. It can either withdraw or deposit into reserves to balance them. This is a function that should be cranked
-   * @param kaminoVault - vault to invest from
+   * @param payer wallet that pays the tx
+   * @param vault - vault to invest from
    * @returns - an array of invest instructions for each invest action required for the vault reserves
    */
   async investAllReservesIxs(payer: PublicKey, vault: KaminoVault): Promise<TransactionInstruction[]> {
@@ -596,7 +596,8 @@ export class KaminoVaultClient {
 
   /**
    * 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
    * @returns - an array of invest instructions for each invest action required for the vault reserves
    */
@@ -783,8 +784,8 @@ export class KaminoVaultClient {
     }
     const userSharesAccount = unpackAccount(userSharesAta, userSharesAccountInfo);
 
-    return new Decimal(new Decimal(userSharesAccount.amount.toString()).toNumber()).div(
-      new Decimal(10).pow(vaultState.sharesMintDecimals.toNumber())
+    return new Decimal(userSharesAccount.amount.toString()).div(
+      new Decimal(10).pow(vaultState.sharesMintDecimals.toString())
     );
   }
 
@@ -819,7 +820,7 @@ export class KaminoVaultClient {
         vaultUserShareBalance.set(
           vaults[index].address,
           new Decimal(userShareAtaAccount.lamports).div(
-            new Decimal(10).pow(vaults[index].state!.sharesMintDecimals.toNumber())
+            new Decimal(10).pow(vaults[index].state!.sharesMintDecimals.toString())
           )
         );
       }
@@ -832,7 +833,7 @@ export class KaminoVaultClient {
    * This method calculates the token per shar value. This will always change based on interest earned from the vault, but calculating it requires a bunch of rpc requests. Caching this for a short duration would be optimal
    * @param vault - vault to calculate tokensPerShare for
    * @param slot - current slot, used to estimate the interest earned in the different reserves with allocation from the vault
-   * @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
+   * @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 - token per share value
    */
   async getTokensPerShareSingleVault(
@@ -843,7 +844,7 @@ export class KaminoVaultClient {
     const vaultState = await vault.getState(this._connection);
     const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
 
-    const totalVaultLiquidityAmount = new Decimal(vaultState.tokenAvailable.toString());
+    let totalVaultLiquidityAmount = new Decimal(vaultState.tokenAvailable.toString());
     vaultState.vaultAllocationStrategy.forEach((allocationStrategy) => {
       if (!allocationStrategy.reserve.equals(PublicKey.default)) {
         const reserve = vaultReservesState.get(allocationStrategy.reserve);
@@ -858,70 +859,51 @@ export class KaminoVaultClient {
             .floor()
             .toNumber()
         );
-        const reserveAllocationLiquidityAmount = new Decimal(allocationStrategy.cTokenAllocation.toString()).div(
-          reserveCollExchangeRate
-        );
-        totalVaultLiquidityAmount.add(reserveAllocationLiquidityAmount);
+        if (reserveCollExchangeRate.gt(0)) {
+          const reserveAllocationLiquidityAmount = new Decimal(allocationStrategy.cTokenAllocation.toString()).div(
+            reserveCollExchangeRate
+          );
+          totalVaultLiquidityAmount = totalVaultLiquidityAmount.add(reserveAllocationLiquidityAmount);
+        }
       }
     });
+    if (totalVaultLiquidityAmount.isZero()) {
+      return new Decimal(0);
+    }
 
     return new Decimal(vaultState.sharesIssued.toString()).div(totalVaultLiquidityAmount);
   }
 
   /**
    * This method calculates the token per share value. This will always change based on interest earned from the vault, but calculating it requires a bunch of rpc requests. Caching this for a short duration would be optimal
-   * @param vault - vault to calculate tokensPerShare for
+   * @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>
+    vaultsOverride?: Array<KaminoVault>,
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>,
+    useOptimisedRPCCall: boolean = true
   ): Promise<PubkeyHashMap<PublicKey, Decimal>> {
-    const vaults = vaultsOverride ? vaultsOverride : await this.getAllVaults();
+    const vaults = vaultsOverride ? vaultsOverride : await this.getAllVaults(useOptimisedRPCCall);
     const vaultTokensPerShare = new PubkeyHashMap<PublicKey, Decimal>();
-    vaults.forEach(async (vault) => {
-      const vaultState = vault.state;
-      if (!vaultState) {
-        throw new Error(`Vault ${vault.address.toBase58()} not fetched`);
-      }
-      const reserves = await this.loadVaultReserves(vaultState);
-
-      const totalVaultLiquidityAmount = new Decimal(vaultState.tokenAvailable.toString());
-      vaultState.vaultAllocationStrategy.forEach((allocationStrategy) => {
-        if (!allocationStrategy.reserve.equals(PublicKey.default)) {
-          const reserve = reserves.get(allocationStrategy.reserve);
-          if (reserve === undefined) {
-            throw new Error(`Reserve ${allocationStrategy.reserve.toBase58()} not found`);
-          }
-          const reserveCollExchangeRate = reserve.getEstimatedCollateralExchangeRate(
-            slot,
-            new Fraction(reserve.state.liquidity.absoluteReferralRateSf)
-              .toDecimal()
-              .div(reserve.state.config.protocolTakeRatePct / 100)
-              .floor()
-              .toNumber()
-          );
-          const reserveAllocationLiquidityAmount = new Decimal(allocationStrategy.cTokenAllocation.toString()).div(
-            reserveCollExchangeRate
-          );
-          totalVaultLiquidityAmount.add(reserveAllocationLiquidityAmount);
-        }
-      });
-      vaultTokensPerShare.set(
-        vault.address,
-        new Decimal(vaultState.sharesIssued.toString()).div(totalVaultLiquidityAmount)
-      );
-    });
+    for (const vault of vaults) {
+      const tokensPerShare = await this.getTokensPerShareSingleVault(vault, slot, vaultReservesMap);
+      vaultTokensPerShare.set(vault.address, tokensPerShare);
+    }
 
     return vaultTokensPerShare;
   }
 
   /**
    * 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(): Promise<KaminoVault[]> {
+  async getAllVaults(useOptimisedRPCCall: boolean = true): Promise<KaminoVault[]> {
     const filters = [
       {
         dataSize: VaultState.layout.span + 8,
@@ -934,12 +916,16 @@ export class KaminoVaultClient {
       },
     ];
 
-    const [kaminoVaults] = await Promise.all([
-      getProgramAccounts(this._connection, this._kaminoVaultProgramId, {
+    let kaminoVaults: GetProgramAccountsResponse = [];
+
+    if (useOptimisedRPCCall) {
+      kaminoVaults = await getProgramAccounts(this._connection, this._kaminoVaultProgramId, {
         commitment: this._connection.commitment ?? 'processed',
         filters,
-      }),
-    ]);
+      });
+    } else {
+      kaminoVaults = await this._connection.getProgramAccounts(this._kaminoVaultProgramId, { filters });
+    }
 
     return kaminoVaults.map((kaminoVault) => {
       if (kaminoVault.account === null) {
@@ -997,7 +983,7 @@ export class KaminoVaultClient {
 
   /**
    * This will get the list of all reserve pubkeys that the vault has allocations for
-   * @param vaultState - the vault state to load reserves for
+   * @param vault - the vault state to load reserves for
    * @returns a hashmap from each reserve pubkey to the reserve state
    */
   getAllVaultReserves(vault: VaultState): PublicKey[] {
@@ -1006,7 +992,7 @@ export class KaminoVaultClient {
 
   /**
    * This will get the list of all reserve pubkeys that the vault has allocations for ex
-   * @param vaultState - the vault state to load reserves for
+   * @param vault - the vault state to load reserves for
    * @returns a hashmap from each reserve pubkey to the reserve state
    */
   getVaultReserves(vault: VaultState): PublicKey[] {
@@ -1120,14 +1106,12 @@ export class KaminoVaultClient {
     holdings.investedInReserves.forEach((amount, reserve) => {
       investedInReservesUSD.set(reserve, amount.mul(price));
     });
-    const holdingsWithUSDValue: VaultHoldingsWithUSDValue = {
+    return {
       holdings: holdings,
       availableUSD: holdings.available.mul(price),
       investedUSD: holdings.invested.mul(price),
       investedInReservesUSD: investedInReservesUSD,
     };
-
-    return holdingsWithUSDValue;
   }
 
   /**
@@ -1200,7 +1184,9 @@ export class KaminoVaultClient {
       totalAPY = totalAPY.add(weightedAPY);
       totalWeights = totalWeights.add(weight);
     });
-
+    if (totalWeights.isZero()) {
+      return new Decimal(0);
+    }
     return totalAPY.div(totalWeights);
   }
 } // KaminoVaultClient

package/src/client_kamino_manager.ts

@@ -45,13 +45,13 @@ import Decimal from 'decimal.js';
 import { BN } from '@coral-xyz/anchor';
 import { PythConfiguration, SwitchboardConfiguration } from './idl_codegen_kamino_vault/types';
 import * as fs from 'fs';
-import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { MarketWithAddress } from './utils/managerTypes';
 import {
   ManagementFeeBps,
   PendingVaultAdmin,
   PerformanceFeeBps,
 } from './idl_codegen_kamino_vault/types/VaultConfigField';
+import { getAccountOwner } from './utils/rpc';
 
 dotenv.config({
   path: `.env${process.env.ENV ? '.' + process.env.ENV : ''}`,
@@ -237,10 +237,11 @@ async function main() {
       const multisigPk = multisig ? new PublicKey(multisig) : PublicKey.default;
       const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
 
+      const tokenProgramID = await getAccountOwner(env.connection, tokenMint);
       const kaminoVaultConfig = new KaminoVaultConfig({
         admin: mode === 'multisig' ? multisigPk : env.payer.publicKey,
         tokenMint: tokenMint,
-        tokenMintProgramId: TOKEN_PROGRAM_ID,
+        tokenMintProgramId: tokenProgramID,
         performanceFeeRate: new Decimal(0.0),
         managementFeeRate: new Decimal(0.0),
       });
@@ -500,7 +501,7 @@ async function main() {
     const env = initializeClient(false, false);
     const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
 
-    const allVaults = await kaminoManager.getAllVaults();
+    const allVaults = await kaminoManager.getAllVaults(true);
     console.log('all vaults', allVaults);
   });
 

package/src/utils/rpc.ts

@@ -72,6 +72,14 @@ export async function getProgramAccounts(
   return x as GetProgramAccountsResponse;
 }
 
+export async function getAccountOwner(connection: Connection, address: PublicKey): Promise<PublicKey> {
+  const acc = await connection.getAccountInfo(address);
+  if (acc == null) {
+    throw Error(`Could not fetch mint ${address.toString()}`);
+  }
+  return acc.owner;
+}
+
 async function deserializeAccountInfo(accountInfo: AccountInfo<string[]>): Promise<AccountInfo<Buffer>> {
   const data = decompress(Buffer.from(accountInfo.data[0], 'base64'));
   return {