@kamino-finance/klend-sdk 5.11.3-beta.0 → 5.11.3

package/src/classes/action.ts

@@ -503,6 +503,18 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
+    if (!axn.referrer.equals(PublicKey.default)) {
+      const referrerTokenState = referrerTokenStatePda(
+        axn.referrer,
+        axn.reserve.address,
+        axn.kaminoMarket.programId
+      )[0];
+      const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
+      if (!account) {
+        axn.addInitReferrerTokenStateIx(axn.reserve, referrerTokenState);
+      }
+    }
+
     await axn.addSupportIxs(
       'borrow',
       includeAtaIxns,
@@ -703,6 +715,17 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
+    if (!axn.referrer.equals(PublicKey.default)) {
+      const referrerTokenState = referrerTokenStatePda(
+        axn.referrer,
+        axn.outflowReserve!.address,
+        axn.kaminoMarket.programId
+      )[0];
+      const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
+      if (!account) {
+        axn.addInitReferrerTokenStateIx(axn.outflowReserve!, referrerTokenState);
+      }
+    }
     await axn.addSupportIxs(
       'deposit',
       includeAtaIxns,
@@ -1035,6 +1058,17 @@ export class KaminoAction {
     axn.preTxnIxs.push(...createAtaIxs);
     axn.preTxnIxsLabels.push(`createAtasIxs[${axn.userTokenAccountAddress.toString()}]`);
 
+    if (!axn.referrer.equals(PublicKey.default)) {
+      const referrerTokenState = referrerTokenStatePda(
+        axn.referrer,
+        axn.reserve.address,
+        axn.kaminoMarket.programId
+      )[0];
+      const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
+      if (!account) {
+        axn.addInitReferrerTokenStateIx(axn.reserve, referrerTokenState);
+      }
+    }
     axn.addRefreshReserveIxs([axn.reserve.address]);
     axn.addWithdrawReferrerFeesIxs();
 
@@ -1223,8 +1257,8 @@ export class KaminoAction {
   addDepositIxV2() {
     const farmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
@@ -1291,8 +1325,8 @@ export class KaminoAction {
   addDepositObligationCollateralIxV2() {
     const farmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
@@ -1376,8 +1410,8 @@ export class KaminoAction {
 
     const farmsAccounts = this.reserve.state.farmDebt.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -1451,8 +1485,8 @@ export class KaminoAction {
   async addWithdrawIxV2(collateralAmount: BN) {
     const farmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
@@ -1538,8 +1572,8 @@ export class KaminoAction {
 
     const farmsAccounts = this.reserve.state.farmDebt.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -1659,8 +1693,8 @@ export class KaminoAction {
   async addDepositAndBorrowIxV2() {
     const collateralFarmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
@@ -1723,8 +1757,8 @@ export class KaminoAction {
 
     const debtFarmsAccounts = this.outflowReserve.state.farmDebt.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
@@ -1852,8 +1886,8 @@ export class KaminoAction {
 
     const debtFarmsAccounts = this.reserve.state.farmDebt.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -1900,8 +1934,8 @@ export class KaminoAction {
 
     const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
@@ -2009,8 +2043,8 @@ export class KaminoAction {
 
     const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
@@ -2022,8 +2056,8 @@ export class KaminoAction {
 
     const debtFarmsAccounts = this.reserve.state.farmDebt.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: PROGRAM_ID,
-          reserveFarmState: PROGRAM_ID,
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -2420,13 +2454,6 @@ export class KaminoAction {
         this.addInitUserMetadataIxs(lookupTable);
       }
 
-      if (['borrow', 'withdrawReferrerFees'].includes(action)) {
-        await this.addInitReferrerTokenStateIx(this.reserve);
-      }
-      // depositAndBorrow
-      if (action === 'deposit' && this.outflowReserve) {
-        await this.addInitReferrerTokenStateIx(this.outflowReserve);
-      }
       await this.addInitObligationIxs();
     }
 
@@ -2861,29 +2888,21 @@ export class KaminoAction {
     this.setupIxsLabels.push(`initUserMetadata[${userMetadataAddress.toString()}]`);
   }
 
-  private async addInitReferrerTokenStateIx(reserve: KaminoReserve) {
-    if (this.referrer.equals(PublicKey.default)) {
-      return;
-    }
-
-    const referrerTokenState = referrerTokenStatePda(this.referrer, reserve.address, this.kaminoMarket.programId)[0];
-    const account = await this.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
-    if (!account) {
-      const initReferrerTokenStateIx = initReferrerTokenState(
-        {
-          lendingMarket: this.kaminoMarket.getAddress(),
-          payer: this.owner,
-          reserve: reserve.address,
-          referrer: this.referrer,
-          referrerTokenState,
-          rent: SYSVAR_RENT_PUBKEY,
-          systemProgram: SystemProgram.programId,
-        },
-        this.kaminoMarket.programId
-      );
-      this.setupIxs.unshift(initReferrerTokenStateIx);
-      this.setupIxsLabels.unshift(`InitReferrerTokenState[${referrerTokenState.toString()} res=${reserve.address}]`);
-    }
+  private addInitReferrerTokenStateIx(reserve: KaminoReserve, referrerTokenState: PublicKey) {
+    const initReferrerTokenStateIx = initReferrerTokenState(
+      {
+        lendingMarket: this.kaminoMarket.getAddress(),
+        payer: this.owner,
+        reserve: reserve.address,
+        referrer: this.referrer,
+        referrerTokenState,
+        rent: SYSVAR_RENT_PUBKEY,
+        systemProgram: SystemProgram.programId,
+      },
+      this.kaminoMarket.programId
+    );
+    this.setupIxs.unshift(initReferrerTokenStateIx);
+    this.setupIxsLabels.unshift(`InitReferrerTokenState[${referrerTokenState.toString()} res=${reserve.address}]`);
   }
 
   private addWithdrawReferrerFeesIxs() {

package/src/classes/index.ts

@@ -9,3 +9,4 @@ export * from './jupiterPerps';
 export * from './manager';
 export * from './vault';
 export * from './fraction';
+export * from './types';

package/src/classes/manager.ts

@@ -575,6 +575,37 @@ export class KaminoManager {
     return this._vaultClient.getAllVaults();
   }
 
+  /**
+   * Get all lending markets
+   * @returns an array of all lending markets
+   */
+  async getAllMarkets(): Promise<KaminoMarket[]> {
+    const lendingMarketsAccounts = await getProgramAccounts(
+      this.getConnection(),
+      this._kaminoLendProgramId,
+      LendingMarket.layout.span + 8,
+      {
+        commitment: this.getConnection().commitment ?? 'processed',
+        filters: [
+          { dataSize: LendingMarket.layout.span + 8 },
+          { memcmp: { offset: 0, bytes: bs58.encode(LendingMarket.discriminator) } },
+        ],
+      }
+    );
+
+    const markets = await Promise.all(
+      lendingMarketsAccounts.map((account) =>
+        KaminoMarket.load(
+          this._connection,
+          account.pubkey,
+          this.recentSlotDurationMs,
+          this._kaminoLendProgramId
+        )
+      )
+    );
+    return markets.filter((market): market is KaminoMarket => market !== null);
+  }
+
   /**
    * Get all vaults for owner
    * @param owner the pubkey of the vaults owner

package/src/classes/vault.ts

@@ -293,7 +293,7 @@ export class KaminoVaultClient {
     );
 
     const updateReserveAllocationAccounts: UpdateReserveAllocationAccounts = {
-      signer: vaultState.adminAuthority,
+      signer: vaultState.vaultAdminAuthority,
       vaultState: vault.address,
       baseVaultAuthority: vaultState.baseVaultAuthority,
       reserveCollateralMint: reserveState.collateral.mintPubkey,
@@ -325,7 +325,7 @@ export class KaminoVaultClient {
     accountsToAddToLUT.push(lendingMarketAuth);
 
     const insertIntoLUTIxs = await this.insertIntoLookupTableIxs(
-      vaultState.adminAuthority,
+      vaultState.vaultAdminAuthority,
       vaultState.vaultLookupTable,
       accountsToAddToLUT
     );
@@ -355,12 +355,12 @@ export class KaminoVaultClient {
     const vaultState: VaultState = await vault.getState(this.getConnection());
 
     const updateVaultConfigAccs: UpdateVaultConfigAccounts = {
-      adminAuthority: vaultState.adminAuthority,
+      vaultAdminAuthority: vaultState.vaultAdminAuthority,
       vaultState: vault.address,
       klendProgram: this._kaminoLendProgramId,
     };
     if (signer) {
-      updateVaultConfigAccs.adminAuthority = signer;
+      updateVaultConfigAccs.vaultAdminAuthority = signer;
     }
 
     const updateVaultConfigArgs: UpdateVaultConfigArgs = {
@@ -414,7 +414,7 @@ export class KaminoVaultClient {
     if (mode.kind === new VaultConfigField.PendingVaultAdmin().kind) {
       const newPubkey = new PublicKey(value);
       const insertIntoLutIxs = await this.insertIntoLookupTableIxs(
-        vaultState.adminAuthority,
+        vaultState.vaultAdminAuthority,
         vaultState.vaultLookupTable,
         [newPubkey]
       );
@@ -432,7 +432,7 @@ export class KaminoVaultClient {
           farmState!.globalConfig
         );
         const insertIntoLutIxs = await this.insertIntoLookupTableIxs(
-          vaultState.adminAuthority,
+          vaultState.vaultAdminAuthority,
           vaultState.vaultLookupTable,
           keysToAddToLUT
         );
@@ -481,7 +481,7 @@ export class KaminoVaultClient {
     value: string
   ): TransactionInstruction {
     const updateVaultConfigAccs: UpdateVaultConfigAccounts = {
-      adminAuthority: admin,
+      vaultAdminAuthority: admin,
       vaultState: vault,
       klendProgram: this._kaminoLendProgramId,
     };
@@ -531,7 +531,7 @@ export class KaminoVaultClient {
 
     // read the current LUT and create a new one for the new admin and backfill it
     const accountsInExistentLUT = (await getAccountsInLUT(this.getConnection(), vaultState.vaultLookupTable)).filter(
-      (account) => !account.equals(vaultState.adminAuthority)
+      (account) => !account.equals(vaultState.vaultAdminAuthority)
     );
 
     const LUTIxs: TransactionInstruction[] = [];
@@ -574,7 +574,7 @@ export class KaminoVaultClient {
     const vaultState: VaultState = await vault.getState(this.getConnection());
 
     const giveUpPendingFeesAccounts: GiveUpPendingFeesAccounts = {
-      adminAuthority: vaultState.adminAuthority,
+      vaultAdminAuthority: vaultState.vaultAdminAuthority,
       vaultState: vault.address,
       klendProgram: this._kaminoLendProgramId,
     };
@@ -604,7 +604,7 @@ export class KaminoVaultClient {
   ): Promise<TransactionInstruction[]> {
     const vaultState: VaultState = await vault.getState(this.getConnection());
     const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
-    const [{ ata: adminTokenAta, createAtaIx }] = createAtasIdempotent(vaultState.adminAuthority, [
+    const [{ ata: adminTokenAta, createAtaIx }] = createAtasIdempotent(vaultState.vaultAdminAuthority, [
       {
         mint: vaultState.tokenMint,
         tokenProgram: TOKEN_PROGRAM_ID,
@@ -1295,7 +1295,7 @@ export class KaminoVaultClient {
     const lendingMarketAuth = lendingMarketAuthPda(marketAddress, this._kaminoLendProgramId)[0];
 
     const withdrawPendingFeesAccounts: WithdrawPendingFeesAccounts = {
-      adminAuthority: vaultState.adminAuthority,
+      vaultAdminAuthority: vaultState.vaultAdminAuthority,
       vaultState: vault.address,
       reserve: reserve.address,
       tokenVault: vaultState.tokenVault,
@@ -1355,7 +1355,7 @@ export class KaminoVaultClient {
     const vaultState = await vault.getState(this.getConnection());
     const allAccountsToBeInserted = [
       vault.address,
-      vaultState.adminAuthority,
+      vaultState.vaultAdminAuthority,
       vaultState.baseVaultAuthority,
       vaultState.tokenMint,
       vaultState.tokenVault,
@@ -1400,7 +1400,7 @@ export class KaminoVaultClient {
     let lut = vaultState.vaultLookupTable;
     if (lut.equals(PublicKey.default)) {
       const recentSlot = await this.getConnection().getSlot();
-      const [ixn, address] = initLookupTableIx(vaultState.adminAuthority, recentSlot);
+      const [ixn, address] = initLookupTableIx(vaultState.vaultAdminAuthority, recentSlot);
       setupLUTIfNeededIxs.push(ixn);
       lut = address;
 
@@ -1420,7 +1420,7 @@ export class KaminoVaultClient {
     }
     ixns.push(
       ...(await this.insertIntoLookupTableIxs(
-        vaultState.adminAuthority,
+        vaultState.vaultAdminAuthority,
         lut,
         allAccountsToBeInserted,
         overridenExistentAccounts

package/src/idl_codegen_kamino_vault/accounts/VaultState.ts

@@ -5,7 +5,7 @@ import * as types from "../types" // eslint-disable-line @typescript-eslint/no-u
 import { PROGRAM_ID } from "../programId"
 
 export interface VaultStateFields {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   baseVaultAuthority: PublicKey
   baseVaultAuthorityBump: BN
   tokenMint: PublicKey
@@ -43,7 +43,7 @@ export interface VaultStateFields {
 }
 
 export interface VaultStateJSON {
-  adminAuthority: string
+  vaultAdminAuthority: string
   baseVaultAuthority: string
   baseVaultAuthorityBump: string
   tokenMint: string
@@ -81,7 +81,7 @@ export interface VaultStateJSON {
 }
 
 export class VaultState {
-  readonly adminAuthority: PublicKey
+  readonly vaultAdminAuthority: PublicKey
   readonly baseVaultAuthority: PublicKey
   readonly baseVaultAuthorityBump: BN
   readonly tokenMint: PublicKey
@@ -122,7 +122,7 @@ export class VaultState {
   ])
 
   static readonly layout = borsh.struct([
-    borsh.publicKey("adminAuthority"),
+    borsh.publicKey("vaultAdminAuthority"),
     borsh.publicKey("baseVaultAuthority"),
     borsh.u64("baseVaultAuthorityBump"),
     borsh.publicKey("tokenMint"),
@@ -160,7 +160,7 @@ export class VaultState {
   ])
 
   constructor(fields: VaultStateFields) {
-    this.adminAuthority = fields.adminAuthority
+    this.vaultAdminAuthority = fields.vaultAdminAuthority
     this.baseVaultAuthority = fields.baseVaultAuthority
     this.baseVaultAuthorityBump = fields.baseVaultAuthorityBump
     this.tokenMint = fields.tokenMint
@@ -243,7 +243,7 @@ export class VaultState {
     const dec = VaultState.layout.decode(data.slice(8))
 
     return new VaultState({
-      adminAuthority: dec.adminAuthority,
+      vaultAdminAuthority: dec.vaultAdminAuthority,
       baseVaultAuthority: dec.baseVaultAuthority,
       baseVaultAuthorityBump: dec.baseVaultAuthorityBump,
       tokenMint: dec.tokenMint,
@@ -287,7 +287,7 @@ export class VaultState {
 
   toJSON(): VaultStateJSON {
     return {
-      adminAuthority: this.adminAuthority.toString(),
+      vaultAdminAuthority: this.vaultAdminAuthority.toString(),
       baseVaultAuthority: this.baseVaultAuthority.toString(),
       baseVaultAuthorityBump: this.baseVaultAuthorityBump.toString(),
       tokenMint: this.tokenMint.toString(),
@@ -329,7 +329,7 @@ export class VaultState {
 
   static fromJSON(obj: VaultStateJSON): VaultState {
     return new VaultState({
-      adminAuthority: new PublicKey(obj.adminAuthority),
+      vaultAdminAuthority: new PublicKey(obj.vaultAdminAuthority),
       baseVaultAuthority: new PublicKey(obj.baseVaultAuthority),
       baseVaultAuthorityBump: new BN(obj.baseVaultAuthorityBump),
       tokenMint: new PublicKey(obj.tokenMint),

package/src/idl_codegen_kamino_vault/instructions/giveUpPendingFees.ts

@@ -9,7 +9,7 @@ export interface GiveUpPendingFeesArgs {
 }
 
 export interface GiveUpPendingFeesAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   klendProgram: PublicKey
 }
@@ -22,7 +22,7 @@ export function giveUpPendingFees(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
   ]

package/src/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.ts

@@ -11,7 +11,7 @@ export interface InitializeSharesMetadataArgs {
 }
 
 export interface InitializeSharesMetadataAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   sharesMint: PublicKey
   baseVaultAuthority: PublicKey
@@ -33,7 +33,7 @@ export function initializeSharesMetadata(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMint, isSigner: false, isWritable: false },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },

package/src/idl_codegen_kamino_vault/instructions/updateSharesMetadata.ts

@@ -11,7 +11,7 @@ export interface UpdateSharesMetadataArgs {
 }
 
 export interface UpdateSharesMetadataAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   baseVaultAuthority: PublicKey
   sharesMetadata: PublicKey
@@ -30,7 +30,7 @@ export function updateSharesMetadata(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: false },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMetadata, isSigner: false, isWritable: true },

package/src/idl_codegen_kamino_vault/instructions/updateVaultConfig.ts

@@ -10,7 +10,7 @@ export interface UpdateVaultConfigArgs {
 }
 
 export interface UpdateVaultConfigAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   klendProgram: PublicKey
 }
@@ -26,7 +26,7 @@ export function updateVaultConfig(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: false },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: false },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
   ]

package/src/idl_codegen_kamino_vault/instructions/withdrawPendingFees.ts

@@ -5,7 +5,7 @@ import * as types from "../types" // eslint-disable-line @typescript-eslint/no-u
 import { PROGRAM_ID } from "../programId"
 
 export interface WithdrawPendingFeesAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   reserve: PublicKey
   tokenVault: PublicKey
@@ -29,7 +29,7 @@ export function withdrawPendingFees(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.reserve, isSigner: false, isWritable: true },
     { pubkey: accounts.tokenVault, isSigner: false, isWritable: true },

package/src/idl_kamino_vault.json

@@ -403,7 +403,7 @@
       "name": "updateVaultConfig",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": false,
           "isSigner": true
         },
@@ -435,7 +435,7 @@
       "name": "withdrawPendingFees",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -540,7 +540,7 @@
       "name": "giveUpPendingFees",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -566,7 +566,7 @@
       "name": "initializeSharesMetadata",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -625,7 +625,7 @@
       "name": "updateSharesMetadata",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -858,7 +858,7 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "adminAuthority",
+            "name": "vaultAdminAuthority",
             "type": "publicKey"
           },
           {
@@ -2189,4 +2189,4 @@
       "msg": "Wrong admin or allocation admin"
     }
   ]
-}
+}

package/src/utils/oracle.ts

@@ -170,10 +170,11 @@ export function cacheOrGetPythPrices(
         const { price, exponent, conf: confidence, publishTime: timestamp, emaPrice } = priceMessage;
         if (price) {
           const px = new Decimal(price.toString()).div(10 ** Math.abs(exponent));
+          const conf = new Decimal(confidence.toString());
           prices.spot = {
             price: px,
             timestamp: BigInt(timestamp.toString()),
-            valid: validatePythPx(px, confidence.toNumber()),
+            valid: validatePythPx(px, conf),
           };
         }
         if (emaPrice !== undefined && emaPrice !== null) {
@@ -297,9 +298,9 @@ function isBetterPrice(current: CandidatePrice | undefined, next: CandidatePrice
   return next.timestamp > current.timestamp;
 }
 
-function validatePythPx(price: Decimal, confidence: number | undefined): boolean {
-  const conf50x = new Decimal(confidence || 0).mul(CONFIDENCE_FACTOR);
-  return price.gt(conf50x);
+function validatePythPx(price: Decimal, confidence: Decimal): boolean {
+  const conf50x = confidence.mul(CONFIDENCE_FACTOR);
+  return !price.isZero() && price.gt(conf50x);
 }
 
 function validateSwitchboardV2Px(agg: any): boolean {