@kamino-finance/klend-sdk 5.0.3 → 5.0.5

package/src/idl_codegen_kamino_vault/accounts/VaultState.ts

@@ -1,121 +1,179 @@
-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;
-  sharesMint: PublicKey;
-  sharesMintDecimals: BN;
-  tokenAvailable: BN;
-  sharesIssued: BN;
-  performanceFeeBps: BN;
-  managementFeeBps: BN;
-  pendingFees: BN;
-  lastFeeChargeSlot: BN;
-  prevAum: BN;
-  vaultAllocationStrategy: Array<types.VaultAllocationFields>;
-  padding: 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
+  padding1: BN
+  padding2: Array<BN>
 }
 
 export interface VaultStateJSON {
-  adminAuthority: string;
-  baseVaultAuthority: string;
-  baseVaultAuthorityBump: string;
-  tokenMint: string;
-  tokenMintDecimals: string;
-  tokenVault: string;
-  sharesMint: string;
-  sharesMintDecimals: string;
-  tokenAvailable: string;
-  sharesIssued: string;
-  performanceFeeBps: string;
-  managementFeeBps: string;
-  pendingFees: string;
-  lastFeeChargeSlot: string;
-  prevAum: string;
-  vaultAllocationStrategy: Array<types.VaultAllocationJSON>;
-  padding: 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
+  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 sharesMint: PublicKey;
-  readonly sharesMintDecimals: BN;
-  readonly tokenAvailable: BN;
-  readonly sharesIssued: BN;
-  readonly performanceFeeBps: BN;
-  readonly managementFeeBps: BN;
-  readonly pendingFees: BN;
-  readonly lastFeeChargeSlot: BN;
-  readonly prevAum: BN;
-  readonly vaultAllocationStrategy: Array<types.VaultAllocation>;
-  readonly padding: Array<BN>;
-
-  static readonly discriminator = Buffer.from([228, 196, 82, 165, 98, 210, 235, 152]);
+  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>
+
+  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('sharesMint'),
-    borsh.u64('sharesMintDecimals'),
-    borsh.u64('tokenAvailable'),
-    borsh.u64('sharesIssued'),
-    borsh.u64('performanceFeeBps'),
-    borsh.u64('managementFeeBps'),
-    borsh.u64('pendingFees'),
-    borsh.u64('lastFeeChargeSlot'),
-    borsh.u64('prevAum'),
-    borsh.array(types.VaultAllocation.layout(), 10, 'vaultAllocationStrategy'),
-    borsh.array(borsh.u128(), 256, 'padding'),
-  ]);
+    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"),
+  ])
 
   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.sharesMint = fields.sharesMint;
-    this.sharesMintDecimals = fields.sharesMintDecimals;
-    this.tokenAvailable = fields.tokenAvailable;
-    this.sharesIssued = fields.sharesIssued;
-    this.performanceFeeBps = fields.performanceFeeBps;
-    this.managementFeeBps = fields.managementFeeBps;
-    this.pendingFees = fields.pendingFees;
-    this.lastFeeChargeSlot = fields.lastFeeChargeSlot;
-    this.prevAum = fields.prevAum;
-    this.vaultAllocationStrategy = fields.vaultAllocationStrategy.map((item) => new types.VaultAllocation({ ...item }));
-    this.padding = fields.padding;
+    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
   }
 
-  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(
@@ -123,26 +181,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');
+      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,
@@ -151,21 +209,32 @@ export class VaultState {
       tokenMint: dec.tokenMint,
       tokenMintDecimals: dec.tokenMintDecimals,
       tokenVault: dec.tokenVault,
+      tokenProgram: dec.tokenProgram,
       sharesMint: dec.sharesMint,
       sharesMintDecimals: dec.sharesMintDecimals,
       tokenAvailable: dec.tokenAvailable,
       sharesIssued: dec.sharesIssued,
+      availableCrankFunds: dec.availableCrankFunds,
+      padding0: dec.padding0,
       performanceFeeBps: dec.performanceFeeBps,
       managementFeeBps: dec.managementFeeBps,
-      pendingFees: dec.pendingFees,
-      lastFeeChargeSlot: dec.lastFeeChargeSlot,
-      prevAum: dec.prevAum,
+      lastFeeChargeTimestamp: dec.lastFeeChargeTimestamp,
+      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)
       ),
