@kamino-finance/klend-sdk 5.0.7 → 5.1.1

package/src/client.ts

@@ -279,11 +279,7 @@ async function deposit(connection: Connection, wallet: Keypair, token: string, d
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
-  const tx = await buildVersionedTransaction(connection, wallet.publicKey, [
-    ...kaminoAction.setupIxs,
-    ...kaminoAction.lendingIxs,
-    ...kaminoAction.cleanupIxs,
-  ]);
+  const tx = await buildVersionedTransaction(connection, wallet.publicKey, KaminoAction.actionToIxs(kaminoAction));
 
   console.log('Deposit SetupIxns:', kaminoAction.setupIxsLabels);
   console.log('Deposit LendingIxns:', kaminoAction.lendingIxsLabels);
@@ -303,11 +299,7 @@ async function withdraw(connection: Connection, wallet: Keypair, token: string,
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
-  const tx = await buildVersionedTransaction(connection, wallet.publicKey, [
-    ...kaminoAction.setupIxs,
-    ...kaminoAction.lendingIxs,
-    ...kaminoAction.cleanupIxs,
-  ]);
+  const tx = await buildVersionedTransaction(connection, wallet.publicKey, KaminoAction.actionToIxs(kaminoAction));
 
   console.log('Withdraw SetupIxns:', kaminoAction.setupIxsLabels);
   console.log('Withdraw LendingIxns:', kaminoAction.lendingIxsLabels);
@@ -327,11 +319,7 @@ async function borrow(connection: Connection, wallet: Keypair, token: string, bo
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
-  const tx = await buildVersionedTransaction(connection, wallet.publicKey, [
-    ...kaminoAction.setupIxs,
-    ...kaminoAction.lendingIxs,
-    ...kaminoAction.cleanupIxs,
-  ]);
+  const tx = await buildVersionedTransaction(connection, wallet.publicKey, KaminoAction.actionToIxs(kaminoAction));
 
   console.log('Borrow SetupIxns:', kaminoAction.setupIxsLabels);
   console.log('Borrow LendingIxns:', kaminoAction.lendingIxsLabels);
@@ -352,11 +340,7 @@ async function repay(connection: Connection, wallet: Keypair, token: string, bor
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
-  const tx = await buildVersionedTransaction(connection, wallet.publicKey, [
-    ...kaminoAction.setupIxs,
-    ...kaminoAction.lendingIxs,
-    ...kaminoAction.cleanupIxs,
-  ]);
+  const tx = await buildVersionedTransaction(connection, wallet.publicKey, KaminoAction.actionToIxs(kaminoAction));
 
   console.log('Repay SetupIxns:', kaminoAction.setupIxsLabels);
   console.log('Repay LendingIxns:', kaminoAction.lendingIxsLabels);

package/src/client_kamino_manager.ts

@@ -496,6 +496,14 @@ async function main() {
     console.log('oracleConfigs', JSON.parse(JSON.stringify(oracleConfigs)));
   });
 
+  commands.command('get-all-vaults').action(async () => {
+    const env = initializeClient(false, false);
+    const kaminoManager = new KaminoManager(env.connection, env.kLendProgramId, env.kVaultProgramId);
+
+    const allVaults = await kaminoManager.getAllVaults();
+    console.log('all vaults', allVaults);
+  });
+
   commands
     .command('download-lending-market-config')
     .requiredOption('--lending-market <string>', 'Lending Market Address')

package/src/idl_codegen_kamino_vault/accounts/VaultState.ts

@@ -1,179 +1,181 @@
-import { PublicKey, Connection } from "@solana/web3.js"
-import BN from "bn.js" // eslint-disable-line @typescript-eslint/no-unused-vars
-import * as borsh from "@coral-xyz/borsh" // eslint-disable-line @typescript-eslint/no-unused-vars
-import * as types from "../types" // eslint-disable-line @typescript-eslint/no-unused-vars
-import { PROGRAM_ID } from "../programId"
+import { PublicKey, Connection } from '@solana/web3.js';
+import BN from 'bn.js'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as borsh from '@coral-xyz/borsh'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as types from '../types'; // eslint-disable-line @typescript-eslint/no-unused-vars
+import { PROGRAM_ID } from '../programId';
 
 export interface VaultStateFields {
-  adminAuthority: PublicKey
-  baseVaultAuthority: PublicKey
-  baseVaultAuthorityBump: BN
-  tokenMint: PublicKey
-  tokenMintDecimals: BN
-  tokenVault: PublicKey
-  tokenProgram: PublicKey
-  sharesMint: PublicKey
-  sharesMintDecimals: BN
-  tokenAvailable: BN
-  sharesIssued: BN
-  availableCrankFunds: BN
-  padding0: BN
-  performanceFeeBps: BN
-  managementFeeBps: BN
-  lastFeeChargeTimestamp: BN
-  prevAumSf: BN
-  pendingFeesSf: BN
-  vaultAllocationStrategy: Array<types.VaultAllocationFields>
-  minDepositAmount: BN
-  minWithdrawAmount: BN
-  minInvestAmount: BN
-  minInvestDelaySlots: BN
-  crankFundFeePerReserve: BN
-  pendingAdmin: PublicKey
-  padding1: BN
-  padding2: Array<BN>
+  adminAuthority: PublicKey;
+  baseVaultAuthority: PublicKey;
+  baseVaultAuthorityBump: BN;
+  tokenMint: PublicKey;
+  tokenMintDecimals: BN;
+  tokenVault: PublicKey;
+  tokenProgram: PublicKey;
+  sharesMint: PublicKey;
+  sharesMintDecimals: BN;
+  tokenAvailable: BN;
+  sharesIssued: BN;
+  availableCrankFunds: BN;
+  padding0: BN;
+  performanceFeeBps: BN;
+  managementFeeBps: BN;
+  lastFeeChargeTimestamp: BN;
+  prevAumSf: BN;
+  pendingFeesSf: BN;
+  vaultAllocationStrategy: Array<types.VaultAllocationFields>;
+  minDepositAmount: BN;
+  minWithdrawAmount: BN;
+  minInvestAmount: BN;
+  minInvestDelaySlots: BN;
+  crankFundFeePerReserve: BN;
+  pendingAdmin: PublicKey;
+  vaultLookupTable: PublicKey;
+  cumulativeNetEarnedYield: BN;
+  padding1: BN;
+  padding2: Array<BN>;
 }
 
 export interface VaultStateJSON {
-  adminAuthority: string
-  baseVaultAuthority: string
-  baseVaultAuthorityBump: string
-  tokenMint: string
-  tokenMintDecimals: string
-  tokenVault: string
-  tokenProgram: string
-  sharesMint: string
-  sharesMintDecimals: string
-  tokenAvailable: string
-  sharesIssued: string
-  availableCrankFunds: string
-  padding0: string
-  performanceFeeBps: string
-  managementFeeBps: string
-  lastFeeChargeTimestamp: string
-  prevAumSf: string
-  pendingFeesSf: string
-  vaultAllocationStrategy: Array<types.VaultAllocationJSON>
-  minDepositAmount: string
-  minWithdrawAmount: string
-  minInvestAmount: string
-  minInvestDelaySlots: string
-  crankFundFeePerReserve: string
-  pendingAdmin: string
-  padding1: string
-  padding2: Array<string>
+  adminAuthority: string;
+  baseVaultAuthority: string;
+  baseVaultAuthorityBump: string;
+  tokenMint: string;
+  tokenMintDecimals: string;
+  tokenVault: string;
+  tokenProgram: string;
+  sharesMint: string;
+  sharesMintDecimals: string;
+  tokenAvailable: string;
+  sharesIssued: string;
+  availableCrankFunds: string;
+  padding0: string;
+  performanceFeeBps: string;
+  managementFeeBps: string;
+  lastFeeChargeTimestamp: string;
+  prevAumSf: string;
+  pendingFeesSf: string;
+  vaultAllocationStrategy: Array<types.VaultAllocationJSON>;
+  minDepositAmount: string;
+  minWithdrawAmount: string;
+  minInvestAmount: string;
+  minInvestDelaySlots: string;
+  crankFundFeePerReserve: string;
+  pendingAdmin: string;
+  vaultLookupTable: string;
+  cumulativeNetEarnedYield: string;
+  padding1: string;
+  padding2: Array<string>;
 }
 
 export class VaultState {
-  readonly adminAuthority: PublicKey
-  readonly baseVaultAuthority: PublicKey
-  readonly baseVaultAuthorityBump: BN
-  readonly tokenMint: PublicKey
-  readonly tokenMintDecimals: BN
-  readonly tokenVault: PublicKey
-  readonly tokenProgram: PublicKey
-  readonly sharesMint: PublicKey
-  readonly sharesMintDecimals: BN
-  readonly tokenAvailable: BN
-  readonly sharesIssued: BN
-  readonly availableCrankFunds: BN
-  readonly padding0: BN
-  readonly performanceFeeBps: BN
-  readonly managementFeeBps: BN
-  readonly lastFeeChargeTimestamp: BN
-  readonly prevAumSf: BN
-  readonly pendingFeesSf: BN
-  readonly vaultAllocationStrategy: Array<types.VaultAllocation>
-  readonly minDepositAmount: BN
-  readonly minWithdrawAmount: BN
-  readonly minInvestAmount: BN
-  readonly minInvestDelaySlots: BN
-  readonly crankFundFeePerReserve: BN
-  readonly pendingAdmin: PublicKey
-  readonly padding1: BN
-  readonly padding2: Array<BN>
+  readonly adminAuthority: PublicKey;
+  readonly baseVaultAuthority: PublicKey;
+  readonly baseVaultAuthorityBump: BN;
+  readonly tokenMint: PublicKey;
+  readonly tokenMintDecimals: BN;
+  readonly tokenVault: PublicKey;
+  readonly tokenProgram: PublicKey;
+  readonly sharesMint: PublicKey;
+  readonly sharesMintDecimals: BN;
+  readonly tokenAvailable: BN;
+  readonly sharesIssued: BN;
+  readonly availableCrankFunds: BN;
+  readonly padding0: BN;
+  readonly performanceFeeBps: BN;
+  readonly managementFeeBps: BN;
+  readonly lastFeeChargeTimestamp: BN;
+  readonly prevAumSf: BN;
+  readonly pendingFeesSf: BN;
+  readonly vaultAllocationStrategy: Array<types.VaultAllocation>;
+  readonly minDepositAmount: BN;
+  readonly minWithdrawAmount: BN;
+  readonly minInvestAmount: BN;
+  readonly minInvestDelaySlots: BN;
+  readonly crankFundFeePerReserve: BN;
+  readonly pendingAdmin: PublicKey;
+  readonly vaultLookupTable: PublicKey;
+  readonly cumulativeNetEarnedYield: BN;
+  readonly padding1: BN;
+  readonly padding2: Array<BN>;
 
-  static readonly discriminator = Buffer.from([
-    228, 196, 82, 165, 98, 210, 235, 152,
-  ])
+  static readonly discriminator = Buffer.from([228, 196, 82, 165, 98, 210, 235, 152]);
 
   static readonly layout = borsh.struct([
-    borsh.publicKey("adminAuthority"),
-    borsh.publicKey("baseVaultAuthority"),
-    borsh.u64("baseVaultAuthorityBump"),
-    borsh.publicKey("tokenMint"),
-    borsh.u64("tokenMintDecimals"),
-    borsh.publicKey("tokenVault"),
-    borsh.publicKey("tokenProgram"),
-    borsh.publicKey("sharesMint"),
-    borsh.u64("sharesMintDecimals"),
-    borsh.u64("tokenAvailable"),
-    borsh.u64("sharesIssued"),
-    borsh.u64("availableCrankFunds"),
-    borsh.u64("padding0"),
-    borsh.u64("performanceFeeBps"),
-    borsh.u64("managementFeeBps"),
-    borsh.u64("lastFeeChargeTimestamp"),
-    borsh.u128("prevAumSf"),
-    borsh.u128("pendingFeesSf"),
-    borsh.array(types.VaultAllocation.layout(), 10, "vaultAllocationStrategy"),
-    borsh.u64("minDepositAmount"),
-    borsh.u64("minWithdrawAmount"),
-    borsh.u64("minInvestAmount"),
-    borsh.u64("minInvestDelaySlots"),
-    borsh.u64("crankFundFeePerReserve"),
-    borsh.publicKey("pendingAdmin"),
-    borsh.u64("padding1"),
-    borsh.array(borsh.u128(), 254, "padding2"),
-  ])
+    borsh.publicKey('adminAuthority'),
+    borsh.publicKey('baseVaultAuthority'),
+    borsh.u64('baseVaultAuthorityBump'),
+    borsh.publicKey('tokenMint'),
+    borsh.u64('tokenMintDecimals'),
+    borsh.publicKey('tokenVault'),
+    borsh.publicKey('tokenProgram'),
+    borsh.publicKey('sharesMint'),
+    borsh.u64('sharesMintDecimals'),
+    borsh.u64('tokenAvailable'),
+    borsh.u64('sharesIssued'),
+    borsh.u64('availableCrankFunds'),
+    borsh.u64('padding0'),
+    borsh.u64('performanceFeeBps'),
+    borsh.u64('managementFeeBps'),
+    borsh.u64('lastFeeChargeTimestamp'),
+    borsh.u128('prevAumSf'),
+    borsh.u128('pendingFeesSf'),
+    borsh.array(types.VaultAllocation.layout(), 10, 'vaultAllocationStrategy'),
+    borsh.u64('minDepositAmount'),
+    borsh.u64('minWithdrawAmount'),
+    borsh.u64('minInvestAmount'),
+    borsh.u64('minInvestDelaySlots'),
+    borsh.u64('crankFundFeePerReserve'),
+    borsh.publicKey('pendingAdmin'),
+    borsh.publicKey('vaultLookupTable'),
+    borsh.i128('cumulativeNetEarnedYield'),
+    borsh.u64('padding1'),
+    borsh.array(borsh.u128(), 251, 'padding2'),
+  ]);
 
   constructor(fields: VaultStateFields) {
-    this.adminAuthority = fields.adminAuthority
-    this.baseVaultAuthority = fields.baseVaultAuthority
-    this.baseVaultAuthorityBump = fields.baseVaultAuthorityBump
-    this.tokenMint = fields.tokenMint
-    this.tokenMintDecimals = fields.tokenMintDecimals
-    this.tokenVault = fields.tokenVault
-    this.tokenProgram = fields.tokenProgram
-    this.sharesMint = fields.sharesMint
-    this.sharesMintDecimals = fields.sharesMintDecimals
-    this.tokenAvailable = fields.tokenAvailable
-    this.sharesIssued = fields.sharesIssued
-    this.availableCrankFunds = fields.availableCrankFunds
-    this.padding0 = fields.padding0
-    this.performanceFeeBps = fields.performanceFeeBps
-    this.managementFeeBps = fields.managementFeeBps
-    this.lastFeeChargeTimestamp = fields.lastFeeChargeTimestamp
-    this.prevAumSf = fields.prevAumSf
-    this.pendingFeesSf = fields.pendingFeesSf
-    this.vaultAllocationStrategy = fields.vaultAllocationStrategy.map(
-      (item) => new types.VaultAllocation({ ...item })
-    )
-    this.minDepositAmount = fields.minDepositAmount
-    this.minWithdrawAmount = fields.minWithdrawAmount
-    this.minInvestAmount = fields.minInvestAmount
-    this.minInvestDelaySlots = fields.minInvestDelaySlots
-    this.crankFundFeePerReserve = fields.crankFundFeePerReserve
-    this.pendingAdmin = fields.pendingAdmin
-    this.padding1 = fields.padding1
-    this.padding2 = fields.padding2
+    this.adminAuthority = fields.adminAuthority;
+    this.baseVaultAuthority = fields.baseVaultAuthority;
+    this.baseVaultAuthorityBump = fields.baseVaultAuthorityBump;
+    this.tokenMint = fields.tokenMint;
+    this.tokenMintDecimals = fields.tokenMintDecimals;
+    this.tokenVault = fields.tokenVault;
+    this.tokenProgram = fields.tokenProgram;
+    this.sharesMint = fields.sharesMint;
+    this.sharesMintDecimals = fields.sharesMintDecimals;
+    this.tokenAvailable = fields.tokenAvailable;
+    this.sharesIssued = fields.sharesIssued;
+    this.availableCrankFunds = fields.availableCrankFunds;
+    this.padding0 = fields.padding0;
+    this.performanceFeeBps = fields.performanceFeeBps;
+    this.managementFeeBps = fields.managementFeeBps;
+    this.lastFeeChargeTimestamp = fields.lastFeeChargeTimestamp;
+    this.prevAumSf = fields.prevAumSf;
+    this.pendingFeesSf = fields.pendingFeesSf;
+    this.vaultAllocationStrategy = fields.vaultAllocationStrategy.map((item) => new types.VaultAllocation({ ...item }));
+    this.minDepositAmount = fields.minDepositAmount;
+    this.minWithdrawAmount = fields.minWithdrawAmount;
+    this.minInvestAmount = fields.minInvestAmount;
+    this.minInvestDelaySlots = fields.minInvestDelaySlots;
+    this.crankFundFeePerReserve = fields.crankFundFeePerReserve;
+    this.pendingAdmin = fields.pendingAdmin;
+    this.vaultLookupTable = fields.vaultLookupTable;
+    this.cumulativeNetEarnedYield = fields.cumulativeNetEarnedYield;
+    this.padding1 = fields.padding1;
+    this.padding2 = fields.padding2;
   }
 
-  static async fetch(
-    c: Connection,
-    address: PublicKey,
-    programId: PublicKey = PROGRAM_ID
-  ): Promise<VaultState | null> {
-    const info = await c.getAccountInfo(address)
+  static async fetch(c: Connection, address: PublicKey, programId: PublicKey = PROGRAM_ID): Promise<VaultState | null> {
+    const info = await c.getAccountInfo(address);
 
     if (info === null) {
-      return null
+      return null;
     }
     if (!info.owner.equals(programId)) {
-      throw new Error("account doesn't belong to this program")
+      throw new Error("account doesn't belong to this program");
     }
 
-    return this.decode(info.data)
+    return this.decode(info.data);
   }
 
   static async fetchMultiple(
@@ -181,26 +183,26 @@ export class VaultState {
     addresses: PublicKey[],
     programId: PublicKey = PROGRAM_ID
   ): Promise<Array<VaultState | null>> {
-    const infos = await c.getMultipleAccountsInfo(addresses)
+    const infos = await c.getMultipleAccountsInfo(addresses);
 
     return infos.map((info) => {
       if (info === null) {
-        return null
+        return null;
       }
       if (!info.owner.equals(programId)) {
-        throw new Error("account doesn't belong to this program")
+        throw new Error("account doesn't belong to this program");
       }
 
-      return this.decode(info.data)
-    })
+      return this.decode(info.data);
+    });
   }
 
   static decode(data: Buffer): VaultState {
-    if (!data.slice(0, 8).equals(VaultState.discriminator)) {
-      throw new Error("invalid account discriminator")
+    if (!VaultState.discriminator.equals(data.slice(0, 8))) {
+      throw new Error('invalid account discriminator');
     }
 
-    const dec = VaultState.layout.decode(data.slice(8))
+    const dec = VaultState.layout.decode(data.slice(8));
 
     return new VaultState({
       adminAuthority: dec.adminAuthority,
@@ -222,9 +224,8 @@ export class VaultState {
       prevAumSf: dec.prevAumSf,
       pendingFeesSf: dec.pendingFeesSf,
       vaultAllocationStrategy: dec.vaultAllocationStrategy.map(
-        (
-          item: any /* eslint-disable-line @typescript-eslint/no-explicit-any */
-        ) => types.VaultAllocation.fromDecoded(item)
+        (item: any /* eslint-disable-line @typescript-eslint/no-explicit-any */) =>
+          types.VaultAllocation.fromDecoded(item)
       ),
       minDepositAmount: dec.minDepositAmount,
       minWithdrawAmount: dec.minWithdrawAmount,
@@ -232,9 +233,11 @@ export class VaultState {
       minInvestDelaySlots: dec.minInvestDelaySlots,
       crankFundFeePerReserve: dec.crankFundFeePerReserve,
       pendingAdmin: dec.pendingAdmin,
+      vaultLookupTable: dec.vaultLookupTable,
+      cumulativeNetEarnedYield: dec.cumulativeNetEarnedYield,
       padding1: dec.padding1,
       padding2: dec.padding2,
-    })
+    });
   }
 
   toJSON(): VaultStateJSON {
@@ -257,18 +260,18 @@ export class VaultState {
       lastFeeChargeTimestamp: this.lastFeeChargeTimestamp.toString(),
       prevAumSf: this.prevAumSf.toString(),
       pendingFeesSf: this.pendingFeesSf.toString(),
-      vaultAllocationStrategy: this.vaultAllocationStrategy.map((item) =>
-        item.toJSON()
-      ),
+      vaultAllocationStrategy: this.vaultAllocationStrategy.map((item) => item.toJSON()),
       minDepositAmount: this.minDepositAmount.toString(),
       minWithdrawAmount: this.minWithdrawAmount.toString(),
       minInvestAmount: this.minInvestAmount.toString(),
       minInvestDelaySlots: this.minInvestDelaySlots.toString(),
       crankFundFeePerReserve: this.crankFundFeePerReserve.toString(),
       pendingAdmin: this.pendingAdmin.toString(),
+      vaultLookupTable: this.vaultLookupTable.toString(),
+      cumulativeNetEarnedYield: this.cumulativeNetEarnedYield.toString(),
       padding1: this.padding1.toString(),
       padding2: this.padding2.map((item) => item.toString()),
-    }
+    };
   }
 
   static fromJSON(obj: VaultStateJSON): VaultState {
@@ -291,17 +294,17 @@ export class VaultState {
       lastFeeChargeTimestamp: new BN(obj.lastFeeChargeTimestamp),
       prevAumSf: new BN(obj.prevAumSf),
       pendingFeesSf: new BN(obj.pendingFeesSf),
-      vaultAllocationStrategy: obj.vaultAllocationStrategy.map((item) =>
-        types.VaultAllocation.fromJSON(item)
-      ),
+      vaultAllocationStrategy: obj.vaultAllocationStrategy.map((item) => types.VaultAllocation.fromJSON(item)),
       minDepositAmount: new BN(obj.minDepositAmount),
       minWithdrawAmount: new BN(obj.minWithdrawAmount),
       minInvestAmount: new BN(obj.minInvestAmount),
       minInvestDelaySlots: new BN(obj.minInvestDelaySlots),
       crankFundFeePerReserve: new BN(obj.crankFundFeePerReserve),
       pendingAdmin: new PublicKey(obj.pendingAdmin),
+      vaultLookupTable: new PublicKey(obj.vaultLookupTable),
+      cumulativeNetEarnedYield: new BN(obj.cumulativeNetEarnedYield),
       padding1: new BN(obj.padding1),
       padding2: obj.padding2.map((item) => new BN(item)),
-    })
+    });
   }
 }