@kamino-finance/klend-sdk 5.12.6 → 5.12.7-beta.0

package/src/client.ts

@@ -12,6 +12,7 @@ import {
   getAllObligationAccounts,
   getAllReserveAccounts,
   getAllLendingMarketAccounts,
+  KaminoManager,
 } from './lib';
 import * as fs from 'fs';
 import { Connection, GetProgramAccountsFilter, Keypair, PublicKey } from '@solana/web3.js';
@@ -19,7 +20,7 @@ import { BN } from '@coral-xyz/anchor';
 import { Reserve } from './idl_codegen/accounts';
 import { buildAndSendTxnWithLogs, buildVersionedTransaction } from './utils/instruction';
 import { VanillaObligation } from './utils/ObligationType';
-import { parseTokenSymbol } from './classes/utils';
+import { getMedianSlotDurationInMsFromLastEpochs, parseTokenSymbol } from './classes/utils';
 import { Env, initEnv } from '../tests/runner/setup_utils';
 import { initializeFarmsForReserve } from '../tests/runner/farms/farms_operations';
 import { Scope } from '@kamino-finance/scope-sdk';
@@ -75,6 +76,30 @@ async function main() {
       console.log(`Total lending markets: ${count}`);
     });
 
+  commands
+    .command('print-all-markets-lite')
+    .option(`--rpc <string>`, 'The RPC URL')
+    .action(async ({ rpc }) => {
+      const startTime = Date.now();
+
+      const connection = new Connection(rpc, {});
+      const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
+      const kaminoManager = new KaminoManager(connection, slotDuration);
+      const allMarkets = await kaminoManager.getAllMarkets();
+      for (const market of allMarkets) {
+        console.log(
+          `Market: ${market.getName()} Address: ${
+            market.address
+          } Deposit TVL: ${market.getTotalDepositTVL()} Borrow TVL: ${market.getTotalBorrowTVL()} TVL: ${market
+            .getTotalDepositTVL()
+            .minus(market.getTotalBorrowTVL())}`
+        );
+      }
+
+      const duration = Date.now() - startTime;
+      console.log(`Execution duration: ${duration}ms`);
+    });
+
   commands
     .command('print-obligation')
     .option(`--rpc <string>`, 'The rpc url')

package/src/idl_codegen_kamino_vault/instructions/deposit.ts

@@ -20,8 +20,6 @@ export interface DepositAccounts {
   klendProgram: PublicKey
   tokenProgram: PublicKey
   sharesTokenProgram: PublicKey
-  eventAuthority: PublicKey
-  program: PublicKey
 }
 
 export const layout = borsh.struct([borsh.u64("maxAmount")])