-      padding: dec.padding,
-    });
+      minDepositAmount: dec.minDepositAmount,
+      minWithdrawAmount: dec.minWithdrawAmount,
+      minInvestAmount: dec.minInvestAmount,
+      minInvestDelaySlots: dec.minInvestDelaySlots,
+      crankFundFeePerReserve: dec.crankFundFeePerReserve,
+      pendingAdmin: dec.pendingAdmin,
+      padding1: dec.padding1,
+      padding2: dec.padding2,
+    })
   }
 
   toJSON(): VaultStateJSON {
@@ -176,18 +245,30 @@ export class VaultState {
       tokenMint: this.tokenMint.toString(),
       tokenMintDecimals: this.tokenMintDecimals.toString(),
       tokenVault: this.tokenVault.toString(),
+      tokenProgram: this.tokenProgram.toString(),
       sharesMint: this.sharesMint.toString(),
       sharesMintDecimals: this.sharesMintDecimals.toString(),
       tokenAvailable: this.tokenAvailable.toString(),
       sharesIssued: this.sharesIssued.toString(),
+      availableCrankFunds: this.availableCrankFunds.toString(),
+      padding0: this.padding0.toString(),
       performanceFeeBps: this.performanceFeeBps.toString(),
       managementFeeBps: this.managementFeeBps.toString(),
-      pendingFees: this.pendingFees.toString(),
-      lastFeeChargeSlot: this.lastFeeChargeSlot.toString(),
-      prevAum: this.prevAum.toString(),
-      vaultAllocationStrategy: this.vaultAllocationStrategy.map((item) => item.toJSON()),
-      padding: this.padding.map((item) => item.toString()),
-    };
+      lastFeeChargeTimestamp: this.lastFeeChargeTimestamp.toString(),
+      prevAumSf: this.prevAumSf.toString(),
+      pendingFeesSf: this.pendingFeesSf.toString(),
+      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(),
+      padding1: this.padding1.toString(),
+      padding2: this.padding2.map((item) => item.toString()),
+    }
   }
 
   static fromJSON(obj: VaultStateJSON): VaultState {
@@ -198,17 +279,29 @@ export class VaultState {
       tokenMint: new PublicKey(obj.tokenMint),
       tokenMintDecimals: new BN(obj.tokenMintDecimals),
       tokenVault: new PublicKey(obj.tokenVault),
+      tokenProgram: new PublicKey(obj.tokenProgram),
       sharesMint: new PublicKey(obj.sharesMint),
       sharesMintDecimals: new BN(obj.sharesMintDecimals),
       tokenAvailable: new BN(obj.tokenAvailable),
       sharesIssued: new BN(obj.sharesIssued),
+      availableCrankFunds: new BN(obj.availableCrankFunds),
+      padding0: new BN(obj.padding0),
       performanceFeeBps: new BN(obj.performanceFeeBps),
       managementFeeBps: new BN(obj.managementFeeBps),
-      pendingFees: new BN(obj.pendingFees),
-      lastFeeChargeSlot: new BN(obj.lastFeeChargeSlot),
-      prevAum: new BN(obj.prevAum),
-      vaultAllocationStrategy: obj.vaultAllocationStrategy.map((item) => types.VaultAllocation.fromJSON(item)),
-      padding: obj.padding.map((item) => new BN(item)),
-    });
+      lastFeeChargeTimestamp: new BN(obj.lastFeeChargeTimestamp),
+      prevAumSf: new BN(obj.prevAumSf),
+      pendingFeesSf: new BN(obj.pendingFeesSf),
+      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),
+      padding1: new BN(obj.padding1),
+      padding2: obj.padding2.map((item) => new BN(item)),
+    })
   }
 }

package/src/idl_codegen_kamino_vault/accounts/index.ts

@@ -1,4 +1,4 @@
-export { Reserve } from './Reserve';
-export type { ReserveFields, ReserveJSON } from './Reserve';
-export { VaultState } from './VaultState';
-export type { VaultStateFields, VaultStateJSON } from './VaultState';
+export { Reserve } from "./Reserve"
+export type { ReserveFields, ReserveJSON } from "./Reserve"
+export { VaultState } from "./VaultState"
+export type { VaultStateFields, VaultStateJSON } from "./VaultState"