@kamino-finance/klend-sdk 5.10.0 → 5.10.2

package/dist/classes/vault.js

@@ -24,6 +24,9 @@ const bs58_1 = __importDefault(require("bs58"));
 const rpc_1 = require("../utils/rpc");
 const kliquidity_sdk_1 = require("@kamino-finance/kliquidity-sdk");
 const CreationParameters_1 = require("@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters");
+const dist_1 = require("@kamino-finance/farms-sdk/dist");
+const lut_utils_1 = require("./lut_utils");
+const farm_utils_1 = require("./farm_utils");
 exports.kaminoVaultId = new web3_js_1.PublicKey('kvauTFR8qm1dhniz6pYuBZkuene3Hfrs1VQhVRgCNrr');
 exports.kaminoVaultStagingId = new web3_js_1.PublicKey('STkvh7ostar39Fwr4uZKASs1RNNuYMFMTsE77FiRsL2');
 const TOKEN_VAULT_SEED = 'token_vault';
@@ -50,10 +53,12 @@ class KaminoVaultClient {
     getProgramID() {
         return this._kaminoVaultProgramId;
     }
+    hasFarm() {
+        return;
+    }
     /**
      * This method will create a vault with a given config. The config can be changed later on, but it is recommended to set it up correctly from the start
      * @param vaultConfig - the config object used to create a vault
-     * @returns vault - keypair, should be used to sign the transaction which creates the vault account
      * @returns vault: the keypair of the vault, used to sign the initialization transaction; initVaultIxs: a struct with ixs to initialize the vault and its lookup table + populateLUTIxs, a list to populate the lookup table which has to be executed in a separate transaction
      */
     async createVaultIxs(vaultConfig) {
@@ -62,7 +67,7 @@ class KaminoVaultClient {
         const createVaultIx = web3_js_1.SystemProgram.createAccount({
             fromPubkey: vaultConfig.admin,
             newAccountPubkey: vaultState.publicKey,
-            lamports: await this._connection.getMinimumBalanceForRentExemption(size),
+            lamports: await this.getConnection().getMinimumBalanceForRentExemption(size),
             space: size,
             programId: this._kaminoVaultProgramId,
         });
@@ -83,8 +88,8 @@ class KaminoVaultClient {
         };
         const initVaultIx = (0, instructions_1.initVault)(initVaultAccounts, this._kaminoVaultProgramId);
         // create and set up the vault lookup table
-        const slot = await this._connection.getSlot();
-        const [createLUTIx, lut] = this.getInitLookupTableIx(vaultConfig.admin, slot);
+        const slot = await this.getConnection().getSlot();
+        const [createLUTIx, lut] = (0, lut_utils_1.initLookupTableIx)(vaultConfig.admin, slot);
         const accountsToBeInserted = [
             vaultConfig.admin,
             vaultState.publicKey,
@@ -119,7 +124,7 @@ class KaminoVaultClient {
      * This method updates the vault reserve allocation cofnig for an exiting vault reserve, or adds a new reserve to the vault if it does not exist.
      * @param vault - vault to be updated
      * @param reserveAllocationConfig - new reserve allocation config
-     * @returns - a list of instructions
+     * @returns - a struct with an instruction to update the reserve allocation and an optional list of instructions to update the lookup table for the allocation changes
      */
     async updateReserveAllocationIxs(vault, reserveAllocationConfig) {
         const vaultState = await vault.getState(this.getConnection());
@@ -208,23 +213,48 @@ class KaminoVaultClient {
         updateVaultConfigIx.keys = updateVaultConfigIx.keys.concat(vaultReservesAccountMetas);
         updateVaultConfigIx.keys = updateVaultConfigIx.keys.concat(vaultReservesLendingMarkets);
         const updateLUTIxs = [];
-        if (mode.kind === new types_1.VaultConfigField.PendingVaultAdmin().kind || mode.kind === new types_1.VaultConfigField.Farm().kind) {
+        if (mode.kind === new types_1.VaultConfigField.PendingVaultAdmin().kind) {
             const newPubkey = new web3_js_1.PublicKey(value);
             const insertIntoLutIxs = await this.insertIntoLookupTableIxs(vaultState.adminAuthority, vaultState.vaultLookupTable, [newPubkey]);
             updateLUTIxs.push(...insertIntoLutIxs);
         }
+        else if (mode.kind === new types_1.VaultConfigField.Farm().kind) {
+            const keysToAddToLUT = [new web3_js_1.PublicKey(value)];
+            // if the farm already exist we want to read its state to add it to the LUT
+            try {
+                const farmState = await dist_1.FarmState.fetch(this.getConnection(), keysToAddToLUT[0]);
+                keysToAddToLUT.push(farmState.farmVault, farmState.farmVaultsAuthority, farmState.token.mint, farmState.scopePrices, farmState.globalConfig);
+                const insertIntoLutIxs = await this.insertIntoLookupTableIxs(vaultState.adminAuthority, vaultState.vaultLookupTable, keysToAddToLUT);
+                updateLUTIxs.push(...insertIntoLutIxs);
+            }
+            catch (error) {
+                console.log(`Error fetching farm ${keysToAddToLUT[0].toString()} state`, error);
+            }
+        }
         const updateVaultConfigIxs = {
             updateVaultConfigIx,
             updateLUTIxs,
         };
         return updateVaultConfigIxs;
     }
+    /** Sets the farm where the shares can be staked. This is store in vault state and a vault can only have one farm, so the new farm will ovveride the old farm
+     * @param vault - vault to set the farm for
+     * @param farm - the farm where the vault shares can be staked
+     * @param [errorOnOverride] - if true, the function will throw an error if the vault already has a farm. If false, it will override the farm
+     */
+    async setVaultFarm(vault, farm, errorOnOverride = true) {
+        const vaultHasFarm = await vault.hasFarm(this.getConnection());
+        if (vaultHasFarm && errorOnOverride) {
+            throw new Error('Vault already has a farm, if you want to override it set errorOnOverride to false');
+        }
+        return this.updateVaultConfigIxs(vault, new types_1.VaultConfigField.Farm(), farm.toBase58());
+    }
     /**
      * This method updates the vault config for a vault that
      * @param vault - address of vault to be updated
      * @param mode - the field to be updated
      * @param value - the new value for the field to be updated (number or pubkey)
-     * @returns - a list of instructions
+     * @returns - an instruction to update the vault config
      */
     updateUninitialisedVaultConfigIx(admin, vault, mode, value) {
         const updateVaultConfigAccs = {
@@ -257,7 +287,7 @@ class KaminoVaultClient {
     /**
      * This function creates the instruction for the `pendingAdmin` of the vault to accept to become the owner of the vault (step 2/2 of the ownership transfer)
      * @param vault - vault to change the ownership for
-     * @returns - an instruction to be used to be executed
+     * @returns - an instruction to accept the ownership of the vault and a list of instructions to update the lookup table
      */
     async acceptVaultOwnershipIxs(vault) {
         const vaultState = await vault.getState(this.getConnection());
@@ -267,9 +297,9 @@ class KaminoVaultClient {
         };
         const acceptVaultOwnershipIx = (0, instructions_1.updateAdmin)(acceptOwneshipAccounts, this._kaminoVaultProgramId);
         // read the current LUT and create a new one for the new admin and backfill it
-        const accountsInExistentLUT = (await this.getAccountsInLUT(vaultState.vaultLookupTable)).filter((account) => !account.equals(vaultState.adminAuthority));
+        const accountsInExistentLUT = (await (0, lut_utils_1.getAccountsInLUT)(this.getConnection(), vaultState.vaultLookupTable)).filter((account) => !account.equals(vaultState.adminAuthority));
         const LUTIxs = [];
-        const [initNewLUTIx, newLUT] = this.getInitLookupTableIx(vaultState.pendingAdmin, await this._connection.getSlot());
+        const [initNewLUTIx, newLUT] = (0, lut_utils_1.initLookupTableIx)(vaultState.pendingAdmin, await this.getConnection().getSlot());
         LUTIxs.push(initNewLUTIx);
         const insertIntoLUTIxs = await this.insertIntoLookupTableIxs(vaultState.pendingAdmin, newLUT, accountsInExistentLUT);
         LUTIxs.push(...insertIntoLUTIxs);
@@ -286,7 +316,7 @@ class KaminoVaultClient {
      * This function creates the instruction for the admin to give up a part of the pending fees (which will be accounted as part of the vault)
      * @param vault - vault to give up pending fees for
      * @param maxAmountToGiveUp - the maximum amount of fees to give up, in tokens
-     * @returns - an instruction to be used to be executed
+     * @returns - an instruction to give up the specified pending fees
      */
     async giveUpPendingFeesIx(vault, maxAmountToGiveUp) {
         const vaultState = await vault.getState(this.getConnection());
@@ -305,7 +335,8 @@ class KaminoVaultClient {
      * This method withdraws all the pending fees from the vault to the owner's token ATA
      * @param vault - vault for which the admin withdraws the pending fees
      * @param slot - current slot, used to estimate the interest earned in the different reserves with allocation from the vault
-     * @returns - list of instructions to withdraw all pending fees
+     * @param [vaultReservesMap] - a 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 - list of instructions to withdraw all pending fees, including the ATA creation instructions if needed
      */
     async withdrawPendingFeesIxs(vault, slot, vaultReservesMap) {
         const vaultState = await vault.getState(this.getConnection());
@@ -336,7 +367,7 @@ class KaminoVaultClient {
                 }
             });
         }
-        const reserveStates = await lib_1.Reserve.fetchMultiple(this._connection, reservesToWithdraw, this._kaminoLendProgramId);
+        const reserveStates = await lib_1.Reserve.fetchMultiple(this.getConnection(), reservesToWithdraw, this._kaminoLendProgramId);
         const withdrawIxns = await Promise.all(reservesToWithdraw.map(async (reserve, index) => {
             if (reserveStates[index] === null) {
                 throw new Error(`Reserve ${reserve.toBase58()} not found`);
@@ -358,13 +389,14 @@ class KaminoVaultClient {
     /**
      * This function creates instructions to deposit into a vault. It will also create ATA creation instructions for the vault shares that the user receives in return
      * @param user - user to deposit
-     * @param vault - vault to deposit into
+     * @param vault - vault to deposit into (if the state is not provided, it will be fetched)
      * @param tokenAmount - token amount to be deposited, in decimals (will be converted in lamports)
-     * @param vaultReservesMap - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
-     * @returns - an array of instructions to be used to be executed
+     * @param [vaultReservesMap] - optional parameter; a 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
+     * @param [farmState] - the state of the vault farm, if the vault has a farm. Optional. If not provided, it will be fetched
+     * @returns - an instance of DepositIxs which contains the instructions to deposit in vault and the instructions to stake the shares in the farm if the vault has a farm
      */
-    async depositIxs(user, vault, tokenAmount, vaultReservesMap) {
-        const vaultState = await vault.getState(this._connection);
+    async depositIxs(user, vault, tokenAmount, vaultReservesMap, farmState) {
+        const vaultState = await vault.getState(this.getConnection());
         const tokenProgramID = vaultState.tokenProgram;
         const userTokenAta = (0, lib_1.getAssociatedTokenAddress)(vaultState.tokenMint, user, true, tokenProgramID);
         const createAtasIxns = [];
@@ -423,30 +455,78 @@ class KaminoVaultClient {
         });
         depositIx.keys = depositIx.keys.concat(vaultReservesAccountMetas);
         depositIx.keys = depositIx.keys.concat(vaultReservesLendingMarkets);
-        return [...createAtasIxns, depositIx, ...closeAtasIxns];
+        const depositIxs = {
+            depositIxs: [...createAtasIxns, depositIx, ...closeAtasIxns],
+            stakeInFarmIfNeededIxs: [],
+        };
+        // if there is no farm, we can return the deposit instructions, otherwise include the stake ix in the response
+        if (!(await vault.hasFarm(this.getConnection()))) {
+            return depositIxs;
+        }
+        // if there is a farm, stake the shares
+        const stakeSharesIxs = await this.stakeSharesIxs(user, vault, undefined, farmState);
+        depositIxs.stakeInFarmIfNeededIxs = stakeSharesIxs;
+        return depositIxs;
+    }
+    /**
+     * This function creates instructions to stake the shares in the vault farm if the vault has a farm
+     * @param user - user to stake
+     * @param vault - vault to deposit into its farm (if the state is not provided, it will be fetched)
+     * @param [sharesAmount] - token amount to be deposited, in decimals (will be converted in lamports). Optional. If not provided, the user's share balance will be used
+     * @param [farmState] - the state of the vault farm, if the vault has a farm. Optional. If not provided, it will be fetched
+     * @returns - a list of instructions for the user to stake shares into the vault's farm, including the creation of prerequisite accounts if needed
+     */
+    async stakeSharesIxs(user, vault, sharesAmount, farmState) {
+        const vaultState = await vault.getState(this.getConnection());
+        let sharesToStakeLamports = new decimal_js_1.default(utils_2.U64_MAX);
+        if (sharesAmount) {
+            sharesToStakeLamports = (0, utils_1.numberToLamportsDecimal)(sharesAmount, vaultState.sharesMintDecimals.toNumber());
+        }
+        // if tokens to be staked are 0 or vault has no farm there is no stake needed
+        if (sharesToStakeLamports.lte(0) || !vault.hasFarm(this.getConnection())) {
+            return [];
+        }
+        // returns the ix to create the farm state account if needed and the ix to stake the shares
+        return (0, farm_utils_1.getFarmStakeIxs)(this.getConnection(), user, sharesToStakeLamports, vaultState.vaultFarm, farmState);
     }
     /**
-     * This function will return the missing ATA creation instructions, as well as one or multiple withdraw instructions, based on how many reserves it's needed to withdraw from. This might have to be split in multiple transactions
+     * This function will return a struct with the instructions to unstake from the farm if necessary and the instructions for the missing ATA creation instructions, as well as one or multiple withdraw instructions, based on how many reserves it's needed to withdraw from. This might have to be split in multiple transactions
      * @param user - user to withdraw
      * @param vault - vault to withdraw from
      * @param shareAmount - share amount to withdraw, in order to withdraw everything, any value > user share amount
      * @param slot - current slot, used to estimate the interest earned in the different reserves with allocation from the vault
-     * @returns an array of instructions to be executed
+     * @param [vaultReservesMap] - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
+     * @param [farmState] - the state of the vault farm, if the vault has a farm. Optional. If not provided, it will be fetched
+     * @returns an array of instructions to create missing ATAs if needed and the withdraw instructions
      */
-    async withdrawIxs(user, vault, shareAmount, slot, vaultReservesMap) {
-        const vaultState = await vault.getState(this._connection);
+    async withdrawIxs(user, vault, shareAmount, slot, vaultReservesMap, farmState) {
+        const vaultState = await vault.getState(this.getConnection());
         const kaminoVault = new KaminoVault(vault.address, vaultState, vault.programId);
+        const withdrawIxs = {
+            unstakeFromFarmIfNeededIxs: [],
+            withdrawIxs: [],
+        };
+        const shareLamportsToWithdraw = (0, kliquidity_sdk_1.collToLamportsDecimal)(shareAmount, vaultState.sharesMintDecimals.toNumber());
+        const hasFarm = await vault.hasFarm(this.getConnection());
+        if (hasFarm) {
+            const unstakeAndWithdrawFromFarmIxs = await (0, farm_utils_1.getFarmUnstakeAndWithdrawIxs)(this.getConnection(), user, shareLamportsToWithdraw, vaultState.vaultFarm, farmState);
+            withdrawIxs.unstakeFromFarmIfNeededIxs.push(unstakeAndWithdrawFromFarmIxs.unstakeIx);
+            withdrawIxs.unstakeFromFarmIfNeededIxs.push(unstakeAndWithdrawFromFarmIxs.withdrawIx);
+        }
         // if the vault has allocations withdraw otherwise wtihdraw from available ix
         const vaultAllocation = vaultState.vaultAllocationStrategy.find((allocation) => allocation.reserve.equals(web3_js_1.PublicKey.default));
         if (vaultAllocation) {
-            return this.wihdrdrawWithReserveIxns(user, kaminoVault, shareAmount, slot, vaultReservesMap);
+            const withdrawFromVaultIxs = await this.wihdrdrawWithReserveIxns(user, kaminoVault, shareAmount, slot, vaultReservesMap);
+            withdrawIxs.withdrawIxs = withdrawFromVaultIxs;
         }
         else {
-            return this.withdrawFromAvailableIxns(user, kaminoVault, shareAmount);
+            const withdrawFromVaultIxs = await this.withdrawFromAvailableIxns(user, kaminoVault, shareAmount);
+            withdrawIxs.withdrawIxs = withdrawFromVaultIxs;
         }
+        return withdrawIxs;
     }
     async withdrawFromAvailableIxns(user, vault, shareAmount) {
-        const vaultState = await vault.getState(this._connection);
+        const vaultState = await vault.getState(this.getConnection());
         const kaminoVault = new KaminoVault(vault.address, vaultState, vault.programId);
         const userSharesAta = (0, lib_1.getAssociatedTokenAddress)(vaultState.sharesMint, user);
         const [{ ata: userTokenAta, createAtaIx }] = (0, utils_2.createAtasIdempotent)(user, [
@@ -460,7 +540,7 @@ class KaminoVaultClient {
         return [createAtaIx, withdrawFromAvailableIxn];
     }
     async wihdrdrawWithReserveIxns(user, vault, shareAmount, slot, vaultReservesMap) {
-        const vaultState = await vault.getState(this._connection);
+        const vaultState = await vault.getState(this.getConnection());
         const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
         const userSharesAta = (0, lib_1.getAssociatedTokenAddress)(vaultState.sharesMint, user);
         const [{ ata: userTokenAta, createAtaIx }] = (0, utils_2.createAtasIdempotent)(user, [
@@ -508,7 +588,6 @@ class KaminoVaultClient {
         }
         const withdrawIxns = [];
         withdrawIxns.push(createAtaIx);
-        // let sharesLeftToWithdraw = shareAmount;
         for (let reserveIndex = 0; reserveIndex < reserveWithSharesAmountToWithdraw.length; reserveIndex++) {
             const reserveWithTokens = reserveWithSharesAmountToWithdraw[reserveIndex];
             const reserveState = vaultReservesState.get(reserveWithTokens.reserve);
@@ -527,6 +606,7 @@ class KaminoVaultClient {
         }
         return withdrawIxns;
     }
+    // todo: make sure we also check the ata of the investor for the vault token exists
     /**
      * This will trigger invest by balancing, based on weights, the reserve allocations of the vault. It can either withdraw or deposit into reserves to balance them. This is a function that should be cranked
      * @param payer wallet that pays the tx
@@ -535,11 +615,11 @@ class KaminoVaultClient {
      */
     async investAllReservesIxs(payer, vault) {
         //TODO: Order invest ixns by - invest that removes first, then invest that adds
-        const vaultState = await vault.getState(this._connection);
+        const vaultState = await vault.getState(this.getConnection());
         const vaultReserves = this.getVaultReserves(vaultState);
         const investIxnsPromises = [];
         for (const reserve of vaultReserves) {
-            const reserveState = await lib_1.Reserve.fetch(this._connection, reserve, this._kaminoLendProgramId);
+            const reserveState = await lib_1.Reserve.fetch(this.getConnection(), reserve, this._kaminoLendProgramId);
             if (reserveState === null) {
                 throw new Error(`Reserve ${reserve.toBase58()} not found`);
             }
@@ -549,18 +629,20 @@ class KaminoVaultClient {
         const investIxns = await Promise.all(investIxnsPromises).then((ixns) => ixns.flat());
         return investIxns;
     }
+    // todo: make sure we also check the ata of the investor for the vault token exists
     /**
      * This will trigger invest by balancing, based on weights, the reserve allocation of the vault. It can either withdraw or deposit into the given reserve to balance it
      * @param payer wallet pubkey
      * @param vault - vault to invest from
      * @param reserve - reserve to invest into or disinvest from
+     * @param [vaultReservesMap] - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
      * @returns - an array of invest instructions for each invest action required for the vault reserves
      */
     async investSingleReserveIxs(payer, vault, reserve, vaultReservesMap) {
-        const vaultState = await vault.getState(this._connection);
+        const vaultState = await vault.getState(this.getConnection());
         const cTokenVault = getCTokenVaultPda(vault.address, reserve.address, this._kaminoVaultProgramId);
         const lendingMarketAuth = (0, utils_2.lendingMarketAuthPda)(reserve.state.lendingMarket, this._kaminoLendProgramId)[0];
-        const tokenProgram = await (0, rpc_1.getAccountOwner)(this._connection, vaultState.tokenMint);
+        const tokenProgram = await (0, rpc_1.getAccountOwner)(this.getConnection(), vaultState.tokenMint);
         const [{ ata: payerTokenAta, createAtaIx }] = (0, utils_2.createAtasIdempotent)(payer, [
             { mint: vaultState.tokenMint, tokenProgram },
         ]);
@@ -604,12 +686,14 @@ class KaminoVaultClient {
         investIx.keys = investIx.keys.concat(vaultReservesLendingMarkets);
         return [createAtaIx, investIx];
     }
+    /** Convert a string to a u8 representation to be stored on chain */
     encodeVaultName(token) {
         const maxArray = new Uint8Array(40);
         const s = new TextEncoder().encode(token);
         maxArray.set(s);
         return maxArray;
     }
+    /**Convert an u8 array to a string */
     decodeVaultName(token) {
         const maxArray = new Uint8Array(token);
         let s = new TextDecoder().decode(maxArray);
@@ -733,10 +817,11 @@ class KaminoVaultClient {
      * Sync a vault for lookup table; create and set the LUT for the vault if needed and fill it with all the needed accounts
      * @param vault the vault to sync and set the LUT for if needed
      * @param vaultReserves optional; the state of the reserves in the vault allocation
+     * @param [vaultReservesMap] - optional parameter; a 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 that contains a list of ix to create the LUT and assign it to the vault if needed + a list of ixs to insert all the accounts in the LUT
      */
-    async syncVaultLookupTable(vault, vaultReserves) {
-        const vaultState = await vault.getState(this._connection);
+    async syncVaultLookupTableIxs(vault, vaultReservesMap) {
+        const vaultState = await vault.getState(this.getConnection());
         const allAccountsToBeInserted = [
             vault.address,
             vaultState.adminAuthority,
@@ -751,8 +836,8 @@ class KaminoVaultClient {
             allAccountsToBeInserted.push(allocation.reserve);
             allAccountsToBeInserted.push(allocation.ctokenVault);
         });
-        if (vaultReserves) {
-            vaultReserves.forEach((reserve) => {
+        if (vaultReservesMap) {
+            vaultReservesMap.forEach((reserve) => {
                 allAccountsToBeInserted.push(reserve.state.lendingMarket);
                 allAccountsToBeInserted.push(reserve.state.farmCollateral);
                 allAccountsToBeInserted.push(reserve.state.farmDebt);
@@ -780,8 +865,8 @@ class KaminoVaultClient {
         const setupLUTIfNeededIxs = [];
         let lut = vaultState.vaultLookupTable;
         if (lut.equals(web3_js_1.PublicKey.default)) {
-            const recentSlot = await this._connection.getSlot();
-            const [ixn, address] = this.getInitLookupTableIx(vaultState.adminAuthority, recentSlot);
+            const recentSlot = await this.getConnection().getSlot();
+            const [ixn, address] = (0, lut_utils_1.initLookupTableIx)(vaultState.adminAuthority, recentSlot);
             setupLUTIfNeededIxs.push(ixn);
             lut = address;
             // set the new LUT for the vault
@@ -799,14 +884,6 @@ class KaminoVaultClient {
             syncLUTIxs: ixns,
         };
     }
-    getInitLookupTableIx(payer, slot) {
-        const [ixn, address] = web3_js_1.AddressLookupTableProgram.createLookupTable({
-            authority: payer,
-            payer,
-            recentSlot: slot,
-        });
-        return [ixn, address];
-    }
     getReserveAccountsToInsertInLut(reserveState) {
         return [
             reserveState.lendingMarket,
@@ -819,10 +896,18 @@ class KaminoVaultClient {
             reserveState.collateral.supplyVault,
         ];
     }
+    /**
+     * This method inserts the missing keys from the provided keys into an existent lookup table
+     * @param payer - payer wallet pubkey
+     * @param lookupTable - lookup table to insert the keys into
+     * @param keys - keys to insert into the lookup table
+     * @param [accountsInLUT] - the existent accounts in the lookup table. Optional. If provided, the function will not fetch the accounts in the lookup table
+     * @returns - an array of instructions to insert the missing keys into the lookup table
+     */
     async insertIntoLookupTableIxs(payer, lookupTable, keys, accountsInLUT) {
         let lutContents = accountsInLUT;
         if (!accountsInLUT) {
-            lutContents = await this.getAccountsInLUT(lookupTable);
+            lutContents = await (0, lut_utils_1.getAccountsInLUT)(this.getConnection(), lookupTable);
         }
         else {
             lutContents = accountsInLUT;
@@ -844,79 +929,80 @@ class KaminoVaultClient {
         }
         return ixns;
     }
-    /**
-     *
-     * @param connection
-     * @param lookupTable
-     * @returns
-     */
-    async getAccountsInLUT(lookupTable) {
-        const lutState = await this._connection.getAddressLookupTable(lookupTable);
-        if (!lutState || !lutState.value) {
-            throw new Error(`Lookup table ${lookupTable} not found`);
-        }
-        return lutState.value.state.addresses;
-    }
-    deactivateLookupTableIx(payer, lookupTable) {
-        const ixn = web3_js_1.AddressLookupTableProgram.deactivateLookupTable({
-            authority: payer,
-            lookupTable: lookupTable,
-        });
-        return ixn;
-    }
-    /// this require the LUT to be deactivated at least 500 blocks before
-    closeLookupTableIx(payer, lookupTable) {
-        const ixn = web3_js_1.AddressLookupTableProgram.closeLookupTable({
-            authority: payer,
-            recipient: payer,
-            lookupTable: lookupTable,
-        });
-        return ixn;
-    }
     /**
      * This method returns the user shares balance for a given vault
      * @param user - user to calculate the shares balance for
      * @param vault - vault to calculate shares balance for
-     * @returns - user share balance in decimal (not lamports)
+     * @returns - user share balance in tokens (not lamports)
      */
     async getUserSharesBalanceSingleVault(user, vault) {
-        const vaultState = await vault.getState(this._connection);
+        const vaultState = await vault.getState(this.getConnection());
+        const userShares = { unstakedShares: new decimal_js_1.default(0), stakedShares: new decimal_js_1.default(0) };
         const userSharesAta = (0, lib_1.getAssociatedTokenAddress)(vaultState.sharesMint, user);
-        const userSharesAccountInfo = await this._connection.getAccountInfo(userSharesAta);
-        if (!userSharesAccountInfo) {
-            return new decimal_js_1.default(0);
+        const userSharesAccountInfo = await this.getConnection().getAccountInfo(userSharesAta);
+        if (userSharesAccountInfo) {
+            const userSharesAccount = (0, spl_token_1.unpackAccount)(userSharesAta, userSharesAccountInfo);
+            userShares.unstakedShares = new decimal_js_1.default(userSharesAccount.amount.toString()).div(new decimal_js_1.default(10).pow(vaultState.sharesMintDecimals.toString()));
+        }
+        if (await vault.hasFarm(this.getConnection())) {
+            const userSharesInFarm = await (0, farm_utils_1.getUserSharesInFarm)(this.getConnection(), user, vaultState.vaultFarm, vaultState.sharesMintDecimals.toNumber());
+            userShares.stakedShares = userSharesInFarm;
         }
-        const userSharesAccount = (0, spl_token_1.unpackAccount)(userSharesAta, userSharesAccountInfo);
-        return new decimal_js_1.default(userSharesAccount.amount.toString()).div(new decimal_js_1.default(10).pow(vaultState.sharesMintDecimals.toString()));
+        return userShares;
     }
     /**
      * This method returns the user shares balance for all existing vaults
      * @param user - user to calculate the shares balance for
-     * @param vaultsOverride - the kamino vaults if already fetched, in order to reduce rpc calls
-     * @returns - hash map with keyh as vault address and value as user share balance in decimal (not lamports)
+     * @param [vaultsOverride] - the kamino vaults if already fetched, in order to reduce rpc calls.Optional
+     * @returns - hash map with keys as vault address and value as user share balance in decimal (not lamports)
      */
     async getUserSharesBalanceAllVaults(user, vaultsOverride) {
         const vaults = vaultsOverride ? vaultsOverride : await this.getAllVaults();
         // stores vault address for each userSharesAta
         const vaultUserShareBalance = new lib_1.PubkeyHashMap();
+        const vaultToUserFarmStateAddress = new lib_1.PubkeyHashMap();
         const userSharesAtaArray = [];
-        vaults.forEach((vault) => {
+        vaults.forEach(async (vault) => {
             const state = vault.state;
             if (!state) {
                 throw new Error(`Vault ${vault.address.toBase58()} not fetched`);
             }
             const userSharesAta = (0, lib_1.getAssociatedTokenAddress)(state.sharesMint, user);
             userSharesAtaArray.push(userSharesAta);
+            if (await vault.hasFarm(this.getConnection())) {
+                const farmUserState = await (0, farm_utils_1.getFarmUserStatePDA)(this.getConnection(), user, state.vaultFarm);
+                vaultToUserFarmStateAddress.set(vault.address, farmUserState);
+            }
         });
-        const userSharesAtaAccounts = await this._connection.getMultipleAccountsInfo(userSharesAtaArray);
+        const [userSharesAtaAccounts, userFarmStates] = await Promise.all([
+            this.getConnection().getMultipleAccountsInfo(userSharesAtaArray),
+            lib_1.UserState.fetchMultiple(this.getConnection(), Array.from(vaultToUserFarmStateAddress.values())),
+        ]);
         userSharesAtaAccounts.forEach((userShareAtaAccount, index) => {
+            const userSharesForVault = { unstakedShares: new decimal_js_1.default(0), stakedShares: new decimal_js_1.default(0) };
             if (!userShareAtaAccount) {
-                vaultUserShareBalance.set(vaults[index].address, new decimal_js_1.default(0));
+                vaultUserShareBalance.set(vaults[index].address, userSharesForVault);
             }
             else {
-                vaultUserShareBalance.set(vaults[index].address, (0, utils_1.getTokenBalanceFromAccountInfoLamports)(userShareAtaAccount).div(new decimal_js_1.default(10).pow(vaults[index].state.sharesMintDecimals.toString())));
+                userSharesForVault.unstakedShares = (0, utils_1.getTokenBalanceFromAccountInfoLamports)(userShareAtaAccount).div(new decimal_js_1.default(10).pow(vaults[index].state.sharesMintDecimals.toString()));
+                vaultUserShareBalance.set(vaults[index].address, userSharesForVault);
             }
         });
+        userFarmStates.forEach((userFarmState, _) => {
+            if (!userFarmState) {
+                return;
+            }
+            const farmState = userFarmState.farmState;
+            // find the vault which has the farm
+            const vault = vaults.find((vault) => vault.state.vaultFarm.equals(farmState));
+            if (!vault) {
+                throw new Error(`Vault with farm ${farmState.toBase58()} not found`);
+            }
+            const shares = (0, farm_utils_1.getSharesInFarmUserPosition)(userFarmState, vault.state.sharesMintDecimals.toNumber());
+            const userSharesBalance = vaultUserShareBalance.get(vault.address);
+            userSharesBalance.stakedShares = shares;
+            vaultUserShareBalance.set(vault.address, userSharesBalance);
+        });
         return vaultUserShareBalance;
     }
     /**
@@ -934,23 +1020,23 @@ class KaminoVaultClient {
      * This method calculates the token per shar value. This will always change based on interest earned from the vault, but calculating it requires a bunch of rpc requests. Caching this for a short duration would be optimal
      * @param vault - vault to calculate tokensPerShare for
      * @param slot - current slot, used to estimate the interest earned in the different reserves with allocation from the vault
-     * @param vaultReservesMap - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
+     * @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 - token per share value
      */
     async getTokensPerShareSingleVault(vault, slot, vaultReservesMap) {
-        const vaultState = await vault.getState(this._connection);
+        const vaultState = await vault.getState(this.getConnection());
         if (vaultState.sharesIssued.isZero()) {
             return new decimal_js_1.default(0);
         }
         const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
         const sharesDecimal = (0, lib_1.lamportsToDecimal)(vaultState.sharesIssued.toString(), vaultState.sharesMintDecimals.toString());
-        const holdings = await this.getVaultHoldings(vaultState, await this._connection.getSlot('confirmed'), vaultReservesState);
+        const holdings = await this.getVaultHoldings(vaultState, await this.getConnection().getSlot('confirmed'), vaultReservesState);
         return holdings.total.div(sharesDecimal);
     }
     /**
      * This method calculates the token per share value. This will always change based on interest earned from the vault, but calculating it requires a bunch of rpc requests. Caching this for a short duration would be optimal
-     * @param vaultsOverride - a list of vaults to get the tokens per share for; if provided with state it will not fetch the state again
-     * @param vaultReservesMap - optional parameter; a hashmap from pubkey to reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
+     * @param [vaultsOverride] - a list of vaults to get the tokens per share for; if provided with state it will not fetch the state again. Optional
+     * @param [vaultReservesMap] - optional parameter; a 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
      * @param slot - current slot, used to estimate the interest earned in the different reserves with allocation from the vault
      * @returns - token per share value
      */
@@ -979,8 +1065,8 @@ class KaminoVaultClient {
                 },
             },
         ];
-        const kaminoVaults = await (0, rpc_1.getProgramAccounts)(this._connection, this._kaminoVaultProgramId, accounts_1.VaultState.layout.span + 8, {
-            commitment: this._connection.commitment ?? 'processed',
+        const kaminoVaults = await (0, rpc_1.getProgramAccounts)(this.getConnection(), this._kaminoVaultProgramId, accounts_1.VaultState.layout.span + 8, {
+            commitment: this.getConnection().commitment ?? 'processed',
             filters,
         });
         return kaminoVaults.map((kaminoVault) => {
@@ -1037,16 +1123,17 @@ class KaminoVaultClient {
      * This will return an unsorted hash map of all reserves that the given vault has allocations for, toghether with the amount that can be withdrawn from each of the reserves
      * @param vault - the kamino vault to get available liquidity to withdraw for
      * @param slot - current slot
+     *@param [vaultReservesMap] - a hashmap from each reserve pubkey to the reserve state
      * @returns an HashMap of reserves (key) with the amount available to withdraw for each (value)
      */
-    async getReserveAllocationAvailableLiquidityToWithdraw(vault, slot, reserves) {
-        const vaultState = await vault.getState(this._connection);
+    async getReserveAllocationAvailableLiquidityToWithdraw(vault, slot, vaultReservesMap) {
+        const vaultState = await vault.getState(this.getConnection());
         const reserveAllocationAvailableLiquidityToWithdraw = new lib_1.PubkeyHashMap();
         vaultState.vaultAllocationStrategy.forEach((allocationStrategy) => {
             if (allocationStrategy.reserve.equals(web3_js_1.PublicKey.default)) {
                 return;
             }
-            const reserve = reserves.get(allocationStrategy.reserve);
+            const reserve = vaultReservesMap.get(allocationStrategy.reserve);
             if (reserve === undefined) {
                 throw new Error(`Reserve ${allocationStrategy.reserve.toBase58()} not found`);
             }
@@ -1091,7 +1178,7 @@ class KaminoVaultClient {
      */
     async loadVaultReserves(vaultState) {
         const vaultReservesAddresses = this.getVaultReserves(vaultState);
-        const reserveAccounts = await this._connection.getMultipleAccountsInfo(vaultReservesAddresses, 'processed');
+        const reserveAccounts = await this.getConnection().getMultipleAccountsInfo(vaultReservesAddresses, 'processed');
         const deserializedReserves = reserveAccounts.map((reserve, i) => {
             if (reserve === null) {
                 // maybe reuse old here
@@ -1103,25 +1190,27 @@ class KaminoVaultClient {
             }
             return reserveAccount;
         });
-        const reservesAndOracles = await (0, lib_1.getTokenOracleData)(this._connection, deserializedReserves);
+        const reservesAndOracles = await (0, lib_1.getTokenOracleData)(this.getConnection(), deserializedReserves);
         const kaminoReserves = new lib_1.PubkeyHashMap();
         reservesAndOracles.forEach(([reserve, oracle], index) => {
             if (!oracle) {
                 throw Error(`Could not find oracle for ${(0, utils_1.parseTokenSymbol)(reserve.config.tokenInfo.name)} reserve`);
             }
-            const kaminoReserve = lib_1.KaminoReserve.initialize(reserveAccounts[index], vaultReservesAddresses[index], reserve, oracle, this._connection, this.recentSlotDurationMs);
+            const kaminoReserve = lib_1.KaminoReserve.initialize(reserveAccounts[index], vaultReservesAddresses[index], reserve, oracle, this.getConnection(), this.recentSlotDurationMs);
             kaminoReserves.set(kaminoReserve.address, kaminoReserve);
         });
         return kaminoReserves;
     }
     /**
-     * This will retrieve all the tokens that can be use as collateral by the users who borrow the token in the vault alongside details about the min and max loan to value ratio
+     * This will retrieve all the tokens that can be used as collateral by the users who borrow the token in the vault alongside details about the min and max loan to value ratio
      * @param vaultState - the vault state to load reserves 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
+     * @param [kaminoMarkets] - a list of all the kamino markets. Optional. If provided the function will be significantly faster as it will not have to fetch the markets
      * @returns a hashmap from each reserve pubkey to the market overview of the collaterals that can be used and the min and max loan to value ratio in that market
      */
-    async getVaultCollaterals(vaultState, slot, vaultReserves, kaminoMarkets) {
-        const vaultReservesStateMap = vaultReserves ? vaultReserves : await this.loadVaultReserves(vaultState);
+    async getVaultCollaterals(vaultState, slot, vaultReservesMap, kaminoMarkets) {
+        const vaultReservesStateMap = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
         const vaultReservesState = Array.from(vaultReservesStateMap.values());
         const vaultCollateralsPerReserve = new lib_1.PubkeyHashMap();
         for (const reserve of vaultReservesState) {
@@ -1131,7 +1220,7 @@ class KaminoVaultClient {
                 lendingMarket = kaminoMarkets?.find((market) => reserve.state.lendingMarket.equals(new web3_js_1.PublicKey(market.address)));
             }
             if (!lendingMarket) {
-                const fetchedLendingMarket = await lib_1.KaminoMarket.load(this._connection, reserve.state.lendingMarket, slot);
+                const fetchedLendingMarket = await lib_1.KaminoMarket.load(this.getConnection(), reserve.state.lendingMarket, slot);
                 if (!fetchedLendingMarket) {
                     throw Error(`Could not fetch lending market ${reserve.state.lendingMarket.toBase58()}`);
                 }
@@ -1171,8 +1260,8 @@ class KaminoVaultClient {
      * This will return an VaultHoldings object which contains the amount available (uninvested) in vault, total amount invested in reseves and a breakdown of the amount invested in each reserve
      * @param vault - the kamino vault to get available liquidity to withdraw for
      * @param slot - current slot
-     * @param vaultReserves - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
-     * @returns an VaultHoldings object
+     * @param vaultReserves - a 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 an VaultHoldings object representing the amount available (uninvested) in vault, total amount invested in reseves and a breakdown of the amount invested in each reserve
      */
     async getVaultHoldings(vault, slot, vaultReserves) {
         const vaultHoldings = {
@@ -1209,12 +1298,12 @@ class KaminoVaultClient {
      * This will return an VaultHoldingsWithUSDValue object which contains an holdings field representing the amount available (uninvested) in vault, total amount invested in reseves and a breakdown of the amount invested in each reserve and additional fields for the total USD value of the available and invested amounts
      * @param vault - the kamino vault to get available liquidity to withdraw for
      * @param slot - current slot
-     * @param vaultReserves - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
      * @param price - the price of the token in the vault (e.g. USDC)
+     * @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 an VaultHoldingsWithUSDValue object with details about the tokens available and invested in the vault, denominated in tokens and USD
      */
-    async getVaultHoldingsWithPrice(vault, slot, price, vaultReserves) {
-        const holdings = await this.getVaultHoldings(vault, slot, vaultReserves);
+    async getVaultHoldingsWithPrice(vault, slot, price, vaultReservesMap) {
+        const holdings = await this.getVaultHoldings(vault, slot, vaultReservesMap);
         const investedInReservesUSD = new lib_1.PubkeyHashMap();
         holdings.investedInReserves.forEach((amount, reserve) => {
             investedInReservesUSD.set(reserve, amount.mul(price));
@@ -1232,12 +1321,12 @@ class KaminoVaultClient {
      * @param vault - the kamino vault to get available liquidity to withdraw for
      * @param slot - current slot
      * @param price - the price of the token in the vault (e.g. USDC)
-     * @param vaultReserves - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
-     * @param kaminoMarkets - optional parameter; a list of all kamino markets. If provided the function will be significantly faster as it will not have to fetch the markets
-     * @returns an VaultHoldingsWithUSDValue object with details about the tokens available and invested in the vault, denominated in tokens and USD
+     * @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
+     * @param [kaminoMarkets] - a list of all kamino markets. Optional. If provided the function will be significantly faster as it will not have to fetch the markets
+     * @returns an VaultOverview object with details about the tokens available and invested in the vault, denominated in tokens and USD
      */
-    async getVaultOverview(vault, slot, price, vaultReserves, kaminoMarkets) {
-        const vaultReservesState = vaultReserves ? vaultReserves : await this.loadVaultReserves(vault);
+    async getVaultOverview(vault, slot, price, vaultReservesMap, kaminoMarkets) {
+        const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vault);
         const vaultHoldingsWithUSDValuePromise = await this.getVaultHoldingsWithPrice(vault, slot, price, vaultReservesState);
         const vaultTheoreticalAPYPromise = await this.getVaultTheoreticalAPY(vault, slot, vaultReservesState);
         const totalInvestedAndBorrowedPromise = await this.getTotalBorrowedAndInvested(vault, slot, vaultReservesState);
@@ -1265,11 +1354,11 @@ class KaminoVaultClient {
      * This will return an aggregation of the current state of the vault with all the invested amounts and the utilization ratio of the vault
      * @param vault - the kamino vault to get available liquidity to withdraw for
      * @param slot - current slot
-     * @param vaultReserves - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
+     * @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 an VaultReserveTotalBorrowedAndInvested object with the total invested amount, total borrowed amount and the utilization ratio of the vault
      */
-    async getTotalBorrowedAndInvested(vault, slot, vaultReserves) {
-        const vaultReservesState = vaultReserves ? vaultReserves : await this.loadVaultReserves(vault);
+    async getTotalBorrowedAndInvested(vault, slot, vaultReservesMap) {
+        const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vault);
         const totalAvailable = (0, lib_1.lamportsToDecimal)(new decimal_js_1.default(vault.tokenAvailable.toString()), new decimal_js_1.default(vault.tokenMintDecimals.toString()));
         let totalInvested = new decimal_js_1.default(0);
         let totalBorrowed = new decimal_js_1.default(0);
@@ -1302,7 +1391,7 @@ class KaminoVaultClient {
      * This will return an overview of each reserve that is part of the vault allocation
      * @param vault - the kamino vault to get available liquidity to withdraw for
      * @param slot - current slot
-     * @param vaultReserves - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
+     * @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 hashmap from vault reserve pubkey to ReserveOverview object
      */
     async getVaultReservesDetails(vault, slot, vaultReserves) {
@@ -1333,11 +1422,11 @@ class KaminoVaultClient {
      * This will return the APY of the vault under the assumption that all the available tokens in the vault are all the time invested in the reserves as ratio; for percentage it needs multiplication by 100
      * @param vault - the kamino vault to get APY for
      * @param slot - current slot
-     * @param vaultReserves - optional parameter; a hashmap from each reserve pubkey to the reserve state. If provided the function will be significantly faster as it will not have to fetch the reserves
+     * @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 APY for the vault
      */
-    async getVaultTheoreticalAPY(vault, slot, vaultReserves) {
-        const vaultReservesState = vaultReserves ? vaultReserves : await this.loadVaultReserves(vault);
+    async getVaultTheoreticalAPY(vault, slot, vaultReservesMap) {
+        const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vault);
         let totalWeights = new decimal_js_1.default(0);
         let totalAPY = new decimal_js_1.default(0);
         vault.vaultAllocationStrategy.forEach((allocationStrategy) => {
@@ -1362,7 +1451,7 @@ class KaminoVaultClient {
     /**
      * Retrive the total amount of interest earned by the vault since its inception, including what was charged as fees
      * @param vaultState the kamino vault state to get total net yield for
-     * @returns a decimal representing the net number of tokens earned by the vault since its inception
+     * @returns a Decimal representing the net number of tokens earned by the vault since its inception
      */
     async getVaultCumulativeInterest(vaultState) {
         const netYieldLamports = new fraction_1.Fraction(vaultState.cumulativeEarnedInterestSf).toDecimal();
@@ -1371,15 +1460,16 @@ class KaminoVaultClient {
     /**
      * Simulate the current holdings of the vault and the earned interest
      * @param vaultState the kamino vault state to get simulated holdings and earnings for
-     * @param vaultReserves optional; the state of the reserves in the vault allocation
+     * @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
+     * @param [currentSlot] - the current slot. Optional. If not provided it will fetch the current slot
      * @returns a struct of simulated vault holdings and earned interest
      */
-    async calculateSimulatedHoldingsWithInterest(vaultState, vaultReserves) {
+    async calculateSimulatedHoldingsWithInterest(vaultState, vaultReservesMap, currentSlot) {
         const latestUpdateTs = vaultState.lastFeeChargeTimestamp.toNumber();
         const lastUpdateSlot = latestUpdateTs / this.recentSlotDurationMs;
-        const currentSlot = await this._connection.getSlot('confirmed');
-        const lastUpdateHoldingsPromise = this.getVaultHoldings(vaultState, lastUpdateSlot, vaultReserves);
-        const currentHoldingsPromise = this.getVaultHoldings(vaultState, currentSlot, vaultReserves);
+        const slot = currentSlot ? currentSlot : await this.getConnection().getSlot('confirmed');
+        const lastUpdateHoldingsPromise = this.getVaultHoldings(vaultState, lastUpdateSlot, vaultReservesMap);
+        const currentHoldingsPromise = this.getVaultHoldings(vaultState, slot, vaultReservesMap);
         const [lastUpdateHoldings, currentHoldings] = await Promise.all([
             lastUpdateHoldingsPromise,
             currentHoldingsPromise,
@@ -1393,11 +1483,12 @@ class KaminoVaultClient {
     /**
      * Simulate the current holdings and compute the fees that would be charged
      * @param vaultState the kamino vault state to get simulated fees for
-     * @param simulatedCurrentHoldingsWithInterest optional; the simulated holdings and interest earned by the vault
-     * @returns a struct of simulated management and interest fees
+     * @param [simulatedCurrentHoldingsWithInterest] the simulated holdings and interest earned by the vault. Optional
+     * @param [currentTimestamp] the current timestamp. Optional. If not provided it will fetch the current unix timestamp
+     * @returns a VaultFees struct of simulated management and interest fees
      */
-    async calculateSimulatedFees(vaultState, simulatedCurrentHoldingsWithInterest) {
-        const timestampNow = new Date().getTime();
+    async calculateSimulatedFees(vaultState, simulatedCurrentHoldingsWithInterest, currentTimestamp) {
+        const timestampNow = currentTimestamp ? currentTimestamp : Date.now();
         const timestampLastUpdate = vaultState.lastFeeChargeTimestamp.toNumber();
         const timeElapsed = timestampNow - timestampLastUpdate;
         const simulatedCurrentHoldings = simulatedCurrentHoldingsWithInterest
@@ -1445,6 +1536,10 @@ class KaminoVault {
         }
         return this.state;
     }
+    async hasFarm(connection) {
+        const state = await this.getState(connection);
+        return !state.vaultFarm.equals(web3_js_1.PublicKey.default);
+    }
 }
 exports.KaminoVault = KaminoVault;
 /**