@kamino-finance/klend-sdk 6.0.3 → 6.0.5-beta.0

package/dist/classes/vault.d.ts

@@ -1,27 +1,27 @@
-import { Address, GetAccountInfoApi, IAccountMeta, IInstruction, ProgramDerivedAddress, Rpc, Slot, SolanaRpcApi, TransactionSigner } from '@solana/kit';
-import { KaminoMarket, KaminoReserve, Reserve } from '../lib';
-import { VaultConfigFieldKind } from '../@codegen/kvault/types';
-import { VaultState } from '../@codegen/kvault/accounts';
+import { Connection, Keypair, PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { KaminoMarket, KaminoReserve, PubkeyHashMap, Reserve } from '../lib';
+import { VaultConfigFieldKind } from '../idl_codegen_kamino_vault/types';
+import { VaultState } from '../idl_codegen_kamino_vault/accounts';
 import Decimal from 'decimal.js';
 import { ReserveWithAddress } from './reserve';
 import { AcceptVaultOwnershipIxs, APYs, DepositIxs, InitVaultIxs, ReserveAllocationOverview, SyncVaultLUTIxs, UpdateReserveAllocationIxs, UpdateVaultConfigIxs, UserSharesForVault, WithdrawAndBlockReserveIxs, WithdrawIxs } from './vault_types';
-import { FarmIncentives, FarmState } from '@kamino-finance/farms-sdk/dist';
-export declare const kaminoVaultId: Address<"KvauGMspG5k6rtzrqqn7WNn3oZdyKqLKwK2XWQ8FLjd">;
-export declare const kaminoVaultStagingId: Address<"stKvQfwRsQiKnLtMNVLHKS3exFJmZFsgfzBPWHECUYK">;
+import { FarmState } from '@kamino-finance/farms-sdk/dist';
+export declare const kaminoVaultId: PublicKey;
+export declare const kaminoVaultStagingId: PublicKey;
 export declare const METADATA_SEED = "metadata";
-export declare const METADATA_PROGRAM_ID: Address;
+export declare const METADATA_PROGRAM_ID: PublicKey;
 export declare const INITIAL_DEPOSIT_LAMPORTS = 1000;
 /**
  * KaminoVaultClient is a class that provides a high-level interface to interact with the Kamino Vault program.
  */
 export declare class KaminoVaultClient {
-    private readonly _rpc;
+    private readonly _connection;
     private readonly _kaminoVaultProgramId;
     private readonly _kaminoLendProgramId;
     recentSlotDurationMs: number;
-    constructor(rpc: Rpc<SolanaRpcApi>, recentSlotDurationMs: number, kaminoVaultprogramId?: Address, kaminoLendProgramId?: Address);
-    getConnection(): Rpc<import("@solana/kit").RequestAirdropApi & GetAccountInfoApi & import("@solana/kit").GetBalanceApi & import("@solana/kit").GetBlockApi & import("@solana/kit").GetBlockCommitmentApi & import("@solana/kit").GetBlockHeightApi & import("@solana/kit").GetBlockProductionApi & import("@solana/kit").GetBlocksApi & import("@solana/kit").GetBlocksWithLimitApi & import("@solana/kit").GetBlockTimeApi & import("@solana/kit").GetClusterNodesApi & import("@solana/kit").GetEpochInfoApi & import("@solana/kit").GetEpochScheduleApi & import("@solana/kit").GetFeeForMessageApi & import("@solana/kit").GetFirstAvailableBlockApi & import("@solana/kit").GetGenesisHashApi & import("@solana/kit").GetHealthApi & import("@solana/kit").GetHighestSnapshotSlotApi & import("@solana/kit").GetIdentityApi & import("@solana/kit").GetInflationGovernorApi & import("@solana/kit").GetInflationRateApi & import("@solana/kit").GetInflationRewardApi & import("@solana/kit").GetLargestAccountsApi & import("@solana/kit").GetLatestBlockhashApi & import("@solana/kit").GetLeaderScheduleApi & import("@solana/kit").GetMaxRetransmitSlotApi & import("@solana/kit").GetMaxShredInsertSlotApi & import("@solana/kit").GetMinimumBalanceForRentExemptionApi & import("@solana/kit").GetMultipleAccountsApi & import("@solana/kit").GetProgramAccountsApi & import("@solana/kit").GetRecentPerformanceSamplesApi & import("@solana/kit").GetRecentPrioritizationFeesApi & import("@solana/kit").GetSignaturesForAddressApi & import("@solana/kit").GetSignatureStatusesApi & import("@solana/kit").GetSlotApi & import("@solana/kit").GetSlotLeaderApi & import("@solana/kit").GetSlotLeadersApi & import("@solana/kit").GetStakeMinimumDelegationApi & import("@solana/kit").GetSupplyApi & import("@solana/kit").GetTokenAccountBalanceApi & import("@solana/kit").GetTokenAccountsByDelegateApi & import("@solana/kit").GetTokenAccountsByOwnerApi & import("@solana/kit").GetTokenLargestAccountsApi & import("@solana/kit").GetTokenSupplyApi & import("@solana/kit").GetTransactionApi & import("@solana/kit").GetTransactionCountApi & import("@solana/kit").GetVersionApi & import("@solana/kit").GetVoteAccountsApi & import("@solana/kit").IsBlockhashValidApi & import("@solana/kit").MinimumLedgerSlotApi & import("@solana/kit").SendTransactionApi & import("@solana/kit").SimulateTransactionApi>;
-    getProgramID(): Address;
+    constructor(connection: Connection, recentSlotDurationMs: number, kaminoVaultprogramId?: PublicKey, kaminoLendProgramId?: PublicKey);
+    getConnection(): Connection;
+    getProgramID(): PublicKey;
     hasFarm(): void;
     /**
      * Prints a vault in a human readable form
@@ -29,45 +29,40 @@ export declare class KaminoVaultClient {
      * @param [vaultState] - optional parameter to pass the vault state directly; this will save a network call
      * @returns - void; prints the vault to the console
      */
-    printVault(vaultPubkey: Address, vaultState?: VaultState): Promise<void>;
+    printVault(vaultPubkey: PublicKey, vaultState?: VaultState): Promise<void>;
     /**
      * 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: 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
      */
     createVaultIxs(vaultConfig: KaminoVaultConfig): Promise<{
-        vault: TransactionSigner;
-        lut: Address;
+        vault: Keypair;
         initVaultIxs: InitVaultIxs;
     }>;
     /**
      * This method creates an instruction to set the shares metadata for a vault
-     * @param rpc
-     * @param vaultAdmin
      * @param vault - the vault to set the shares metadata for
-     * @param sharesMint
-     * @param baseVaultAuthority
      * @param tokenName - the name of the token in the vault (symbol; e.g. "USDC" which becomes "kVUSDC")
      * @param extraName - the extra string appended to the prefix("Kamino Vault USDC <extraName>")
      * @returns - an instruction to set the shares metadata for the vault
      */
-    getSetSharesMetadataIx(rpc: Rpc<SolanaRpcApi>, vaultAdmin: TransactionSigner, vault: Address, sharesMint: Address, baseVaultAuthority: Address, tokenName: string, extraName: string): Promise<IInstruction<string, readonly (IAccountMeta<string> | import("@solana/kit").IAccountLookupMeta<string, string>)[]>>;
+    getSetSharesMetadataIx(connection: Connection, vaultAdmin: PublicKey, vault: PublicKey, sharesMint: PublicKey, baseVaultAuthority: PublicKey, tokenName: string, extraName: string): Promise<TransactionInstruction>;
     /**
-     * This method updates the vault reserve allocation config for an exiting vault reserve, or adds a new reserve to the vault if it does not exist.
+     * 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
-     * @param [vaultAdminAuthority] - vault admin - a noop vaultAdminAuthority is provided when absent for multisigs
+     * @param [signer] - optional parameter to pass a different signer for the instruction. If not provided, the admin of the vault will be used
      * @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
      */
-    updateReserveAllocationIxs(vault: KaminoVault, reserveAllocationConfig: ReserveAllocationConfig, vaultAdminAuthority?: TransactionSigner): Promise<UpdateReserveAllocationIxs>;
+    updateReserveAllocationIxs(vault: KaminoVault, reserveAllocationConfig: ReserveAllocationConfig, signer?: PublicKey): Promise<UpdateReserveAllocationIxs>;
     /**
      * This method withdraws all the funds from a reserve and blocks it from being invested by setting its weight and ctoken allocation to 0
      * @param vault - the vault to withdraw the funds from
      * @param reserve - the reserve to withdraw the funds from
-     * @param [vaultAdminAuthority] - vault admin - a noop vaultAdminAuthority is provided when absent for multisigs
+     * @param payer - the payer of the transaction. If not provided, the admin of the vault will be used
      * @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
      */
-    withdrawEverythingAndBlockInvestReserve(vault: KaminoVault, reserve: Address, vaultAdminAuthority?: TransactionSigner): Promise<WithdrawAndBlockReserveIxs>;
+    withdrawEverythingAndBlockInvestReserve(vault: KaminoVault, reserve: PublicKey, payer?: PublicKey): Promise<WithdrawAndBlockReserveIxs>;
     /**
      * This method withdraws all the funds from all the reserves and blocks them from being invested by setting their weight and ctoken allocation to 0
      * @param vault - the vault to withdraw the invested funds from
@@ -75,35 +70,31 @@ export declare class KaminoVaultClient {
      * @param [payer] - optional parameter to pass a different payer for the transaction. If not provided, the admin of the vault will be used; this is the payer for the invest ixs and it should have an ATA and some lamports (2x no_of_reserves) of the token vault
      * @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
      */
-    withdrawEverythingFromAllReservesAndBlockInvest(vault: KaminoVault, vaultReservesMap?: Map<Address, KaminoReserve>, payer?: TransactionSigner): Promise<WithdrawAndBlockReserveIxs>;
+    withdrawEverythingFromAllReservesAndBlockInvest(vault: KaminoVault, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>, payer?: PublicKey): Promise<WithdrawAndBlockReserveIxs>;
     /**
      * This method removes a reserve from the vault allocation strategy if already part of the allocation strategy
      * @param vault - vault to remove the reserve from
      * @param reserve - reserve to remove from the vault allocation strategy
-     * @param [vaultAdminAuthority] - vault admin - a noop vaultAdminAuthority is provided when absent for multisigs
      * @returns - an instruction to remove the reserve from the vault allocation strategy or undefined if the reserve is not part of the allocation strategy
      */
-    removeReserveFromAllocationIx(vault: KaminoVault, reserve: Address, vaultAdminAuthority?: TransactionSigner): Promise<IInstruction | undefined>;
+    removeReserveFromAllocationIx(vault: KaminoVault, reserve: PublicKey): Promise<TransactionInstruction | undefined>;
     /**
      * Update a field of the vault. If the field is a pubkey it will return an extra instruction to add that account into the lookup table
      * @param vault the vault to update
      * @param mode the field to update (based on VaultConfigFieldKind enum)
      * @param value the value to update the field with
-     * @param [vaultAdminAuthority] the signer of the transaction. Optional. If not provided the admin of the vault will be used. It should be used when changing the admin of the vault if we want to build or batch multiple ixs in the same tx
+     * @param [signer] the signer of the transaction. Optional. If not provided the admin of the vault will be used. It should be used when changing the admin of the vault if we want to build or batch multiple ixs in the same tx
      * @returns a struct that contains the instruction to update the field and an optional list of instructions to update the lookup table
      */
-    updateVaultConfigIxs(vault: KaminoVault, mode: VaultConfigFieldKind, value: string, vaultAdminAuthority?: TransactionSigner): Promise<UpdateVaultConfigIxs>;
+    updateVaultConfigIxs(vault: KaminoVault, mode: VaultConfigFieldKind, value: string, signer?: PublicKey): Promise<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
-     * @param [vaultAdminAuthority] - vault admin - a noop vaultAdminAuthority is provided when absent for multisigs
-     *
      */
-    setVaultFarmIxs(vault: KaminoVault, farm: Address, errorOnOverride?: boolean, vaultAdminAuthority?: TransactionSigner): Promise<UpdateVaultConfigIxs>;
+    setVaultFarmIxs(vault: KaminoVault, farm: PublicKey, errorOnOverride?: boolean): Promise<UpdateVaultConfigIxs>;
     /**
      * This method updates the vault config for a vault that
-     * @param admin - address of vault to be updated
      * @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)
@@ -113,28 +104,24 @@ export declare 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
-     * @param [pendingAdmin] - pending vault admin - a noop vaultAdminAuthority is provided when absent for multisigs
      * @returns - an instruction to accept the ownership of the vault and a list of instructions to update the lookup table
      */
-    acceptVaultOwnershipIxs(vault: KaminoVault, pendingAdmin?: TransactionSigner): Promise<AcceptVaultOwnershipIxs>;
+    acceptVaultOwnershipIxs(vault: KaminoVault): Promise<AcceptVaultOwnershipIxs>;
     /**
      * 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
-     * @param [vaultAdminAuthority] - vault admin - a noop vaultAdminAuthority is provided when absent for multisigs
      * @returns - an instruction to give up the specified pending fees
      */
-    giveUpPendingFeesIx(vault: KaminoVault, maxAmountToGiveUp: Decimal, vaultAdminAuthority?: TransactionSigner): Promise<IInstruction>;
+    giveUpPendingFeesIx(vault: KaminoVault, maxAmountToGiveUp: Decimal): Promise<TransactionInstruction>;
     /**
      * This method withdraws all the pending fees from the vault to the owner's token ATA
-     * @param authority - vault admin
      * @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
      * @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
-     * @param [vaultAdminAuthority] - vault admin - a noop vaultAdminAuthority is provided when absent for multisigs
      * @returns - list of instructions to withdraw all pending fees, including the ATA creation instructions if needed
      */
-    withdrawPendingFeesIxs(vault: KaminoVault, slot: Slot, vaultReservesMap?: Map<Address, KaminoReserve>, vaultAdminAuthority?: TransactionSigner): Promise<IInstruction[]>;
+    withdrawPendingFeesIxs(vault: KaminoVault, slot: number, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>): Promise<TransactionInstruction[]>;
     /**
      * 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
@@ -144,7 +131,7 @@ export declare class KaminoVaultClient {
      * @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
      */
-    depositIxs(user: TransactionSigner, vault: KaminoVault, tokenAmount: Decimal, vaultReservesMap?: Map<Address, KaminoReserve>, farmState?: FarmState): Promise<DepositIxs>;
+    depositIxs(user: PublicKey, vault: KaminoVault, tokenAmount: Decimal, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>, farmState?: FarmState): Promise<DepositIxs>;
     /**
      * This function creates instructions to stake the shares in the vault farm if the vault has a farm
      * @param user - user to stake
@@ -153,7 +140,7 @@ export declare class KaminoVaultClient {
      * @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
      */
-    stakeSharesIxs(user: TransactionSigner, vault: KaminoVault, sharesAmount?: Decimal, farmState?: FarmState): Promise<IInstruction[]>;
+    stakeSharesIxs(user: PublicKey, vault: KaminoVault, sharesAmount?: Decimal, farmState?: FarmState): Promise<TransactionInstruction[]>;
     /**
      * 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
@@ -164,7 +151,7 @@ export declare class KaminoVaultClient {
      * @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
      */
-    withdrawIxs(user: TransactionSigner, vault: KaminoVault, shareAmountToWithdraw: Decimal, slot: Slot, vaultReservesMap?: Map<Address, KaminoReserve>, farmState?: FarmState): Promise<WithdrawIxs>;
+    withdrawIxs(user: PublicKey, vault: KaminoVault, shareAmountToWithdraw: Decimal, slot: number, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>, farmState?: FarmState): Promise<WithdrawIxs>;
     private withdrawFromAvailableIxs;
     private withdrawWithReserveIxs;
     /**
@@ -173,17 +160,16 @@ export declare class KaminoVaultClient {
      * @param vault - vault to invest from
      * @returns - an array of invest instructions for each invest action required for the vault reserves
      */
-    investAllReservesIxs(payer: TransactionSigner, vault: KaminoVault): Promise<IInstruction[]>;
+    investAllReservesIxs(payer: PublicKey, vault: KaminoVault): Promise<TransactionInstruction[]>;
     /**
      * 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 - the instruction is permissionless and does not require the vault admin, due to rounding between cTokens and the underlying, the payer may have to contribute 1 or more lamports of the underlying from their token account
+     * @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
-     * @param [createAtaIfNeeded]
      * @returns - an array of invest instructions for each invest action required for the vault reserves
      */
-    investSingleReserveIxs(payer: TransactionSigner, vault: KaminoVault, reserve: ReserveWithAddress, vaultReservesMap?: Map<Address, KaminoReserve>, createAtaIfNeeded?: boolean): Promise<IInstruction[]>;
+    investSingleReserveIxs(payer: PublicKey, vault: KaminoVault, reserve: ReserveWithAddress, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>, createAtaIfNeeded?: boolean): Promise<TransactionInstruction[]>;
     /** Convert a string to a u8 representation to be stored on chain */
     encodeVaultName(token: string): Uint8Array;
     /**Convert an u8 array to a string */
@@ -193,22 +179,22 @@ export declare class KaminoVaultClient {
     private withdrawPendingFeesIx;
     /**
      * 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 authority - vault admin
      * @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
      */
-    syncVaultLookupTableIxs(authority: TransactionSigner, vault: KaminoVault, vaultReservesMap?: Map<Address, KaminoReserve>): Promise<SyncVaultLUTIxs>;
+    syncVaultLookupTableIxs(vault: KaminoVault, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>): Promise<SyncVaultLUTIxs>;
     private getReserveAccountsToInsertInLut;
     /**
      * This method inserts the missing keys from the provided keys into an existent lookup table
-     * @param authority - payer wallet pubkey
+     * @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
+     * @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
      */
-    insertIntoLookupTableIxs(authority: TransactionSigner, lookupTable: Address, keys: Address[], accountsInLut?: Address[]): Promise<IInstruction[]>;
+    insertIntoLookupTableIxs(payer: PublicKey, lookupTable: PublicKey, keys: PublicKey[], accountsInLUT?: PublicKey[]): Promise<TransactionInstruction[]>;
     /** Read the total holdings of a vault and the reserve weights and returns a map from each reserve to how many tokens should be deposited.
      * @param vaultState - the vault state to calculate the allocation for
      * @param [slot] - the slot for which to calculate the allocation. Optional. If not provided the function will fetch the current slot
@@ -216,21 +202,21 @@ export declare class KaminoVaultClient {
      * @param [currentSlot] - the latest confirmed slot. Optional. If provided the function will be  faster as it will not have to fetch the latest slot
      * @returns - a map from each reserve to how many tokens should be invested into
      */
-    getVaultComputedReservesAllocation(vaultState: VaultState, slot?: Slot, vaultReserves?: Map<Address, KaminoReserve>, currentSlot?: Slot): Promise<Map<Address, Decimal>>;
+    getVaultComputedReservesAllocation(vaultState: VaultState, slot?: number, vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>, currentSlot?: number): Promise<PubkeyHashMap<PublicKey, Decimal>>;
     /**
      * 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 tokens (not lamports)
      */
-    getUserSharesBalanceSingleVault(user: Address, vault: KaminoVault): Promise<UserSharesForVault>;
+    getUserSharesBalanceSingleVault(user: PublicKey, vault: KaminoVault): Promise<UserSharesForVault>;
     /**
      * 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.Optional
      * @returns - hash map with keys as vault address and value as user share balance in decimal (not lamports)
      */
-    getUserSharesBalanceAllVaults(user: Address, vaultsOverride?: Array<KaminoVault>): Promise<Map<Address, UserSharesForVault>>;
+    getUserSharesBalanceAllVaults(user: PublicKey, vaultsOverride?: Array<KaminoVault>): Promise<PubkeyHashMap<PublicKey, UserSharesForVault>>;
     /**
      * This method returns the management and performance fee percentages
      * @param vaultState - vault to retrieve the fees percentages from
@@ -245,7 +231,7 @@ export declare class KaminoVaultClient {
      * @param [currentSlot] - the latest confirmed slot. Optional. If provided the function will be  faster as it will not have to fetch the latest slot
      * @returns - token per share value
      */
-    getTokensPerShareSingleVault(vault: KaminoVault, slot?: Slot, vaultReservesMap?: Map<Address, KaminoReserve>, currentSlot?: Slot): Promise<Decimal>;
+    getTokensPerShareSingleVault(vault: KaminoVault, slot?: number, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>, currentSlot?: number): Promise<Decimal>;
     /**
      * 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. Optional
@@ -253,7 +239,7 @@ export declare class KaminoVaultClient {
      * @param slot - current slot, used to estimate the interest earned in the different reserves with allocation from the vault
      * @returns - token per share value
      */
-    getTokensPerShareAllVaults(slot: Slot, vaultsOverride?: Array<KaminoVault>, vaultReservesMap?: Map<Address, KaminoReserve>): Promise<Map<Address, Decimal>>;
+    getTokensPerShareAllVaults(slot: number, vaultsOverride?: Array<KaminoVault>, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>): Promise<PubkeyHashMap<PublicKey, Decimal>>;
     /**
      * Get all vaults
      * @returns an array of all vaults
@@ -264,35 +250,35 @@ export declare class KaminoVaultClient {
      * @param token - the token to get all vaults for
      * @returns an array of all vaults for the given token
      */
-    getAllVaultsForToken(token: Address): Promise<Array<KaminoVault>>;
+    getAllVaultsForToken(token: PublicKey): Promise<Array<KaminoVault>>;
     private getAllVaultsWithFilter;
     /**
      * Get a list of kaminoVaults
      * @param vaults - a list of vaults to get the states for; if not provided, all vaults will be fetched
      * @returns a list of vaults
      */
-    getVaults(vaults?: Array<Address>): Promise<Array<KaminoVault | null>>;
+    getVaults(vaults?: Array<PublicKey>): Promise<Array<KaminoVault | null>>;
     private getVaultsStates;
     /**
      * This will return the amount of token invested from the vault into the given reserve
-     * @param vaultState - the kamino vault to get invested amount in reserve for
+     * @param vault - the kamino vault to get invested amount in reserve for
      * @param slot - current slot
      * @param reserve - the reserve state to get vault invested amount in
      * @returns vault amount supplied in reserve in decimal
      */
-    getSuppliedInReserve(vaultState: VaultState, slot: Slot, reserve: KaminoReserve): Decimal;
+    getSuppliedInReserve(vaultState: VaultState, slot: number, reserve: KaminoReserve): Decimal;
     /**
      * This will return the a map between reserve pubkey and the pct of the vault invested amount in each reserve
      * @param vaultState - the kamino vault to get reserves distribution for
      * @returns a map between reserve pubkey and the allocation pct for the reserve
      */
-    getAllocationsDistribuionPct(vaultState: VaultState): Map<Address, Decimal>;
+    getAllocationsDistribuionPct(vaultState: VaultState): PubkeyHashMap<PublicKey, Decimal>;
     /**
      * This will return the a map between reserve pubkey and the allocation overview for the reserve
      * @param vaultState - the kamino vault to get reserves allocation overview for
      * @returns a map between reserve pubkey and the allocation overview for the reserve
      */
-    getVaultAllocations(vaultState: VaultState): Map<Address, ReserveAllocationOverview>;
+    getVaultAllocations(vaultState: VaultState): PubkeyHashMap<PublicKey, ReserveAllocationOverview>;
     /**
      * 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
@@ -306,19 +292,19 @@ export declare class KaminoVaultClient {
      * @param vault - the vault state to load reserves for
      * @returns a hashmap from each reserve pubkey to the reserve state
      */
-    getVaultReserves(vault: VaultState): Address[];
+    getVaultReserves(vault: VaultState): PublicKey[];
     /**
      * This will load the onchain state for all the reserves that the vault has allocations for
      * @param vaultState - the vault state to load reserves for
      * @returns a hashmap from each reserve pubkey to the reserve state
      */
-    loadVaultReserves(vaultState: VaultState): Promise<Map<Address, KaminoReserve>>;
+    loadVaultReserves(vaultState: VaultState): Promise<PubkeyHashMap<PublicKey, KaminoReserve>>;
     /**
      * This will load the onchain state for all the reserves that the vaults have allocations for, deduplicating the reserves
      * @param vaults - the vault states to load reserves for
      * @returns a hashmap from each reserve pubkey to the reserve state
      */
-    loadVaultsReserves(vaults: VaultState[]): Promise<Map<Address, KaminoReserve>>;
+    loadVaultsReserves(vaults: VaultState[]): Promise<PubkeyHashMap<PublicKey, KaminoReserve>>;
     /**
      * 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
@@ -327,7 +313,7 @@ export declare class KaminoVaultClient {
      * @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
      */
-    getVaultCollaterals(vaultState: VaultState, slot: Slot, vaultReservesMap?: Map<Address, KaminoReserve>, kaminoMarkets?: KaminoMarket[]): Promise<Map<Address, MarketOverview>>;
+    getVaultCollaterals(vaultState: VaultState, slot: number, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>, kaminoMarkets?: KaminoMarket[]): Promise<PubkeyHashMap<PublicKey, MarketOverview>>;
     /**
      * 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
@@ -336,7 +322,7 @@ export declare class KaminoVaultClient {
      * @param [currentSlot] - the latest confirmed slot. Optional. If provided the function will be  faster as it will not have to fetch the latest slot
      * @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
      */
-    getVaultHoldings(vault: VaultState, slot?: Slot, vaultReserves?: Map<Address, KaminoReserve>, currentSlot?: Slot): Promise<VaultHoldings>;
+    getVaultHoldings(vault: VaultState, slot?: number, vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>, currentSlot?: number): Promise<VaultHoldings>;
     /**
      * This will return an VaultOverview object that encapsulates all the information about the vault, including the holdings, reserves details, theoretical APY, utilization ratio and total borrowed amount
      * @param vault - the kamino vault to get available liquidity to withdraw for
@@ -346,7 +332,7 @@ export declare class KaminoVaultClient {
      * @param [currentSlot] - the latest confirmed slot. Optional. If provided the function will be  faster as it will not have to fetch the latest slot
      * @returns an VaultOverview object with details about the tokens available and invested in the vault, denominated in tokens and USD
      */
-    getVaultHoldingsWithPrice(vault: VaultState, price: Decimal, slot?: Slot, vaultReservesMap?: Map<Address, KaminoReserve>, currentSlot?: Slot): Promise<VaultHoldingsWithUSDValue>;
+    getVaultHoldingsWithPrice(vault: VaultState, price: Decimal, slot?: number, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>, currentSlot?: number): Promise<VaultHoldingsWithUSDValue>;
     /**
      * This will return an VaultOverview object that encapsulates all the information about the vault, including the holdings, reserves details, theoretical APY, utilization ratio and total borrowed amount
      * @param vault - the kamino vault to get available liquidity to withdraw for
@@ -357,7 +343,7 @@ export declare class KaminoVaultClient {
      * @param [currentSlot] - the latest confirmed slot. Optional. If provided the function will be  faster as it will not have to fetch the latest slot
      * @returns an VaultOverview object with details about the tokens available and invested in the vault, denominated in tokens and USD
      */
-    getVaultOverview(vault: VaultState, price: Decimal, slot?: Slot, vaultReservesMap?: Map<Address, KaminoReserve>, kaminoMarkets?: KaminoMarket[], currentSlot?: Slot): Promise<VaultOverview>;
+    getVaultOverview(vault: VaultState, price: Decimal, slot?: number, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>, kaminoMarkets?: KaminoMarket[], currentSlot?: number): Promise<VaultOverview>;
     /**
      * 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
@@ -365,7 +351,7 @@ export declare class KaminoVaultClient {
      * @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
      */
-    getTotalBorrowedAndInvested(vault: VaultState, slot: Slot, vaultReservesMap?: Map<Address, KaminoReserve>): Promise<VaultReserveTotalBorrowedAndInvested>;
+    getTotalBorrowedAndInvested(vault: VaultState, slot: number, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>): Promise<VaultReserveTotalBorrowedAndInvested>;
     /**
      * 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
@@ -373,7 +359,7 @@ export declare class KaminoVaultClient {
      * @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
      */
-    getVaultReservesDetails(vault: VaultState, slot: Slot, vaultReserves?: Map<Address, KaminoReserve>): Promise<Map<Address, ReserveOverview>>;
+    getVaultReservesDetails(vault: VaultState, slot: number, vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>): Promise<PubkeyHashMap<PublicKey, ReserveOverview>>;
     /**
      * 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
@@ -381,7 +367,7 @@ export declare class KaminoVaultClient {
      * @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
      */
-    getVaultTheoreticalAPY(vault: VaultState, slot: Slot, vaultReservesMap?: Map<Address, KaminoReserve>): Promise<APYs>;
+    getVaultTheoreticalAPY(vault: VaultState, slot: number, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>): Promise<APYs>;
     /**
      * 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
@@ -389,7 +375,7 @@ export declare class KaminoVaultClient {
      * @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
      */
-    getVaultActualAPY(vault: VaultState, slot: Slot, vaultReservesMap?: Map<Address, KaminoReserve>): Promise<APYs>;
+    getVaultActualAPY(vault: VaultState, slot: number, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>): Promise<APYs>;
     /**
      * 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
@@ -405,7 +391,7 @@ export declare class KaminoVaultClient {
      * @param [currentSlot] - the latest confirmed slot. Optional. If provided the function will be  faster as it will not have to fetch the latest slot
      * @returns a struct of simulated vault holdings and earned interest
      */
-    calculateSimulatedHoldingsWithInterest(vaultState: VaultState, vaultReservesMap?: Map<Address, KaminoReserve>, slot?: Slot, previousNetAUM?: Decimal, currentSlot?: Slot): Promise<SimulatedVaultHoldingsWithEarnedInterest>;
+    calculateSimulatedHoldingsWithInterest(vaultState: VaultState, vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>, slot?: number, previousNetAUM?: Decimal, currentSlot?: number): Promise<SimulatedVaultHoldingsWithEarnedInterest>;
     /**
      * Simulate the current holdings and compute the fees that would be charged
      * @param vaultState the kamino vault state to get simulated fees for
@@ -414,39 +400,27 @@ export declare class KaminoVaultClient {
      * @returns a VaultFees struct of simulated management and interest fees
      */
     calculateSimulatedFees(vaultState: VaultState, simulatedCurrentHoldingsWithInterest?: SimulatedVaultHoldingsWithEarnedInterest, currentTimestamp?: Date): Promise<VaultFees>;
-    /**
-     * This will compute the PDA that is used as delegatee in Farms program to compute the user state PDA for vault depositor investing in vault with reserve having a supply farm
-     */
-    computeUserFarmStateDelegateePDAForUserInVault(farmsProgramId: Address, vault: Address, reserve: Address, user: Address): Promise<ProgramDerivedAddress>;
-    /**
-     * Read the APY of the farm built on top of the vault (farm in vaultState.vaultFarm)
-     * @param vault - the vault to read the farm APY for
-     * @param vaultTokenPrice - the price of the vault token in USD (e.g. 1.0 for USDC)
-     * @param [slot] - the slot to read the farm APY for. Optional. If not provided, the function will read the current slot
-     * @returns the APY of the farm built on top of the vault
-     */
-    getVaultRewardsAPY(vault: KaminoVault, vaultTokenPrice: Decimal, slot?: Slot): Promise<FarmIncentives>;
-    private appendRemainingAccountsForVaultReserves;
+    computeUserFarmStateDelegateePDAForUserInVault(farmProgramID: PublicKey, vault: PublicKey, reserve: PublicKey, user: PublicKey): [PublicKey, number];
 }
 export declare class KaminoVault {
-    readonly address: Address;
+    readonly address: PublicKey;
     state: VaultState | undefined | null;
-    programId: Address;
-    constructor(vaultAddress: Address, state?: VaultState, programId?: Address);
-    getState(rpc: Rpc<GetAccountInfoApi>): Promise<VaultState>;
-    reloadState(rpc: Rpc<GetAccountInfoApi>): Promise<VaultState>;
-    hasFarm(rpc: Rpc<GetAccountInfoApi>): Promise<boolean>;
+    programId: PublicKey;
+    constructor(vaultAddress: PublicKey, state?: VaultState, programId?: PublicKey);
+    getState(connection: Connection): Promise<VaultState>;
+    reloadState(connection: Connection): Promise<VaultState>;
+    hasFarm(connection: Connection): Promise<boolean>;
 }
 /**
  * Used to initialize a Kamino Vault
  */
 export declare class KaminoVaultConfig {
     /** The admin of the vault */
-    readonly admin: TransactionSigner;
+    readonly admin: PublicKey;
     /** The token mint for the vault */
-    readonly tokenMint: Address;
+    readonly tokenMint: PublicKey;
     /** The token mint program id */
-    readonly tokenMintProgramId: Address;
+    readonly tokenMintProgramId: PublicKey;
     /** The performance fee rate of the vault, as percents, expressed as a decimal */
     readonly performanceFeeRatePercentage: Decimal;
     /** The management fee rate of the vault, as percents, expressed as a decimal */
@@ -458,9 +432,9 @@ export declare class KaminoVaultConfig {
     /** The name of the vault token to be stored (max 10 characters), after the prefix `Kamino Vault <vaultTokenSymbol>`. E.g. USDC Vault for a vault using USDC as token. */
     readonly vaultTokenName: string;
     constructor(args: {
-        admin: TransactionSigner;
-        tokenMint: Address;
-        tokenMintProgramId: Address;
+        admin: PublicKey;
+        tokenMint: PublicKey;
+        tokenMintProgramId: PublicKey;
         performanceFeeRatePercentage: Decimal;
         managementFeeRatePercentage: Decimal;
         name: string;
@@ -477,18 +451,18 @@ export declare class ReserveAllocationConfig {
     constructor(reserve: ReserveWithAddress, targetAllocationWeight: number, allocationCapDecimal: Decimal);
     getAllocationCapLamports(): Decimal;
     getReserveState(): Reserve;
-    getReserveAddress(): Address;
+    getReserveAddress(): PublicKey;
 }
-export declare function getCTokenVaultPda(vaultAddress: Address, reserveAddress: Address, kaminoVaultProgramId: Address): Promise<Address>;
-export declare function getEventAuthorityPda(kaminoVaultProgramId: Address): Promise<Address>;
+export declare function getCTokenVaultPda(vaultAddress: PublicKey, reserveAddress: PublicKey, kaminoVaultProgramId: PublicKey): PublicKey;
+export declare function getEventAuthorityPda(kaminoVaultProgramId: PublicKey): PublicKey;
 export type VaultHolder = {
-    holderPubkey: Address;
+    holderPubkey: PublicKey;
     amount: Decimal;
 };
 export type VaultHoldings = {
     available: Decimal;
     invested: Decimal;
-    investedInReserves: Map<Address, Decimal>;
+    investedInReserves: PubkeyHashMap<PublicKey, Decimal>;
     pendingFees: Decimal;
     totalAUMIncludingFees: Decimal;
 };
@@ -503,7 +477,7 @@ export type VaultHoldingsWithUSDValue = {
     holdings: VaultHoldings;
     availableUSD: Decimal;
     investedUSD: Decimal;
-    investedInReservesUSD: Map<Address, Decimal>;
+    investedInReservesUSD: PubkeyHashMap<PublicKey, Decimal>;
     totalUSDIncludingFees: Decimal;
     pendingFeesUSD: Decimal;
 };
@@ -514,7 +488,7 @@ export type ReserveOverview = {
     totalBorrowedAmount: Decimal;
     amountBorrowedFromSupplied: Decimal;
     suppliedAmount: Decimal;
-    market: Address;
+    market: PublicKey;
 };
 export type VaultReserveTotalBorrowedAndInvested = {
     totalInvested: Decimal;
@@ -522,20 +496,20 @@ export type VaultReserveTotalBorrowedAndInvested = {
     utilizationRatio: Decimal;
 };
 export type MarketOverview = {
-    address: Address;
+    address: PublicKey;
     reservesAsCollateral: ReserveAsCollateral[];
     minLTVPct: Decimal;
     maxLTVPct: Decimal;
 };
 export type ReserveAsCollateral = {
-    mint: Address;
+    mint: PublicKey;
     liquidationLTVPct: Decimal;
-    address: Address;
+    address: PublicKey;
 };
 export type VaultOverview = {
     holdingsUSD: VaultHoldingsWithUSDValue;
-    reservesOverview: Map<Address, ReserveOverview>;
-    vaultCollaterals: Map<Address, MarketOverview>;
+    reservesOverview: PubkeyHashMap<PublicKey, ReserveOverview>;
+    vaultCollaterals: PubkeyHashMap<PublicKey, MarketOverview>;
     theoreticalSupplyAPY: APYs;
     actualSupplyAPY: APYs;
     totalBorrowed: Decimal;