@@ -43,8 +41,6 @@ export function deposit(
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesTokenProgram, isSigner: false, isWritable: false },
-    { pubkey: accounts.eventAuthority, isSigner: false, isWritable: false },
-    { pubkey: accounts.program, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([242, 35, 198, 137, 82, 225, 242, 182])
   const buffer = Buffer.alloc(1000)

package/src/idl_codegen_kamino_vault/instructions/withdraw.ts

@@ -21,8 +21,6 @@ export interface WithdrawAccounts {
     tokenProgram: PublicKey
     sharesTokenProgram: PublicKey
     klendProgram: PublicKey
-    eventAuthority: PublicKey
-    program: PublicKey
   }
   withdrawFromReserveAccounts: {
     vaultState: PublicKey
@@ -35,8 +33,6 @@ export interface WithdrawAccounts {
     reserveCollateralTokenProgram: PublicKey
     instructionSysvarAccount: PublicKey
   }
-  eventAuthority: PublicKey
-  program: PublicKey
 }
 
 export const layout = borsh.struct([borsh.u64("sharesAmount")])
@@ -102,16 +98,6 @@ export function withdraw(
       isSigner: false,
       isWritable: false,
     },
-    {
-      pubkey: accounts.withdrawFromAvailable.eventAuthority,
-      isSigner: false,
-      isWritable: false,
-    },
-    {
-      pubkey: accounts.withdrawFromAvailable.program,
-      isSigner: false,
-      isWritable: false,
-    },
     {
       pubkey: accounts.withdrawFromReserveAccounts.vaultState,
       isSigner: false,
@@ -158,8 +144,6 @@ export function withdraw(
       isSigner: false,
       isWritable: false,
     },
-    { pubkey: accounts.eventAuthority, isSigner: false, isWritable: false },
-    { pubkey: accounts.program, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([183, 18, 70, 156, 148, 109, 161, 34])
   const buffer = Buffer.alloc(1000)

package/src/idl_codegen_kamino_vault/instructions/withdrawFromAvailable.ts

@@ -20,8 +20,6 @@ export interface WithdrawFromAvailableAccounts {
   tokenProgram: PublicKey
   sharesTokenProgram: PublicKey
   klendProgram: PublicKey
-  eventAuthority: PublicKey
-  program: PublicKey
 }
 
 export const layout = borsh.struct([borsh.u64("sharesAmount")])
@@ -43,8 +41,6 @@ export function withdrawFromAvailable(
     { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesTokenProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
-    { pubkey: accounts.eventAuthority, isSigner: false, isWritable: false },
-    { pubkey: accounts.program, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([19, 131, 112, 155, 170, 220, 34, 57])
   const buffer = Buffer.alloc(1000)

package/src/idl_codegen_kamino_vault/types/ReserveConfig.ts

@@ -10,15 +10,10 @@ export interface ReserveConfigFields {
   assetTier: number
   /** Flat rate that goes to the host */
   hostFixedInterestRateBps: number
-  /**
-   * [DEPRECATED] Space that used to hold 2 fields:
-   * - Boost for side (debt or collateral)
-   * - Reward points multiplier per obligation type
-   * Can be re-used after making sure all underlying production account data is zeroed.
-   */
+  /** [DEPRECATED] Boost for side (debt or collateral) */
   reserved2: Array<number>
-  /** Cut of the order execution bonus that the protocol receives, as a percentage */
-  protocolOrderExecutionFeePct: number
+  /** [DEPRECATED] Reward points multiplier per obligation type */
+  reserved3: Array<number>
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
   protocolTakeRatePct: number
   /** Cut of the liquidation bonus that the protocol receives, as a percentage */
@@ -103,15 +98,10 @@ export interface ReserveConfigJSON {
   assetTier: number
   /** Flat rate that goes to the host */
   hostFixedInterestRateBps: number
-  /**
-   * [DEPRECATED] Space that used to hold 2 fields:
-   * - Boost for side (debt or collateral)
-   * - Reward points multiplier per obligation type
-   * Can be re-used after making sure all underlying production account data is zeroed.
-   */
+  /** [DEPRECATED] Boost for side (debt or collateral) */
   reserved2: Array<number>
-  /** Cut of the order execution bonus that the protocol receives, as a percentage */
-  protocolOrderExecutionFeePct: number
+  /** [DEPRECATED] Reward points multiplier per obligation type */
+  reserved3: Array<number>
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
   protocolTakeRatePct: number
   /** Cut of the liquidation bonus that the protocol receives, as a percentage */
@@ -197,15 +187,10 @@ export class ReserveConfig {
   readonly assetTier: number
   /** Flat rate that goes to the host */
   readonly hostFixedInterestRateBps: number
-  /**
-   * [DEPRECATED] Space that used to hold 2 fields:
-   * - Boost for side (debt or collateral)
-   * - Reward points multiplier per obligation type
-   * Can be re-used after making sure all underlying production account data is zeroed.
-   */
+  /** [DEPRECATED] Boost for side (debt or collateral) */
   readonly reserved2: Array<number>
-  /** Cut of the order execution bonus that the protocol receives, as a percentage */
-  readonly protocolOrderExecutionFeePct: number
+  /** [DEPRECATED] Reward points multiplier per obligation type */
+  readonly reserved3: Array<number>
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
   readonly protocolTakeRatePct: number
   /** Cut of the liquidation bonus that the protocol receives, as a percentage */
@@ -287,7 +272,7 @@ export class ReserveConfig {
     this.assetTier = fields.assetTier
     this.hostFixedInterestRateBps = fields.hostFixedInterestRateBps
     this.reserved2 = fields.reserved2
-    this.protocolOrderExecutionFeePct = fields.protocolOrderExecutionFeePct
+    this.reserved3 = fields.reserved3
     this.protocolTakeRatePct = fields.protocolTakeRatePct
     this.protocolLiquidationFeePct = fields.protocolLiquidationFeePct
     this.loanToValuePct = fields.loanToValuePct
@@ -333,8 +318,8 @@ export class ReserveConfig {
         borsh.u8("status"),
         borsh.u8("assetTier"),
         borsh.u16("hostFixedInterestRateBps"),
-        borsh.array(borsh.u8(), 9, "reserved2"),
-        borsh.u8("protocolOrderExecutionFeePct"),
+        borsh.array(borsh.u8(), 2, "reserved2"),
+        borsh.array(borsh.u8(), 8, "reserved3"),
         borsh.u8("protocolTakeRatePct"),
         borsh.u8("protocolLiquidationFeePct"),
         borsh.u8("loanToValuePct"),
@@ -376,7 +361,7 @@ export class ReserveConfig {
       assetTier: obj.assetTier,
       hostFixedInterestRateBps: obj.hostFixedInterestRateBps,
       reserved2: obj.reserved2,
-      protocolOrderExecutionFeePct: obj.protocolOrderExecutionFeePct,
+      reserved3: obj.reserved3,
       protocolTakeRatePct: obj.protocolTakeRatePct,
       protocolLiquidationFeePct: obj.protocolLiquidationFeePct,
       loanToValuePct: obj.loanToValuePct,
@@ -419,7 +404,7 @@ export class ReserveConfig {
       assetTier: fields.assetTier,
       hostFixedInterestRateBps: fields.hostFixedInterestRateBps,
       reserved2: fields.reserved2,
-      protocolOrderExecutionFeePct: fields.protocolOrderExecutionFeePct,
+      reserved3: fields.reserved3,
       protocolTakeRatePct: fields.protocolTakeRatePct,
       protocolLiquidationFeePct: fields.protocolLiquidationFeePct,
       loanToValuePct: fields.loanToValuePct,
@@ -464,7 +449,7 @@ export class ReserveConfig {
       assetTier: this.assetTier,
       hostFixedInterestRateBps: this.hostFixedInterestRateBps,
       reserved2: this.reserved2,
-      protocolOrderExecutionFeePct: this.protocolOrderExecutionFeePct,
+      reserved3: this.reserved3,
       protocolTakeRatePct: this.protocolTakeRatePct,
       protocolLiquidationFeePct: this.protocolLiquidationFeePct,
       loanToValuePct: this.loanToValuePct,
@@ -507,7 +492,7 @@ export class ReserveConfig {
       assetTier: obj.assetTier,
       hostFixedInterestRateBps: obj.hostFixedInterestRateBps,
       reserved2: obj.reserved2,
-      protocolOrderExecutionFeePct: obj.protocolOrderExecutionFeePct,
+      reserved3: obj.reserved3,
       protocolTakeRatePct: obj.protocolTakeRatePct,
       protocolLiquidationFeePct: obj.protocolLiquidationFeePct,
       loanToValuePct: obj.loanToValuePct,

package/src/idl_kamino_vault.json

@@ -180,16 +180,6 @@
           "name": "sharesTokenProgram",
           "isMut": false,
           "isSigner": false
-        },
-        {
-          "name": "eventAuthority",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "program",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
@@ -259,16 +249,6 @@
               "name": "klendProgram",
               "isMut": false,
               "isSigner": false
-            },
-            {
-              "name": "eventAuthority",
-              "isMut": false,
-              "isSigner": false
-            },
-            {
-              "name": "program",
-              "isMut": false,
-              "isSigner": false
             }
           ]
         },
@@ -321,16 +301,6 @@
               "isSigner": false
             }
           ]
-        },
-        {
-          "name": "eventAuthority",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "program",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
@@ -752,16 +722,6 @@
           "name": "klendProgram",
           "isMut": false,
           "isSigner": false
-        },
-        {
-          "name": "eventAuthority",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "program",
-          "isMut": false,
-          "isSigner": false
         }
       ],
       "args": [
@@ -1238,24 +1198,26 @@
           {
             "name": "reserved2",
             "docs": [
-              "[DEPRECATED] Space that used to hold 2 fields:",
-              "- Boost for side (debt or collateral)",
-              "- Reward points multiplier per obligation type",
-              "Can be re-used after making sure all underlying production account data is zeroed."
+              "[DEPRECATED] Boost for side (debt or collateral)"
             ],
             "type": {
               "array": [
                 "u8",
-                9
+                2
               ]
             }
           },
           {
-            "name": "protocolOrderExecutionFeePct",
+            "name": "reserved3",
             "docs": [
-              "Cut of the order execution bonus that the protocol receives, as a percentage"
+              "[DEPRECATED] Reward points multiplier per obligation type"
             ],
-            "type": "u8"
+            "type": {
+              "array": [
+                "u8",
+                8
+              ]
+            }
           },
           {
             "name": "protocolTakeRatePct",
@@ -2020,78 +1982,6 @@
       }
     }
   ],
-  "events": [
-    {
-      "name": "DepositResultEvent",
-      "fields": [
-        {
-          "name": "sharesToMint",
-          "type": "u64",
-          "index": false
-        },
-        {
-          "name": "tokenToDeposit",
-          "type": "u64",
-          "index": false
-        },
-        {
-          "name": "crankFundsToDeposit",
-          "type": "u64",
-          "index": false
-        }
-      ]
-    },
-    {
-      "name": "DepositUserAtaBalanceEvent",
-      "fields": [
-        {
-          "name": "userAtaBalance",
-          "type": "u64",
-          "index": false
-        }
-      ]
-    },
-    {
-      "name": "SharesToWithdrawEvent",
-      "fields": [
-        {
-          "name": "sharesAmount",
-          "type": "u64",
-          "index": false
-        },
-        {
-          "name": "userSharesBefore",
-          "type": "u64",
-          "index": false
-        }
-      ]
-    },
-    {
-      "name": "WithdrawResultEvent",
-      "fields": [
-        {
-          "name": "sharesToBurn",
-          "type": "u64",
-          "index": false
-        },
-        {
-          "name": "availableToSendToUser",
-          "type": "u64",
-          "index": false
-        },
-        {
-          "name": "investedToDisinvestCtokens",
-          "type": "u64",
-          "index": false
-        },
-        {
-          "name": "investedLiquidityToSendToUser",
-          "type": "u64",
-          "index": false
-        }
-      ]
-    }
-  ],
   "errors": [
     {
       "code": 7000,

package/src/utils/accountListing.ts

@@ -1,4 +1,4 @@
-import { Connection, PublicKey } from '@solana/web3.js';
+import { AccountInfo, Connection, PublicKey } from '@solana/web3.js';
 import { LendingMarket, Obligation, Reserve } from '../idl_codegen/accounts';
 import { PROGRAM_ID } from '../idl_codegen/programId';
 import bs58 from 'bs58';
@@ -35,7 +35,7 @@ export async function* getAllObligationAccounts(
 
 export async function* getAllReserveAccounts(
   connection: Connection
-): AsyncGenerator<[PublicKey, Reserve], void, unknown> {
+): AsyncGenerator<[PublicKey, Reserve, AccountInfo<Buffer>], void, unknown> {
   // due to relatively low count of reserves, we technically don't really need a generator, but let's keep it consistent within this file
   const reserves = await connection.getProgramAccounts(PROGRAM_ID, {
     filters: [
@@ -51,7 +51,7 @@ export async function* getAllReserveAccounts(
     ],
   });
   for (const reserve of reserves) {
-    yield [reserve.pubkey, Reserve.decode(reserve.account.data)];
+    yield [reserve.pubkey, Reserve.decode(reserve.account.data), reserve.account];
   }
 }
 

package/src/utils/oracle.ts

@@ -40,17 +40,15 @@ export type ScopePriceRefreshConfig = {
   scopeFeed: string;
 };
 
-// TODO: Add freshness of the latest price to match sc logic
-export async function getTokenOracleData(
-  connection: Connection,
+export function getTokenOracleDataSync(
+  allOracleAccounts: AllOracleAccounts,
+  switchboardV2: SwitchboardProgram,
   reserves: Reserve[]
-): Promise<Array<[Reserve, TokenOracleData | undefined]>> {
-  const allOracleAccounts = await getAllOracleAccounts(connection, reserves);
+) {
   const tokenOracleDataForReserves: Array<[Reserve, TokenOracleData | undefined]> = [];
   const pythCache = new PubkeyHashMap<PublicKey, PythPrices>();
   const switchboardCache = new PubkeyHashMap<PublicKey, CandidatePrice>();
   const scopeCache = new PubkeyHashMap<PublicKey, OraclePrices>();
-  let switchboardV2: SwitchboardProgram | undefined;
   for (const reserve of reserves) {
     let currentBest: CandidatePrice | undefined = undefined;
     const oracle = {
@@ -66,9 +64,6 @@ export async function getTokenOracleData(
       }
     }
     if (isNotNullPubkey(oracle.switchboardFeedAddress)) {
-      if (!switchboardV2) {
-        switchboardV2 = await SwitchboardProgram.loadMainnet(connection);
-      }
       const switchboardPrice = cacheOrGetSwitchboardPrice(
         oracle.switchboardFeedAddress,
         switchboardCache,
@@ -109,6 +104,16 @@ export async function getTokenOracleData(
   return tokenOracleDataForReserves;
 }
 
+// TODO: Add freshness of the latest price to match sc logic
+export async function getTokenOracleData(
+  connection: Connection,
+  reserves: Reserve[]
+): Promise<Array<[Reserve, TokenOracleData | undefined]>> {
+  const allOracleAccounts = await getAllOracleAccounts(connection, reserves);
+  const switchboardV2 = await SwitchboardProgram.loadMainnet(connection);
+  return getTokenOracleDataSync(allOracleAccounts, switchboardV2, reserves);
+}
+
 export type AllOracleAccounts = PubkeyHashMap<PublicKey, AccountInfo<Buffer>>;
 
 export async function getAllOracleAccounts(connection: Connection, reserves: Reserve[]): Promise<AllOracleAccounts> {