@kamino-finance/klend-sdk 6.0.2 → 6.0.4

package/src/manager/client_kamino_manager.ts

@@ -3,7 +3,9 @@ import { Command } from 'commander';
 import { Address, address, IInstruction } from '@solana/kit';
 import {
   AssetReserveConfigCli,
+  calculateAPYFromAPR,
   createLookupTableIx,
+  DEFAULT_PUBLIC_KEY,
   DEFAULT_RECENT_SLOT_DURATION_MS,
   encodeTokenName,
   extendLookupTableIxs,
@@ -12,6 +14,7 @@ import {
   initLookupTableIx,
   KaminoManager,
   KaminoMarket,
+  KaminoReserve,
   KaminoVault,
   KaminoVaultConfig,
   lamportsToDecimal,
@@ -45,7 +48,7 @@ import { fetchMint, findAssociatedTokenPda } from '@solana-program/token-2022';
 import { initEnv, ManagerEnv } from './tx/ManagerEnv';
 import { processTx } from './tx/processor';
 import { getPriorityFeeAndCuIxs } from '../client/tx/priorityFee';
-import { fetchAddressLookupTable } from '@solana-program/address-lookup-table';
+import { fetchAddressLookupTable, fetchAllAddressLookupTable } from '@solana-program/address-lookup-table';
 
 dotenv.config({
   path: `.env${process.env.ENV ? '.' + process.env.ENV : ''}`,
@@ -317,7 +320,7 @@ async function main() {
         throw new Error('If using multisig mode, multisig is required');
       }
       const ms = multisig ? address(multisig) : undefined;
-      const env = await initEnv(ms, staging);
+      const env = await initEnv(staging, ms);
       const tokenMint = address(mint);
 
       const kaminoManager = new KaminoManager(
@@ -406,7 +409,7 @@ async function main() {
         env.klendProgramId,
         env.kvaultProgramId
       );
-      const vaultState = await vault.getState(env.c.rpc);
+      const vaultState = await kVault.getState(env.c.rpc);
       const signer = await env.getSigner({ vaultState });
       const ix = await kaminoManager.getSetSharesMetadataIx(signer, kVault, symbol, extraName);
 
@@ -494,7 +497,7 @@ async function main() {
       );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kvaultProgramId);
-      const vaultState = await vault.getState(env.c.rpc);
+      const vaultState = await kaminoVault.getState(env.c.rpc);
       const signer = await env.getSigner({ vaultState });
 
       const instructions = await kaminoManager.updateVaultConfigIxs(kaminoVault, field, value, signer);
@@ -537,7 +540,7 @@ async function main() {
       );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kvaultProgramId);
-      const vaultState = await vault.getState(env.c.rpc);
+      const vaultState = await kaminoVault.getState(env.c.rpc);
       const signer = await env.getSigner({ vaultState });
       const instructions = await kaminoManager.updateVaultConfigIxs(
         kaminoVault,
@@ -649,7 +652,7 @@ async function main() {
       );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kvaultProgramId);
-      const vaultState = await vault.getState(env.c.rpc);
+      const vaultState = await kaminoVault.getState(env.c.rpc);
       const signer = await env.getSigner({ vaultState });
       const syncLUTIxs = await kaminoManager.syncVaultLUTIxs(signer, kaminoVault);
 
@@ -709,7 +712,7 @@ async function main() {
       );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kvaultProgramId);
-      const vaultState = await vault.getState(env.c.rpc);
+      const vaultState = await kaminoVault.getState(env.c.rpc);
       const signer = await env.getSigner({ vaultState });
       const instructions = await kaminoManager.updateVaultConfigIxs(
         kaminoVault,
@@ -755,7 +758,7 @@ async function main() {
       );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kvaultProgramId);
-      const vaultState = await vault.getState(env.c.rpc);
+      const vaultState = await kaminoVault.getState(env.c.rpc);
       const pendingAdmin = await env.getSigner({
         vaultState,
         useVaultPendingAdmin: true,
@@ -833,7 +836,7 @@ async function main() {
       );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kvaultProgramId);
-      const vaultState = await vault.getState(env.c.rpc);
+      const vaultState = await kaminoVault.getState(env.c.rpc);
       const signer = await env.getSigner({ vaultState });
       const instruction = await kaminoManager.giveUpPendingFeesIx(kaminoVault, new Decimal(maxAmountToGiveUp), signer);
 
@@ -873,7 +876,7 @@ async function main() {
       );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kvaultProgramId);
-      const vaultState = await vault.getState(env.c.rpc);
+      const vaultState = await kaminoVault.getState(env.c.rpc);
       const signer = await env.getSigner({ vaultState });
 
       const instructions = await kaminoManager.withdrawPendingFeesIxs(
@@ -920,27 +923,27 @@ async function main() {
       );
 
       const kaminoVault = new KaminoVault(vaultAddress, undefined, env.kvaultProgramId);
-      const vaultState = await vault.getState(env.c.rpc);
+      const vaultState = await kaminoVault.getState(env.c.rpc);
       const signer = await env.getSigner({ vaultState });
-      const instruction = await kaminoManager.removeReserveFromAllocationIx(kaminoVault, reserveAddress, signer);
 
-      if (instruction) {
-        await processTx(
-          env.c,
-          signer,
-          [
-            instruction,
-            ...getPriorityFeeAndCuIxs({
-              priorityFeeMultiplier: 2500,
-            }),
-          ],
-          mode,
-          []
-        );
-        mode === 'execute' && console.log('Vault allocation updated');
-      } else {
-        console.log('No updates to vault allocation to perform');
+      const ixs = await kaminoManager.fullRemoveReserveFromVaultIxs(signer, kaminoVault, reserveAddress);
+
+      const transactionIxs = [
+        ...ixs,
+        ...getPriorityFeeAndCuIxs({
+          priorityFeeMultiplier: 2500,
+          computeUnits: 1_000_000,
+        }),
+      ];
+
+      const lookupTableAddresses = [];
+      if (vaultState.vaultLookupTable !== DEFAULT_PUBLIC_KEY) {
+        lookupTableAddresses.push(vaultState.vaultLookupTable);
       }
+      const lookupTables = await fetchAllAddressLookupTable(env.c.rpc, lookupTableAddresses);
+
+      await processTx(env.c, signer, transactionIxs, mode, lookupTables);
+      mode === 'execute' && console.log('Vault allocation removed');
     });
 
   commands
@@ -1342,12 +1345,7 @@ async function main() {
       const env = await initEnv(staging);
       const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-      const kaminoManager = new KaminoManager(
-        env.c.rpc,
-        slotDuration,
-        address('KLend2g3cP87fffoy8q1mQqGKjrxjC8boSyAYavgmjD'),
-        env.kvaultProgramId
-      );
+      const kaminoManager = new KaminoManager(env.c.rpc, slotDuration, env.klendProgramId, env.kvaultProgramId);
 
       const farmAPY = await kaminoManager.getReserveFarmRewardsAPY(address(reserve), new Decimal(tokenPrice));
       console.log('farmAPY', farmAPY);
@@ -1471,6 +1469,37 @@ async function main() {
       }
     });
 
+  commands
+    .command('simulate-reserve-apy')
+    .requiredOption('--reserve <string>', 'Reserve address')
+    .action(async ({ reserve }) => {
+      const env = await initEnv();
+
+      const reserveState = await Reserve.fetch(env.c.rpc, address(reserve), env.klendProgramId);
+      if (!reserveState) {
+        throw new Error('Reserve not found');
+      }
+
+      const kaminoReserve = await KaminoReserve.initializeFromAddress(
+        address(reserve),
+        env.c.rpc,
+        DEFAULT_RECENT_SLOT_DURATION_MS,
+        reserveState
+      );
+
+      const slot = await env.c.rpc.getSlot({ commitment: 'confirmed' }).send();
+      const amount = new Decimal(0);
+      const simulatedApr = kaminoReserve.calcSimulatedSupplyAPR(amount, 'deposit', slot, 0);
+      console.log('simulated apr', simulatedApr);
+      const apy = calculateAPYFromAPR(simulatedApr);
+      console.log('simulated apy', apy);
+
+      const computedAPR = kaminoReserve.calculateSupplyAPR(slot, 0);
+      console.log('computed apr', computedAPR);
+      const computedAPY = kaminoReserve.totalSupplyAPY(slot);
+      console.log('computed apy', computedAPY);
+    });
+
   commands
     .command('get-oracle-mappings')
     .option(`--staging`, 'If true, will use the staging programs')