@kamino-finance/klend-sdk 5.14.1-beta.0 → 5.14.2

package/src/classes/shared.ts

@@ -10,6 +10,7 @@ export type MarketConfigType = {
   description: string;
   lendingMarket: string;
   lookupTable: string;
+  isCurated: boolean;
 };
 
 export type ReserveConfigResponse = {

package/src/classes/utils.ts

@@ -287,18 +287,6 @@ export function orThrow(message: string): never {
   throw new Error(message);
 }
 
-export function blobEquals(left: Uint8Array, right: Uint8Array): boolean {
-  if (left.length !== right.length) {
-    return false;
-  }
-  for (let i = 0; i < left.length; ++i) {
-    if (left[i] !== right[i]) {
-      return false;
-    }
-  }
-  return true;
-}
-
 /**
  * Returns an integer {@link Decimal} nearest to the given one.
  *

package/src/classes/vault.ts

@@ -966,7 +966,9 @@ export class KaminoVaultClient {
     };
 
     const depositArgs: DepositArgs = {
-      maxAmount: new BN(numberToLamportsDecimal(tokenAmount, vaultState.tokenMintDecimals.toNumber()).toString()),
+      maxAmount: new BN(
+        numberToLamportsDecimal(tokenAmount, vaultState.tokenMintDecimals.toNumber()).floor().toString()
+      ),
     };
 
     const depositIx = deposit(depositArgs, depoistAccounts, this._kaminoVaultProgramId);
@@ -1084,7 +1086,7 @@ export class KaminoVaultClient {
     );
 
     if (vaultAllocation) {
-      const withdrawFromVaultIxs = await this.wihdrdrawWithReserveIxs(
+      const withdrawFromVaultIxs = await this.withdrawWithReserveIxs(
         user,
         kaminoVault,
         shareAmount,
@@ -1129,7 +1131,7 @@ export class KaminoVaultClient {
     return [createAtaIx, withdrawFromAvailableIxn];
   }
 
-  private async wihdrdrawWithReserveIxs(
+  private async withdrawWithReserveIxs(
     user: PublicKey,
     vault: KaminoVault,
     shareAmount: Decimal,
@@ -1139,7 +1141,6 @@ export class KaminoVaultClient {
     const vaultState = await vault.getState(this.getConnection());
 
     const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
-
     const userSharesAta = getAssociatedTokenAddress(vaultState.sharesMint, user);
     const [{ ata: userTokenAta, createAtaIx }] = createAtasIdempotent(user, [
       {
@@ -1162,9 +1163,12 @@ export class KaminoVaultClient {
     let isFirstWithdraw = true;
 
     if (tokenLeftToWithdraw.lte(0)) {
-      // Availabe enough to withdraw all - using first reserve as it does not matter
+      // Availabe enough to withdraw all - using the first existent reserve
+      const firstReserve = vaultState.vaultAllocationStrategy.find(
+        (reserve) => !reserve.reserve.equals(PublicKey.default)
+      );
       reserveWithSharesAmountToWithdraw.push({
-        reserve: vaultState.vaultAllocationStrategy[0].reserve,
+        reserve: firstReserve!.reserve,
         shares: shareLamportsToWithdraw,
       });
     } else {
@@ -1197,7 +1201,6 @@ export class KaminoVaultClient {
 
     const withdrawIxs: TransactionInstruction[] = [];
     withdrawIxs.push(createAtaIx);
-
     for (let reserveIndex = 0; reserveIndex < reserveWithSharesAmountToWithdraw.length; reserveIndex++) {
       const reserveWithTokens = reserveWithSharesAmountToWithdraw[reserveIndex];
       const reserveState = vaultReservesState.get(reserveWithTokens.reserve);
@@ -2504,6 +2507,7 @@ export class KaminoVaultClient {
     const slotForOverview = slot ? slot : await this.getConnection().getSlot();
 
     const vaultTheoreticalAPYPromise = await this.getVaultTheoreticalAPY(vault, slotForOverview, vaultReservesState);
+    const vaultActualAPYPromise = await this.getVaultActualAPY(vault, slotForOverview, vaultReservesState);
     const totalInvestedAndBorrowedPromise = await this.getTotalBorrowedAndInvested(
       vault,
       slotForOverview,
@@ -2521,12 +2525,14 @@ export class KaminoVaultClient {
     const [
       vaultHoldingsWithUSDValue,
       vaultTheoreticalAPYs,
+      vaultActualAPYs,
       totalInvestedAndBorrowed,
       vaultCollaterals,
       reservesOverview,
     ] = await Promise.all([
       vaultHoldingsWithUSDValuePromise,
       vaultTheoreticalAPYPromise,
+      vaultActualAPYPromise,
       totalInvestedAndBorrowedPromise,
       vaultCollateralsPromise,
       reservesOverviewPromise,
@@ -2536,6 +2542,7 @@ export class KaminoVaultClient {
       holdingsUSD: vaultHoldingsWithUSDValue,
       reservesOverview: reservesOverview,
       vaultCollaterals: vaultCollaterals,
+      actualSupplyAPY: vaultActualAPYs,
       theoreticalSupplyAPY: vaultTheoreticalAPYs,
       totalBorrowed: totalInvestedAndBorrowed.totalBorrowed,
       totalBorrowedUSD: totalInvestedAndBorrowed.totalBorrowed.mul(price),
@@ -2693,6 +2700,57 @@ export class KaminoVaultClient {
     };
   }
 
+  /**
+   * This will return the APY of the vault based on the current invested amounts; for percentage it needs multiplication by 100
+   * @param vault - the kamino vault to get APY for
+   * @param slot - current slot
+   * @param [vaultReservesMap] - hashmap from each reserve pubkey to the reserve state. Optional. If provided the function will be significantly faster as it will not have to fetch the reserves
+   * @returns a struct containing estimated gross APY and net APY (gross - vault fees) for the vault
+   */
+  async getVaultActualAPY(
+    vault: VaultState,
+    slot: number,
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>
+  ): Promise<APYs> {
+    const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vault);
+
+    let totalAUM = new Decimal(vault.tokenAvailable.toString());
+    let totalAPY = new Decimal(0);
+    vault.vaultAllocationStrategy.forEach((allocationStrategy) => {
+      if (allocationStrategy.reserve.equals(PublicKey.default)) {
+        return;
+      }
+
+      const reserve = vaultReservesState.get(allocationStrategy.reserve);
+      if (reserve === undefined) {
+        throw new Error(`Reserve ${allocationStrategy.reserve.toBase58()} not found`);
+      }
+
+      const reserveAPY = new Decimal(reserve.totalSupplyAPY(slot));
+      const exchangeRate = reserve.getEstimatedCollateralExchangeRate(slot, 0);
+      const investedInReserve = exchangeRate.mul(new Decimal(allocationStrategy.ctokenAllocation.toString()));
+
+      const weightedAPY = reserveAPY.mul(investedInReserve);
+      totalAPY = totalAPY.add(weightedAPY);
+      totalAUM = totalAUM.add(investedInReserve);
+    });
+    if (totalAUM.isZero()) {
+      return {
+        grossAPY: new Decimal(0),
+        netAPY: new Decimal(0),
+      };
+    }
+
+    const grossAPY = totalAPY.div(totalAUM);
+    const netAPY = grossAPY
+      .mul(new Decimal(1).sub(new Decimal(vault.performanceFeeBps.toString()).div(FullBPSDecimal)))
+      .mul(new Decimal(1).sub(new Decimal(vault.managementFeeBps.toString()).div(FullBPSDecimal)));
+    return {
+      grossAPY,
+      netAPY,
+    };
+  }
+
   /**
    * Retrive the total amount of interest earned by the vault since its inception, up to the last interaction with the vault on chain, including what was charged as fees
    * @param vaultState the kamino vault state to get total net yield for
@@ -2784,6 +2842,15 @@ export class KaminoVaultClient {
       performanceFee: performanceFee,
     };
   }
+
+  computeUserFarmStateDelegateePDAForUserInVault(
+    farmProgramID: PublicKey,
+    vault: PublicKey,
+    reserve: PublicKey,
+    user: PublicKey
+  ): [PublicKey, number] {
+    return PublicKey.findProgramAddressSync([vault.toBuffer(), reserve.toBuffer(), user.toBuffer()], farmProgramID);
+  }
 } // KaminoVaultClient
 
 export class KaminoVault {
@@ -2972,6 +3039,7 @@ export type VaultOverview = {
   reservesOverview: PubkeyHashMap<PublicKey, ReserveOverview>;
   vaultCollaterals: PubkeyHashMap<PublicKey, MarketOverview>;
   theoreticalSupplyAPY: APYs;
+  actualSupplyAPY: APYs;
   totalBorrowed: Decimal;
   totalBorrowedUSD: Decimal;
   totalSupplied: Decimal;

package/src/client_kamino_manager.ts

@@ -8,20 +8,15 @@ import {
   Signer,
   Transaction,
   TransactionInstruction,
-  TransactionMessage,
   TransactionSignature,
   VersionedTransaction,
 } from '@solana/web3.js';
 import {
   AssetReserveConfigCli,
   Chain,
-  createLookupTableIx,
   DEFAULT_RECENT_SLOT_DURATION_MS,
   encodeTokenName,
-  extendLookupTableIxs,
-  getLookupTableAccounts,
   getMedianSlotDurationInMsFromLastEpochs,
-  globalConfigPda,
   initLookupTableIx,
   KaminoManager,
   KaminoMarket,
@@ -32,7 +27,6 @@ import {
   MAINNET_BETA_CHAIN_ID,
   parseZeroPaddedUtf8,
   printHoldings,
-  PROGRAM_ID,
   Reserve,
   ReserveAllocationConfig,
   ReserveWithAddress,
@@ -159,10 +153,7 @@ async function main() {
 
       const _createReserveSig = await processTxn(env.client, env.payer, txnIxs[0], mode, 2500, [reserve]);
 
-      const [lut, createLutIxs] = await createUpdateReserveConfigLutIxs(env, marketAddress, reserve.publicKey);
-      await processTxn(env.client, env.payer, createLutIxs, mode, 2500, []);
-
-      const _updateSig = await processTxn(env.client, env.payer, txnIxs[1], mode, 2500, [], 400_000, 1000, [lut]);
+      const _updateReserveSig = await processTxn(env.client, env.payer, txnIxs[1], mode, 2500, [], 400_000);
 
       mode === 'execute' &&
         console.log(
@@ -330,7 +321,11 @@ async function main() {
     .requiredOption('--vault <string>', 'Vault address')
     .requiredOption('--symbol <string>', 'The symbol of the kVault token')
     .requiredOption('--extraName <string>', 'The name of the kVault token, appended to the symbol')
-    .action(async ({ vault, symbol, extraName }) => {
+    .requiredOption(
+      `--mode <string>`,
+      'simulate - to print txn simulation, inspect - to get txn simulation in explorer, execute - execute txn, multisig - to get bs58 txn for multisig usage'
+    )
+    .action(async ({ vault, symbol, extraName, mode }) => {
       const env = initializeClient(false, false);
       const kVault = new KaminoVault(new PublicKey(vault));
 
@@ -342,7 +337,7 @@ async function main() {
       );
       const ix = await kaminoManager.getSetSharesMetadataIx(kVault, symbol, extraName);
 
-      await processTxn(env.client, env.payer, [ix], 'execute', 2500, []);
+      await processTxn(env.client, env.payer, [ix], mode, 2500, []);
     });
 
   commands
@@ -618,13 +613,21 @@ async function main() {
       const acceptVaultOwnershipSig = await processTxn(
         env.client,
         env.payer,
-        [instructions.acceptVaultOwnershipIx, ...instructions.updateLUTIxs],
+        [instructions.acceptVaultOwnershipIx],
         mode,
         2500,
         []
       );
 
       mode === 'execute' && console.log('Vault ownership accepted:', acceptVaultOwnershipSig);
+
+      // send the LUT mgmt ixs one by one
+      const lutIxs = [...instructions.updateLUTIxs];
+      for (let i = 0; i < lutIxs.length; i++) {
+        const lutIxsGroup = lutIxs.slice(i, i + 1);
+        const lutIxsSig = await processTxn(env.client, env.payer, lutIxsGroup, mode, 2500, []);
+        mode === 'execute' && console.log('LUT updated:', lutIxsSig);
+      }
     });
 
   commands
@@ -1077,7 +1080,11 @@ async function main() {
       const walletAddress = new PublicKey(wallet);
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kVaultProgramId);
       const userShares = await kaminoManager.getUserSharesBalanceSingleVault(walletAddress, kaminoVault);
-      console.log(`User shares for vault ${vaultAddress.toBase58()}: ${userShares}`);
+      console.log(
+        `User shares for vault ${vaultAddress.toBase58()}: unstaked shares: ${
+          userShares.unstakedShares
+        } staked shares: ${userShares.stakedShares} total shares: ${userShares.totalShares}`
+      );
     });
 
   commands
@@ -1601,46 +1608,45 @@ async function processTxn(
   priorityFeeMultiplier: number = 2500,
   extraSigners: Signer[],
   computeUnits: number = 200_000,
-  priorityFeeLamports: number = 1000,
-  luts: PublicKey[] = []
+  priorityFeeLamports: number = 1000
 ): Promise<TransactionSignature> {
   if (mode !== 'inspect' && mode !== 'simulate' && mode !== 'execute' && mode !== 'multisig') {
     throw new Error('Invalid mode: ' + mode + '. Must be one of: inspect/simulate/execute/multisig');
   }
   if (mode === 'multisig') {
     const { blockhash } = await web3Client.connection.getLatestBlockhash();
-    const txn = new Transaction();
-    txn.add(...ixs);
-    txn.recentBlockhash = blockhash;
-    txn.feePayer = admin.publicKey;
+    for (const ix of ixs) {
+      const txn = new Transaction();
+      txn.add(ix);
+      txn.recentBlockhash = blockhash;
+      txn.feePayer = admin.publicKey;
 
-    console.log(binary_to_base58(txn.serializeMessage()));
+      console.log(`${binary_to_base58(txn.serializeMessage())} \n`);
+    }
 
     return '';
   } else {
     const microLamport = priorityFeeLamports * 10 ** 6; // 1000 lamports
     const microLamportsPrioritizationFee = microLamport / computeUnits;
-    const { blockhash } = await web3Client.connection.getLatestBlockhash();
 
+    const tx = new Transaction();
+    const { blockhash } = await web3Client.connection.getLatestBlockhash();
     if (priorityFeeMultiplier) {
       const priorityFeeIxn = createAddExtraComputeUnitFeeTransaction(
         computeUnits,
         microLamportsPrioritizationFee * priorityFeeMultiplier
       );
-      ixs.push(...priorityFeeIxn);
+      tx.add(...priorityFeeIxn);
     }
-
-    const tx = new TransactionMessage({
-      payerKey: admin.publicKey,
-      recentBlockhash: blockhash,
-      instructions: ixs,
-    }).compileToV0Message(await getLookupTableAccounts(web3Client.connection, luts));
+    tx.recentBlockhash = blockhash;
+    tx.feePayer = admin.publicKey;
+    tx.add(...ixs);
 
     if (mode === 'execute') {
       return await signSendAndConfirmRawTransactionWithRetry({
         mainConnection: web3Client.sendConnection,
         extraConnections: [],
-        tx: new VersionedTransaction(tx),
+        tx: new VersionedTransaction(tx.compileMessage()),
         signers: [admin, ...extraSigners],
         commitment: 'confirmed',
         sendTransactionOptions: {
@@ -1649,7 +1655,9 @@ async function processTxn(
         },
       });
     } else if (mode === 'simulate') {
-      const simulation = await web3Client.sendConnection.simulateTransaction(new VersionedTransaction(tx));
+      const simulation = await web3Client.sendConnection.simulateTransaction(
+        new VersionedTransaction(tx.compileMessage())
+      );
       if (simulation.value.logs && simulation.value.logs.length > 0) {
         console.log('Simulation: \n' + simulation.value.logs);
       } else {
@@ -1659,7 +1667,7 @@ async function processTxn(
       console.log(
         'Tx in B64',
         `https://explorer.solana.com/tx/inspector?message=${encodeURIComponent(
-          Buffer.from(tx.serialize()).toString('base64')
+          tx.serializeMessage().toString('base64')
         )}`
       );
     }
@@ -1857,15 +1865,3 @@ function parseReserveConfigToFile(reserveConfig: ReserveConfig) {
     reserved2: Array(9).fill(0),
   };
 }
-
-async function createUpdateReserveConfigLutIxs(
-  env: Env,
-  lendingMarketAddress: PublicKey,
-  reserveAddress: PublicKey
-): Promise<[PublicKey, TransactionInstruction[]]> {
-  const [globalConfigAddress] = globalConfigPda(PROGRAM_ID);
-  const contents = [globalConfigAddress, lendingMarketAddress, reserveAddress];
-  const [createIx, lut] = await createLookupTableIx(env.connection, env.payer.publicKey);
-  const extendIxs = extendLookupTableIxs(env.payer.publicKey, lut, contents);
-  return [lut, [createIx, ...extendIxs]];
-}

package/src/idl.json

@@ -230,15 +230,10 @@
       "name": "updateReserveConfig",
       "accounts": [
         {
-          "name": "signer",
+          "name": "lendingMarketOwner",
           "isMut": false,
           "isSigner": true
         },
-        {
-          "name": "globalConfig",
-          "isMut": false,
-          "isSigner": false
-        },
         {
           "name": "lendingMarket",
           "isMut": false,
@@ -253,9 +248,7 @@
       "args": [
         {
           "name": "mode",
-          "type": {
-            "defined": "UpdateConfigMode"
-          }
+          "type": "u64"
         },
         {
           "name": "value",
@@ -312,9 +305,9 @@
       "name": "withdrawProtocolFee",
       "accounts": [
         {
-          "name": "globalConfig",
+          "name": "lendingMarketOwner",
           "isMut": false,
-          "isSigner": false
+          "isSigner": true
         },
         {
           "name": "lendingMarket",
@@ -342,7 +335,7 @@
           "isSigner": false
         },
         {
-          "name": "feeCollectorAta",
+          "name": "lendingMarketOwnerAta",
           "isMut": true,
           "isSigner": false
         },
@@ -2939,93 +2932,14 @@
         }
       ]
     },
-    {
-      "name": "initGlobalConfig",
-      "accounts": [
-        {
-          "name": "payer",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "globalConfig",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "programData",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "rent",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
-    {
-      "name": "updateGlobalConfig",
-      "accounts": [
-        {
-          "name": "globalAdmin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "globalConfig",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "mode",
-          "type": {
-            "defined": "UpdateGlobalConfigMode"
-          }
-        },
-        {
-          "name": "value",
-          "type": "bytes"
-        }
-      ]
-    },
-    {
-      "name": "updateGlobalConfigAdmin",
-      "accounts": [
-        {
-          "name": "pendingAdmin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "globalConfig",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
     {
       "name": "idlMissingTypes",
       "accounts": [
         {
-          "name": "signer",
+          "name": "lendingMarketOwner",
           "isMut": false,
           "isSigner": true
         },
-        {
-          "name": "globalConfig",
-          "isMut": false,
-          "isSigner": false
-        },
         {
           "name": "lendingMarket",
           "isMut": false,
@@ -3220,47 +3134,6 @@
         ]
       }
     },
-    {
-      "name": "GlobalConfig",
-      "type": {
-        "kind": "struct",
-        "fields": [
-          {
-            "name": "globalAdmin",
-            "docs": [
-              "Global admin of the program"
-            ],
-            "type": "publicKey"
-          },
-          {
-            "name": "pendingAdmin",
-            "docs": [
-              "Pending admin must sign a specific transaction to become the global admin"
-            ],
-            "type": "publicKey"
-          },
-          {
-            "name": "feeCollector",
-            "docs": [
-              "Fee collector is the only allowed owner of token accounts receiving protocol fees"
-            ],
-            "type": "publicKey"
-          },
-          {
-            "name": "padding",
-            "docs": [
-              "Padding to make the struct size 1024 bytes"
-            ],
-            "type": {
-              "array": [
-                "u8",
-                928
-              ]
-            }
-          }
-        ]
-      }
-    },
     {
       "name": "LendingMarket",
       "type": {
@@ -3480,33 +3353,18 @@
             "type": "u64"
           },
           {
-            "name": "obligationOrderExecutionEnabled",
+            "name": "obligationOrdersEnabled",
             "docs": [
               "Whether the obligation orders should be evaluated during liquidations."
             ],
             "type": "u8"
           },
-          {
-            "name": "immutable",
-            "docs": [
-              "Whether the lending market is set as immutable."
-            ],
-            "type": "u8"
-          },
-          {
-            "name": "obligationOrderCreationEnabled",
-            "docs": [
-              "Whether new obligation orders can be created.",
-              "Note: updating or cancelling existing orders is *not* affected by this flag."
-            ],
-            "type": "u8"
-          },
           {
             "name": "padding2",
             "type": {
               "array": [
                 "u8",
-                5
+                7
               ]
             }
           },
@@ -4328,27 +4186,7 @@
             "name": "UpdateInitialDepositAmount"
           },
           {
-            "name": "UpdateObligationOrderExecutionEnabled"
-          },
-          {
-            "name": "UpdateImmutableFlag"
-          },
-          {
-            "name": "UpdateObligationOrderCreationEnabled"
-          }
-        ]
-      }
-    },
-    {
-      "name": "UpdateGlobalConfigMode",
-      "type": {
-        "kind": "enum",
-        "variants": [
-          {
-            "name": "PendingAdmin"
-          },
-          {
-            "name": "FeeCollector"
+            "name": "UpdateObligationOrdersEnabled"
           }
         ]
       }
@@ -6194,21 +6032,6 @@
       "code": 6126,
       "name": "OperationNotPermittedWithCurrentObligationOrders",
       "msg": "Single debt, single collateral obligation orders have to be cancelled before changing the deposit/borrow count"
-    },
-    {
-      "code": 6127,
-      "name": "OperationNotPermittedMarketImmutable",
-      "msg": "Cannot update lending market because it is set as immutable"
-    },
-    {
-      "code": 6128,
-      "name": "OrderCreationDisabled",
-      "msg": "Creation of new orders is disabled"
-    },
-    {
-      "code": 6129,
-      "name": "NoUpgradeAuthority",
-      "msg": "Cannot initialize global config because there is no upgrade authority to the program"
     }
   ]
 }