@kamino-finance/klend-sdk 6.0.4 → 6.0.5-beta.1

package/src/classes/manager.ts

@@ -1,19 +1,14 @@
 import {
-  Address,
-  IInstruction,
-  generateKeyPairSigner,
-  TransactionSigner,
-  Slot,
-  address,
-  Rpc,
-  SolanaRpcApi,
-  GetAccountInfoApi,
-  GetProgramAccountsDatasizeFilter,
-  GetProgramAccountsMemcmpFilter,
-  ProgramDerivedAddress,
-  Base58EncodedBytes,
-  getBase58Decoder,
-} from '@solana/kit';
+  AccountInfo,
+  Connection,
+  GetProgramAccountsResponse,
+  Keypair,
+  ParsedAccountData,
+  PublicKey,
+  SystemProgram,
+  SYSVAR_RENT_PUBKEY,
+  TransactionInstruction,
+} from '@solana/web3.js';
 import {
   KaminoVault,
   KaminoVaultClient,
@@ -35,7 +30,6 @@ import {
   AddAssetToMarketParams,
   CreateKaminoMarketParams,
   createReserveIxs,
-  DEFAULT_PUBLIC_KEY,
   ENV,
   getAllLendingMarketAccounts,
   getAllOracleAccounts,
@@ -54,6 +48,7 @@ import {
   parseForChangesReserveConfigAndGetIxs,
   parseOracleType,
   parseTokenSymbol,
+  PubkeyHashMap,
   Reserve,
   ReserveWithAddress,
   ScopeOracleConfig,
@@ -64,15 +59,18 @@ import {
   updateLendingMarketOwner,
   UpdateLendingMarketOwnerAccounts,
 } from '../lib';
-import { PROGRAM_ID } from '../@codegen/klend/programId';
-import { Scope, U16_MAX } from '@kamino-finance/scope-sdk';
-import { TokenMetadatas } from '@kamino-finance/scope-sdk/dist/@codegen/scope/accounts/TokenMetadatas';
+import { PROGRAM_ID } from '../idl_codegen/programId';
+import { Scope, TokenMetadatas, U16_MAX } from '@kamino-finance/scope-sdk';
 import BN from 'bn.js';
-import { ReserveConfig, UpdateLendingMarketMode, UpdateLendingMarketModeKind } from '../@codegen/klend/types';
+import { ReserveConfig, UpdateLendingMarketMode, UpdateLendingMarketModeKind } from '../idl_codegen/types';
 import Decimal from 'decimal.js';
-import { VaultState } from '../@codegen/kvault/accounts';
+import * as anchor from '@coral-xyz/anchor';
+import { VaultState } from '../idl_codegen_kamino_vault/accounts';
+import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
+import { Data } from '@kamino-finance/kliquidity-sdk';
+import bs58 from 'bs58';
 import { getProgramAccounts } from '../utils/rpc';
-import { VaultConfigField, VaultConfigFieldKind } from '../@codegen/kvault/types';
+import { VaultConfigField, VaultConfigFieldKind } from '../idl_codegen_kamino_vault/types';
 import {
   AcceptVaultOwnershipIxs,
   APYs,
@@ -86,49 +84,42 @@ import {
   WithdrawAndBlockReserveIxs,
   WithdrawIxs,
 } from './vault_types';
-import { FarmIncentives, Farms, FarmState } from '@kamino-finance/farms-sdk/dist';
+import { FarmState } from '@kamino-finance/farms-sdk/dist';
+import SwitchboardProgram from '@switchboard-xyz/sbv2-lite';
 import { getSquadsMultisigAdminsAndThreshold, walletIsSquadsMultisig, WalletType } from '../utils/multisig';
 import { decodeVaultState } from '../utils/vault';
-import { noopSigner } from '../utils/signer';
-import { getCreateAccountInstruction, SYSTEM_PROGRAM_ADDRESS } from '@solana-program/system';
-import { SYSVAR_RENT_ADDRESS } from '@solana/sysvars';
-import { TOKEN_PROGRAM_ADDRESS } from '@solana-program/token';
-import type { AccountInfoBase, AccountInfoWithJsonData, AccountInfoWithPubkey } from '@solana/rpc-types';
 import { arrayElementConfigItems, ConfigUpdater } from './configItems';
-import { getFarmIncentives, ReserveIncentives } from '@kamino-finance/farms-sdk/dist/utils/apy';
-
-const base58Decoder = getBase58Decoder();
 
 /**
  * KaminoManager is a class that provides a high-level interface to interact with the Kamino Lend and Kamino Vault programs, in order to create and manage a market, as well as vaults
  */
 export class KaminoManager {
-  private readonly _rpc: Rpc<SolanaRpcApi>;
-  private readonly _kaminoVaultProgramId: Address;
-  private readonly _kaminoLendProgramId: Address;
+  private readonly _connection: Connection;
+  private readonly _kaminoVaultProgramId: PublicKey;
+  private readonly _kaminoLendProgramId: PublicKey;
   private readonly _vaultClient: KaminoVaultClient;
   recentSlotDurationMs: number;
 
   constructor(
-    rpc: Rpc<SolanaRpcApi>,
+    connection: Connection,
     recentSlotDurationMs: number,
-    kaminoLendProgramId?: Address,
-    kaminoVaultProgramId?: Address
+    kaminoLendProgramId?: PublicKey,
+    kaminoVaultProgramId?: PublicKey
   ) {
-    this._rpc = rpc;
+    this._connection = connection;
     this.recentSlotDurationMs = recentSlotDurationMs;
     this._kaminoVaultProgramId = kaminoVaultProgramId ? kaminoVaultProgramId : kaminoVaultId;
     this._kaminoLendProgramId = kaminoLendProgramId ? kaminoLendProgramId : PROGRAM_ID;
     this._vaultClient = new KaminoVaultClient(
-      rpc,
+      connection,
       this.recentSlotDurationMs,
       this._kaminoVaultProgramId,
       this._kaminoLendProgramId
     );
   }
 
-  getRpc() {
-    return this._rpc;
+  getConnection() {
+    return this._connection;
   }
 
   getProgramID() {
@@ -141,28 +132,28 @@ export class KaminoManager {
    * @returns market keypair - keypair used for market account creation -> to be signed with when executing the transaction
    * @returns ixs - an array of ixs for creating and initializing the market account
    */
-  async createMarketIxs(params: CreateKaminoMarketParams): Promise<{ market: TransactionSigner; ixs: IInstruction[] }> {
-    const marketAccount = await generateKeyPairSigner();
-    const size = BigInt(LendingMarket.layout.span + 8);
-    const [lendingMarketAuthority] = await lendingMarketAuthPda(marketAccount.address, this._kaminoLendProgramId);
-    const createMarketIxs: IInstruction[] = [];
+  async createMarketIxs(params: CreateKaminoMarketParams): Promise<{ market: Keypair; ixs: TransactionInstruction[] }> {
+    const marketAccount = Keypair.generate();
+    const size = LendingMarket.layout.span + 8;
+    const [lendingMarketAuthority, _] = lendingMarketAuthPda(marketAccount.publicKey, this._kaminoLendProgramId);
+    const createMarketIxs: TransactionInstruction[] = [];
 
     createMarketIxs.push(
-      getCreateAccountInstruction({
-        payer: params.admin,
-        newAccount: marketAccount,
+      SystemProgram.createAccount({
+        fromPubkey: params.admin,
+        newAccountPubkey: marketAccount.publicKey,
+        lamports: await this._connection.getMinimumBalanceForRentExemption(size),
         space: size,
-        lamports: await this._rpc.getMinimumBalanceForRentExemption(size).send(),
-        programAddress: this._kaminoLendProgramId,
+        programId: this._kaminoLendProgramId,
       })
     );
 
     const accounts: InitLendingMarketAccounts = {
       lendingMarketOwner: params.admin,
-      lendingMarket: marketAccount.address,
+      lendingMarket: marketAccount.publicKey,
       lendingMarketAuthority: lendingMarketAuthority,
-      systemProgram: SYSTEM_PROGRAM_ADDRESS,
-      rent: SYSVAR_RENT_ADDRESS,
+      systemProgram: SystemProgram.programId,
+      rent: SYSVAR_RENT_PUBKEY,
     };
 
     const args: InitLendingMarketArgs = {
@@ -184,36 +175,34 @@ export class KaminoManager {
    */
   async addAssetToMarketIxs(
     params: AddAssetToMarketParams
-  ): Promise<{ reserve: TransactionSigner; txnIxs: IInstruction[][] }> {
-    const market = await LendingMarket.fetch(this._rpc, params.marketAddress, this._kaminoLendProgramId);
+  ): Promise<{ reserve: Keypair; txnIxs: TransactionInstruction[][] }> {
+    const market = await LendingMarket.fetch(this._connection, params.marketAddress, this._kaminoLendProgramId);
     if (!market) {
       throw new Error('Market not found');
     }
     const marketWithAddress: MarketWithAddress = { address: params.marketAddress, state: market };
 
-    const reserveAccount = await generateKeyPairSigner();
+    const reserveAccount = Keypair.generate();
 
     const createReserveInstructions = await createReserveIxs(
-      this._rpc,
+      this._connection,
       params.admin,
       params.adminLiquiditySource,
       params.marketAddress,
       params.assetConfig.mint,
-      params.assetConfig.mintTokenProgram,
-      reserveAccount,
+      reserveAccount.publicKey,
       this._kaminoLendProgramId
     );
 
     const updateReserveInstructions = await this.updateReserveIxs(
-      params.admin,
       marketWithAddress,
-      reserveAccount.address,
+      reserveAccount.publicKey,
       params.assetConfig.getReserveConfig(),
       undefined,
       false
     );
 
-    const txnIxs: IInstruction[][] = [];
+    const txnIxs: TransactionInstruction[][] = [];
     txnIxs.push(createReserveInstructions);
     txnIxs.push(updateReserveInstructions);
 
@@ -225,25 +214,22 @@ export class KaminoManager {
    * @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
    */
-  async createVaultIxs(
-    vaultConfig: KaminoVaultConfig
-  ): Promise<{ vault: TransactionSigner; lut: Address; initVaultIxs: InitVaultIxs }> {
+  async createVaultIxs(vaultConfig: KaminoVaultConfig): Promise<{ vault: Keypair; initVaultIxs: InitVaultIxs }> {
     return this._vaultClient.createVaultIxs(vaultConfig);
   }
 
   /**
    * This method creates an instruction to set the shares metadata for a vault
-   * @param authority - the vault admin
    * @param vault - the vault to set the shares metadata for
    * @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
    */
-  async getSetSharesMetadataIx(authority: TransactionSigner, vault: KaminoVault, tokenName: string, extraName: string) {
-    const vaultState = await vault.getState(this._rpc);
+  async getSetSharesMetadataIx(vault: KaminoVault, tokenName: string, extraName: string) {
+    const vaultState = await vault.getState(this._connection);
     return this._vaultClient.getSetSharesMetadataIx(
-      this._rpc,
-      authority,
+      this._connection,
+      vaultState.vaultAdminAuthority,
       vault.address,
       vaultState.sharesMint,
       vaultState.baseVaultAuthority,
@@ -262,7 +248,7 @@ export class KaminoManager {
   async updateVaultReserveAllocationIxs(
     vault: KaminoVault,
     reserveAllocationConfig: ReserveAllocationConfig,
-    signer?: TransactionSigner
+    signer?: PublicKey
   ): Promise<UpdateReserveAllocationIxs> {
     return this._vaultClient.updateReserveAllocationIxs(vault, reserveAllocationConfig, signer);
   }
@@ -271,94 +257,28 @@ export class KaminoManager {
    * 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
    */
   async removeReserveFromAllocationIx(
     vault: KaminoVault,
-    reserve: Address,
-    vaultAdminAuthority?: TransactionSigner
-  ): Promise<IInstruction | undefined> {
-    return this._vaultClient.removeReserveFromAllocationIx(vault, reserve, vaultAdminAuthority);
-  }
-
-  /**
-   * This method sets weight to 0, remove tokens and remove from allocation a reserve from the vault
-   * @param signer - signer to use for the transaction
-   * @param kaminoVault - vault to remove the reserve from
-   * @param reserveAddress - reserve to remove from the vault allocation strategy
-   * @param [reserveState] - optional parameter to pass a reserve state. If not provided, the reserve will be fetched from the connection
-   * @returns - an array of instructions to set the reserve allocation to 0, invest the reserve if it has tokens, and remove the reserve from the allocation
-   */
-  async fullRemoveReserveFromVaultIxs(
-    signer: TransactionSigner,
-    kaminoVault: KaminoVault,
-    reserveAddress: Address,
-    reserveState?: Reserve
-  ): Promise<IInstruction[]> {
-    const connection = this.getRpc();
-    const vaultState = await kaminoVault.getState(connection);
-
-    const allocations = this.getVaultReserves(vaultState);
-    if (!allocations.includes(reserveAddress)) {
-      throw new Error('Reserve not found in vault allocations');
-    }
-
-    const fetchedReserveState =
-      reserveState ?? (await Reserve.fetch(connection, reserveAddress, this._kaminoLendProgramId));
-    if (!fetchedReserveState) {
-      throw new Error('Reserve not found');
-    }
-    const reserveWithAddress: ReserveWithAddress = {
-      address: reserveAddress,
-      state: fetchedReserveState,
-    };
-
-    const kaminoReserve = await KaminoReserve.initializeFromAddress(
-      reserveAddress,
-      connection,
-      this.recentSlotDurationMs,
-      reserveState
-    );
-
-    const reserveAllocationConfig = new ReserveAllocationConfig(reserveWithAddress, 0, new Decimal(0));
-    const setAllocationToZeroIx = await this.updateVaultReserveAllocationIxs(
-      kaminoVault,
-      reserveAllocationConfig,
-      signer
-    );
-
-    const investIx = await this.investSingleReserveIxs(signer, kaminoVault, reserveWithAddress);
-
-    const removeAllocationIx = await this.removeReserveFromAllocationIx(kaminoVault, reserveAddress, signer);
-
-    const ixs = [setAllocationToZeroIx.updateReserveAllocationIx];
-
-    const slot = await connection.getSlot({ commitment: 'confirmed' }).send();
-    const suppliedInReserve = this.getSuppliedInReserve(vaultState, slot, kaminoReserve);
-    if (suppliedInReserve.gt(new Decimal(0))) {
-      ixs.push(...investIx);
-    }
-    if (removeAllocationIx) {
-      ixs.push(removeAllocationIx);
-    }
-
-    return ixs;
+    reserve: PublicKey
+  ): Promise<TransactionInstruction | undefined> {
+    return this._vaultClient.removeReserveFromAllocationIx(vault, reserve);
   }
 
   /**
    * 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
    */
   async withdrawEverythingAndBlockInvestReserve(
     vault: KaminoVault,
-    reserve: Address,
-    vaultAdminAuthority?: TransactionSigner
+    reserve: PublicKey,
+    payer?: PublicKey
   ): Promise<WithdrawAndBlockReserveIxs> {
-    return this._vaultClient.withdrawEverythingAndBlockInvestReserve(vault, reserve, vaultAdminAuthority);
+    return this._vaultClient.withdrawEverythingAndBlockInvestReserve(vault, reserve, payer);
   }
 
   /**
@@ -370,8 +290,8 @@ export class KaminoManager {
    */
   async withdrawEverythingFromAllReservesAndBlockInvest(
     vault: KaminoVault,
-    vaultReservesMap?: Map<Address, KaminoReserve>,
-    payer?: TransactionSigner
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>,
+    payer?: PublicKey
   ): Promise<WithdrawAndBlockReserveIxs> {
     return this._vaultClient.withdrawEverythingFromAllReservesAndBlockInvest(vault, vaultReservesMap, payer);
   }
@@ -385,8 +305,8 @@ export class KaminoManager {
    * @param reserve - reserve to get the config for
    * @returns - the reserve config
    */
-  async getReserveConfig(reserve: Address): Promise<ReserveConfig> {
-    const reserveState = await Reserve.fetch(this._rpc, reserve);
+  async getReserveConfig(reserve: PublicKey): Promise<ReserveConfig> {
+    const reserveState = await Reserve.fetch(this._connection, reserve);
     if (!reserveState) {
       throw new Error('Reserve not found');
     }
@@ -395,7 +315,6 @@ export class KaminoManager {
 
   /**
    * This function enables the update of the scope oracle configuration. In order to get a list of scope prices, getScopeOracleConfigs can be used
-   * @param lendingMarketOwner - market admin
    * @param market - lending market which owns the reserve
    * @param reserve - reserve which to be updated
    * @param scopeOracleConfig - new scope oracle config
@@ -404,13 +323,12 @@ export class KaminoManager {
    * @returns - an array of instructions used update the oracle configuration
    */
   async updateReserveScopeOracleConfigurationIxs(
-    lendingMarketOwner: TransactionSigner,
     market: MarketWithAddress,
     reserve: ReserveWithAddress,
     scopeOracleConfig: ScopeOracleConfig,
     scopeTwapConfig?: ScopeOracleConfig,
     maxAgeBufferSeconds: number = 20
-  ): Promise<IInstruction[]> {
+  ): Promise<TransactionInstruction[]> {
     const reserveConfig = reserve.state.config;
 
     let scopeTwapId = U16_MAX;
@@ -441,12 +359,11 @@ export class KaminoManager {
       },
     });
 
-    return this.updateReserveIxs(lendingMarketOwner, market, reserve.address, newReserveConfig, reserve.state);
+    return this.updateReserveIxs(market, reserve.address, newReserveConfig, reserve.state);
   }
 
   /**
    * This function updates the given reserve with a new config. It can either update the entire reserve config or just update fields which differ between given reserve and existing reserve
-   * @param lendingMarketOwner - market authority
    * @param marketWithAddress - the market that owns the reserve to be updated
    * @param reserve - the reserve to be updated
    * @param config - the new reserve configuration to be used for the update
@@ -455,22 +372,21 @@ export class KaminoManager {
    * @returns - an array of multiple update ixs. If there are many fields that are being updated without the updateEntireConfig=true, multiple transactions might be required to fit all ixs.
    */
   async updateReserveIxs(
-    lendingMarketOwner: TransactionSigner,
     marketWithAddress: MarketWithAddress,
-    reserve: Address,
+    reserve: PublicKey,
     config: ReserveConfig,
     reserveStateOverride?: Reserve,
     updateEntireConfig: boolean = false
-  ): Promise<IInstruction[]> {
+  ): Promise<TransactionInstruction[]> {
     const reserveState = reserveStateOverride
       ? reserveStateOverride
-      : (await Reserve.fetch(this._rpc, reserve, this._kaminoLendProgramId))!;
-    const ixs: IInstruction[] = [];
+      : (await Reserve.fetch(this._connection, reserve, this._kaminoLendProgramId))!;
+    const ixs: TransactionInstruction[] = [];
 
     if (!reserveState || updateEntireConfig) {
       ixs.push(
-        await updateEntireReserveConfigIx(
-          lendingMarketOwner,
+        updateEntireReserveConfigIx(
+          marketWithAddress.state.lendingMarketOwner,
           marketWithAddress.address,
           reserve,
           config,
@@ -479,14 +395,13 @@ export class KaminoManager {
       );
     } else {
       ixs.push(
-        ...(await parseForChangesReserveConfigAndGetIxs(
+        ...parseForChangesReserveConfigAndGetIxs(
           marketWithAddress,
           reserveState,
           reserve,
           config,
-          this._kaminoLendProgramId,
-          lendingMarketOwner
-        ))
+          this._kaminoLendProgramId
+        )
       );
     }
 
@@ -503,10 +418,10 @@ export class KaminoManager {
    * @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 depositToVaultIxs(
-    user: TransactionSigner,
+    user: PublicKey,
     vault: KaminoVault,
     tokenAmount: Decimal,
-    vaultReservesMap?: Map<Address, KaminoReserve>,
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>,
     farmState?: FarmState
   ): Promise<DepositIxs> {
     return this._vaultClient.depositIxs(user, vault, tokenAmount, vaultReservesMap, farmState);
@@ -521,11 +436,11 @@ export class KaminoManager {
    * @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: TransactionSigner,
+    user: PublicKey,
     vault: KaminoVault,
     sharesAmount?: Decimal,
     farmState?: FarmState
-  ): Promise<IInstruction[]> {
+  ): Promise<TransactionInstruction[]> {
     return this._vaultClient.stakeSharesIxs(user, vault, sharesAmount, farmState);
   }
 
@@ -541,7 +456,7 @@ export class KaminoManager {
     vault: KaminoVault,
     mode: VaultConfigFieldKind | string,
     value: string,
-    signer?: TransactionSigner
+    signer?: PublicKey
   ): Promise<UpdateVaultConfigIxs> {
     if (typeof mode === 'string') {
       const field = VaultConfigField.fromDecoded({ [mode]: '' });
@@ -555,43 +470,32 @@ export class KaminoManager {
    * @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
    */
   async setVaultFarmIxs(
     vault: KaminoVault,
-    farm: Address,
-    errorOnOverride: boolean = true,
-    vaultAdminAuthority?: TransactionSigner
+    farm: PublicKey,
+    errorOnOverride: boolean = true
   ): Promise<UpdateVaultConfigIxs> {
-    return this._vaultClient.setVaultFarmIxs(vault, farm, errorOnOverride, vaultAdminAuthority);
+    return this._vaultClient.setVaultFarmIxs(vault, farm, errorOnOverride);
   }
 
   /**
    * 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
    */
-  async acceptVaultOwnershipIxs(
-    vault: KaminoVault,
-    pendingAdmin?: TransactionSigner
-  ): Promise<AcceptVaultOwnershipIxs> {
-    return this._vaultClient.acceptVaultOwnershipIxs(vault, pendingAdmin);
+  async acceptVaultOwnershipIxs(vault: KaminoVault): Promise<AcceptVaultOwnershipIxs> {
+    return this._vaultClient.acceptVaultOwnershipIxs(vault);
   }
 
   /**
    * 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
    */
-  async giveUpPendingFeesIx(
-    vault: KaminoVault,
-    maxAmountToGiveUp: Decimal,
-    vaultAdminAuthority?: TransactionSigner
-  ): Promise<IInstruction> {
-    return this._vaultClient.giveUpPendingFeesIx(vault, maxAmountToGiveUp, vaultAdminAuthority);
+  async giveUpPendingFeesIx(vault: KaminoVault, maxAmountToGiveUp: Decimal): Promise<TransactionInstruction> {
+    return this._vaultClient.giveUpPendingFeesIx(vault, maxAmountToGiveUp);
   }
 
   /**
@@ -605,11 +509,11 @@ export class KaminoManager {
    * @returns an array of instructions to create missing ATAs if needed and the withdraw instructions
    */
   async withdrawFromVaultIxs(
-    user: TransactionSigner,
+    user: PublicKey,
     vault: KaminoVault,
     shareAmount: Decimal,
-    slot: Slot,
-    vaultReservesMap?: Map<Address, KaminoReserve>,
+    slot: number,
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>,
     farmState?: FarmState
   ): Promise<WithdrawIxs> {
     return this._vaultClient.withdrawIxs(user, vault, shareAmount, slot, vaultReservesMap, farmState);
@@ -619,47 +523,42 @@ export class KaminoManager {
    * 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
-   * @param [vaultAdminAuthority] - vault admin - a noop vaultAdminAuthority is provided when absent for multisigs
+   * @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: KaminoVault,
-    slot: Slot,
-    vaultAdminAuthority?: TransactionSigner
-  ): Promise<IInstruction[]> {
-    return this._vaultClient.withdrawPendingFeesIxs(vault, slot, undefined, vaultAdminAuthority);
+  async withdrawPendingFeesIxs(vault: KaminoVault, slot: number): Promise<TransactionInstruction[]> {
+    return this._vaultClient.withdrawPendingFeesIxs(vault, slot);
   }
 
   /**
    * This method inserts the missing keys from the provided keys into an existent lookup table
    * @param payer - payer wallet pubkey
-   * @param lut - lookup table to insert the keys into
+   * @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 insertIntoLutIxs(
-    payer: TransactionSigner,
-    lut: Address,
-    keys: Address[],
-    accountsInLUT?: Address[]
-  ): Promise<IInstruction[]> {
+  async insertIntoLUTIxs(
+    payer: PublicKey,
+    lut: PublicKey,
+    keys: PublicKey[],
+    accountsInLUT?: PublicKey[]
+  ): Promise<TransactionInstruction[]> {
     return this._vaultClient.insertIntoLookupTableIxs(payer, lut, keys, accountsInLUT);
   }
 
   /**
    * 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
    */
   async syncVaultLUTIxs(
-    authority: TransactionSigner,
     vault: KaminoVault,
-    vaultReserves?: Map<Address, KaminoReserve>
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>
   ): Promise<SyncVaultLUTIxs> {
-    return this._vaultClient.syncVaultLookupTableIxs(authority, vault, vaultReserves);
+    return this._vaultClient.syncVaultLookupTableIxs(vault, vaultReserves);
   }
 
   /**
@@ -672,9 +571,9 @@ export class KaminoManager {
    */
   async getTokensPerShareSingleVault(
     vault: KaminoVault,
-    slot?: Slot,
-    vaultReservesMap?: Map<Address, KaminoReserve>,
-    currentSlot?: Slot
+    slot?: number,
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>,
+    currentSlot?: number
   ): Promise<Decimal> {
     return this._vaultClient.getTokensPerShareSingleVault(vault, slot, vaultReservesMap, currentSlot);
   }
@@ -691,9 +590,9 @@ export class KaminoManager {
   async getSharePriceInUSD(
     vault: KaminoVault,
     tokenPrice: Decimal,
-    slot?: Slot,
-    vaultReservesMap?: Map<Address, KaminoReserve>,
-    currentSlot?: Slot
+    slot?: number,
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>,
+    currentSlot?: number
   ): Promise<Decimal> {
     const tokensPerShare = await this.getTokensPerShareSingleVault(vault, slot, vaultReservesMap, currentSlot);
     return tokensPerShare.mul(tokenPrice);
@@ -705,7 +604,7 @@ export class KaminoManager {
    * @param vault - vault to calculate shares balance for
    * @returns - a struct of user share balance (staked in vault farm if the vault has a farm and unstaked) in decimal (not lamports)
    */
-  async getUserSharesBalanceSingleVault(user: Address, vault: KaminoVault): Promise<UserSharesForVault> {
+  async getUserSharesBalanceSingleVault(user: PublicKey, vault: KaminoVault): Promise<UserSharesForVault> {
     return this._vaultClient.getUserSharesBalanceSingleVault(user, vault);
   }
 
@@ -716,9 +615,9 @@ export class KaminoManager {
    * @returns - hash map with keyh as vault address and value as user share balance in decimal (not lamports)
    */
   async getUserSharesBalanceAllVaults(
-    user: Address,
+    user: PublicKey,
     vaultsOverride?: KaminoVault[]
-  ): Promise<Map<Address, UserSharesForVault>> {
+  ): Promise<PubkeyHashMap<PublicKey, UserSharesForVault>> {
     return this._vaultClient.getUserSharesBalanceAllVaults(user, vaultsOverride);
   }
 
@@ -733,7 +632,7 @@ export class KaminoManager {
 
   /**
    * This method returns the vault name
-   * @param vaultState - vault to retrieve the onchain name for
+   * @param vault - vault to retrieve the onchain name for
    * @returns - the vault name as string
    */
   getDecodedVaultName(vaultState: VaultState): string {
@@ -759,45 +658,48 @@ export class KaminoManager {
    * Get all lending markets
    * @returns an array of all lending markets
    */
-  async getAllMarkets(programId: Address = PROGRAM_ID): Promise<KaminoMarket[]> {
+  async getAllMarkets(programId: PublicKey = PROGRAM_ID): Promise<KaminoMarket[]> {
     // Get all lending markets
-    const marketGenerator = getAllLendingMarketAccounts(this.getRpc(), programId);
+    const marketGenerator = getAllLendingMarketAccounts(this.getConnection(), programId);
     const slotDuration = await getMedianSlotDurationInMsFromLastEpochs();
 
-    const lendingMarketPairs: [Address, LendingMarket][] = [];
+    const lendingMarketPairs: [PublicKey, LendingMarket][] = [];
     for await (const pair of marketGenerator) {
       lendingMarketPairs.push(pair);
     }
 
     // Get all reserves
-    const allReserveAccounts = getAllReserveAccounts(this.getRpc());
-    const reservePairs: [Address, Reserve][] = [];
+    const allReserveAccounts = await getAllReserveAccounts(this.getConnection());
+    const reservePairs: [PublicKey, Reserve, AccountInfo<Buffer>][] = [];
     for await (const pair of allReserveAccounts) {
       reservePairs.push(pair);
     }
     const allReserves = reservePairs.map(([, reserve]) => reserve);
 
     // Get all oracle accounts
-    const allOracleAccounts = await getAllOracleAccounts(this.getRpc(), allReserves);
+    const allOracleAccounts = await getAllOracleAccounts(this.getConnection(), allReserves);
+    const switchboardV2 = await SwitchboardProgram.loadMainnet(this.getConnection());
+
     // Group reserves by market
-    const marketToReserve = new Map<Address, [Address, Reserve][]>();
-    for (const [reserveAddress, reserveState] of reservePairs) {
+    const marketToReserve = new PubkeyHashMap<PublicKey, [PublicKey, Reserve, AccountInfo<Buffer>][]>();
+    for (const [reserveAddress, reserveState, buffer] of reservePairs) {
       const marketAddress = reserveState.lendingMarket;
       if (!marketToReserve.has(marketAddress)) {
-        marketToReserve.set(marketAddress, [[reserveAddress, reserveState]]);
+        marketToReserve.set(marketAddress, [[reserveAddress, reserveState, buffer]]);
       } else {
-        marketToReserve.get(marketAddress)?.push([reserveAddress, reserveState]);
+        marketToReserve.get(marketAddress)?.push([reserveAddress, reserveState, buffer]);
       }
     }
 
     const combinedMarkets = lendingMarketPairs.map(([pubkey, market]) => {
       const reserves = marketToReserve.get(pubkey);
-      const reservesByAddress = new Map<Address, KaminoReserve>();
+      const reservesByAddress = new PubkeyHashMap<PublicKey, KaminoReserve>();
       if (!reserves) {
         console.log(`Market ${pubkey.toString()} ${parseTokenSymbol(market.name)} has no reserves`);
       } else {
+        const allBuffers = reserves.map(([, , account]) => account);
         const allReserves = reserves.map(([, reserve]) => reserve);
-        const reservesAndOracles = getTokenOracleDataSync(allOracleAccounts, allReserves);
+        const reservesAndOracles = getTokenOracleDataSync(allOracleAccounts, switchboardV2, allReserves);
         reservesAndOracles.forEach(([reserve, oracle], index) => {
           if (!oracle) {
             console.log('Manager > getAllMarkets: oracle not found for reserve', reserve.config.tokenInfo.name);
@@ -805,17 +707,18 @@ export class KaminoManager {
           }
 
           const kaminoReserve = KaminoReserve.initialize(
+            allBuffers[index],
             reserves[index][0],
             reserves[index][1],
             oracle,
-            this.getRpc(),
+            this.getConnection(),
             this.recentSlotDurationMs
           );
           reservesByAddress.set(kaminoReserve.address, kaminoReserve);
         });
       }
 
-      return KaminoMarket.loadWithReserves(this.getRpc(), market, reservesByAddress, pubkey, slotDuration);
+      return KaminoMarket.loadWithReserves(this.getConnection(), market, reservesByAddress, pubkey, slotDuration);
     });
 
     return combinedMarkets;
@@ -826,37 +729,46 @@ export class KaminoManager {
    * @param owner the pubkey of the vaults owner
    * @returns an array of all vaults owned by a given pubkey
    */
-  async getAllVaultsForOwner(owner: Address): Promise<KaminoVault[]> {
-    const size = VaultState.layout.span + 8;
-    const filters: (GetProgramAccountsDatasizeFilter | GetProgramAccountsMemcmpFilter)[] = [
+  async getAllVaultsForOwner(owner: PublicKey): Promise<KaminoVault[]> {
+    const filters = [
       {
-        dataSize: BigInt(size),
+        dataSize: VaultState.layout.span + 8,
       },
       {
         memcmp: {
-          offset: 0n,
-          bytes: base58Decoder.decode(VaultState.discriminator) as Base58EncodedBytes,
-          encoding: 'base58',
+          offset: 0,
+          bytes: bs58.encode(VaultState.discriminator),
         },
       },
       {
         memcmp: {
-          offset: 8n,
-          bytes: owner.toString() as Base58EncodedBytes,
-          encoding: 'base58',
+          offset: 8,
+          bytes: owner.toBase58(),
         },
       },
     ];
 
-    const kaminoVaults = await getProgramAccounts(this._rpc, this._kaminoVaultProgramId, size, filters);
+    const kaminoVaults: GetProgramAccountsResponse = await getProgramAccounts(
+      this._connection,
+      this._kaminoVaultProgramId,
+      VaultState.layout.span + 8,
+      {
+        commitment: this._connection.commitment ?? 'processed',
+        filters,
+      }
+    );
 
     return kaminoVaults.map((kaminoVault) => {
-      const kaminoVaultAccount = decodeVaultState(kaminoVault.data);
+      if (kaminoVault.account === null) {
+        throw new Error(`kaminoVault with pubkey ${kaminoVault.pubkey.toString()} does not exist`);
+      }
+
+      const kaminoVaultAccount = decodeVaultState(kaminoVault.account.data);
       if (!kaminoVaultAccount) {
-        throw Error(`kaminoVault with pubkey ${kaminoVault.address} could not be decoded`);
+        throw Error(`kaminoVault with pubkey ${kaminoVault.pubkey.toString()} could not be decoded`);
       }
 
-      return new KaminoVault(kaminoVault.address, kaminoVaultAccount, this._kaminoVaultProgramId);
+      return new KaminoVault(kaminoVault.pubkey, kaminoVaultAccount, this._kaminoVaultProgramId);
     });
   }
 
@@ -865,7 +777,7 @@ export class KaminoManager {
    * @param vaults - a list of vaults to get the states for; if not provided, all vaults will be fetched
    * @returns a list of KaminoVaults
    */
-  async getVaults(vaults?: Array<Address>): Promise<Array<KaminoVault | null>> {
+  async getVaults(vaults?: Array<PublicKey>): Promise<Array<KaminoVault | null>> {
     return this._vaultClient.getVaults(vaults);
   }
 
@@ -875,20 +787,14 @@ export class KaminoManager {
    * @returns an array of all holders tokenAccounts pubkeys and their account info
    */
   async getShareTokenAccounts(
-    shareMint: Address
-  ): Promise<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithJsonData>[]> {
+    shareMint: PublicKey
+  ): Promise<{ pubkey: PublicKey; account: AccountInfo<Buffer | ParsedAccountData> }[]> {
     //how to get all token accounts for specific mint: https://spl.solana.com/token#finding-all-token-accounts-for-a-specific-mint
     //get it from the hardcoded token program and create a filter with the actual mint address
     //datasize:165 filter selects all token accounts, memcmp filter selects based on the mint address withing each token account
-    return this._rpc
-      .getProgramAccounts(TOKEN_PROGRAM_ADDRESS, {
-        filters: [
-          { dataSize: 165n },
-          { memcmp: { offset: 0n, bytes: shareMint.toString() as Base58EncodedBytes, encoding: 'base58' } },
-        ],
-        encoding: 'jsonParsed',
-      })
-      .send();
+    return this._connection.getParsedProgramAccounts(TOKEN_PROGRAM_ID, {
+      filters: [{ dataSize: 165 }, { memcmp: { offset: 0, bytes: shareMint.toBase58() } }],
+    });
   }
 
   /**
@@ -898,8 +804,8 @@ export class KaminoManager {
    */
   async getVaultTokenAccounts(
     vault: KaminoVault
-  ): Promise<AccountInfoWithPubkey<AccountInfoBase & AccountInfoWithJsonData>[]> {
-    const vaultState = await vault.getState(this._rpc);
+  ): Promise<{ pubkey: PublicKey; account: AccountInfo<Buffer | ParsedAccountData> }[]> {
+    const vaultState = await vault.getState(this._connection);
     return this.getShareTokenAccounts(vaultState.sharesMint);
   }
 
@@ -909,25 +815,13 @@ export class KaminoManager {
    * @returns an array of all vault holders with their pubkeys and amounts
    */
   getVaultHolders = async (vault: KaminoVault): Promise<VaultHolder[]> => {
-    await vault.getState(this._rpc);
+    await vault.getState(this._connection);
     const tokenAccounts = await this.getVaultTokenAccounts(vault);
     const result: VaultHolder[] = [];
     for (const tokenAccount of tokenAccounts) {
-      const accountData = tokenAccount.account.data as Readonly<{
-        parsed: {
-          info: {
-            owner: string;
-            tokenAmount: {
-              uiAmountString: string;
-            };
-          };
-          type: string;
-        };
-        program: string;
-        space: bigint;
-      }>;
+      const accountData = tokenAccount.account.data as Data;
       result.push({
-        holderPubkey: address(accountData.parsed.info.owner),
+        holderPubkey: new PublicKey(accountData.parsed.info.owner),
         amount: new Decimal(accountData.parsed.info.tokenAmount.uiAmountString),
       });
     }
@@ -939,7 +833,7 @@ export class KaminoManager {
    * @param token - the token to get all vaults for
    * @returns an array of all vaults for the given token
    */
-  async getAllVaultsForToken(token: Address): Promise<Array<KaminoVault>> {
+  async getAllVaultsForToken(token: PublicKey): Promise<Array<KaminoVault>> {
     return this._vaultClient.getAllVaultsForToken(token);
   }
 
@@ -953,9 +847,9 @@ export class KaminoManager {
    */
   async getVaultHoldings(
     vault: VaultState,
-    slot?: Slot,
-    vaultReserves?: Map<Address, KaminoReserve>,
-    currentSlot?: Slot
+    slot?: number,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>,
+    currentSlot?: number
   ): Promise<VaultHoldings> {
     return this._vaultClient.getVaultHoldings(vault, slot, vaultReserves, currentSlot);
   }
@@ -965,16 +859,16 @@ export class KaminoManager {
    * @param vault - the kamino vault to get available liquidity to withdraw for
    * @param price - the price of the token in the vault (e.g. USDC)
    * @param [slot] - the slot for which to calculate the holdings. Optional. If not provided the function will fetch the current slot
-   * @param [vaultReserves]
+   * @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 latest confirmed slot. Optional. If provided the function will be  faster as it will not have to fetch the latest slot
    * @returns an VaultHoldingsWithUSDValue object with details about the tokens available and invested in the vault, denominated in tokens and USD
    */
   async getVaultHoldingsWithPrice(
     vault: VaultState,
     price: Decimal,
-    slot?: Slot,
-    vaultReserves?: Map<Address, KaminoReserve>,
-    currentSlot?: Slot
+    slot?: number,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>,
+    currentSlot?: number
   ): Promise<VaultHoldingsWithUSDValue> {
     return this._vaultClient.getVaultHoldingsWithPrice(vault, price, slot, vaultReserves, currentSlot);
   }
@@ -984,7 +878,7 @@ export class KaminoManager {
    * @param vault - the kamino vault to get available liquidity to withdraw for
    * @param price - the price of the token in the vault (e.g. USDC)
    * @param [slot] - the slot for which to retrieve the vault overview for. Optional. If not provided the function will fetch the current slot
-   * @param [vaultReserves] - 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 [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
    * @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
@@ -992,10 +886,10 @@ export class KaminoManager {
   async getVaultOverview(
     vault: VaultState,
     price: Decimal,
-    slot?: Slot,
-    vaultReserves?: Map<Address, KaminoReserve>,
+    slot?: number,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>,
     kaminoMarkets?: KaminoMarket[],
-    currentSlot?: Slot
+    currentSlot?: number
   ): Promise<VaultOverview> {
     return this._vaultClient.getVaultOverview(vault, price, slot, vaultReserves, kaminoMarkets, currentSlot);
   }
@@ -1006,7 +900,7 @@ export class KaminoManager {
    * @param [vaultState] - optional parameter to pass the vault state directly; this will save a network call
    * @returns - void; prints the vault to the console
    */
-  async printVault(vaultPubkey: Address, vaultState?: VaultState) {
+  async printVault(vaultPubkey: PublicKey, vaultState?: VaultState) {
     return this._vaultClient.printVault(vaultPubkey, vaultState);
   }
 
@@ -1019,8 +913,8 @@ export class KaminoManager {
    */
   async getTotalBorrowedAndInvested(
     vault: VaultState,
-    slot: Slot,
-    vaultReserves?: Map<Address, KaminoReserve>
+    slot: number,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>
   ): Promise<VaultReserveTotalBorrowedAndInvested> {
     return this._vaultClient.getTotalBorrowedAndInvested(vault, slot, vaultReserves);
   }
@@ -1034,9 +928,9 @@ export class KaminoManager {
    */
   async getVaultReservesDetails(
     vault: VaultState,
-    slot: Slot,
-    vaultReserves?: Map<Address, KaminoReserve>
-  ): Promise<Map<Address, ReserveOverview>> {
+    slot: number,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>
+  ): Promise<PubkeyHashMap<PublicKey, ReserveOverview>> {
     return this._vaultClient.getVaultReservesDetails(vault, slot, vaultReserves);
   }
 
@@ -1044,13 +938,13 @@ export class KaminoManager {
    * 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] - 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 [vaultReservesMap] - hashmap from each reserve pubkey to the reserve state. Optional. If provided the function will be significantly faster as it will not have to fetch the reserves
    * @returns a struct containing estimated gross APY and net APY (gross - vault fees) for the vault
    */
   async getVaultTheoreticalAPY(
     vault: VaultState,
-    slot: Slot,
-    vaultReserves?: Map<Address, KaminoReserve>
+    slot: number,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>
   ): Promise<APYs> {
     return this._vaultClient.getVaultTheoreticalAPY(vault, slot, vaultReserves);
   }
@@ -1062,7 +956,11 @@ export class KaminoManager {
    * @param [vaultReservesMap] - hashmap from each reserve pubkey to the reserve state. Optional. If provided the function will be significantly faster as it will not have to fetch the reserves
    * @returns a struct containing estimated gross APY and net APY (gross - vault fees) for the vault
    */
-  async getVaultActualAPY(vault: VaultState, slot: Slot, vaultReserves?: Map<Address, KaminoReserve>): Promise<APYs> {
+  async getVaultActualAPY(
+    vault: VaultState,
+    slot: number,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>
+  ): Promise<APYs> {
     return this._vaultClient.getVaultActualAPY(vault, slot, vaultReserves);
   }
 
@@ -1086,10 +984,10 @@ export class KaminoManager {
    */
   async calculateSimulatedHoldingsWithInterest(
     vaultState: VaultState,
-    vaultReserves?: Map<Address, KaminoReserve>,
-    slot?: Slot,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>,
+    slot?: number,
     previousTotalAUM?: Decimal,
-    currentSlot?: Slot
+    currentSlot?: number
   ): Promise<SimulatedVaultHoldingsWithEarnedInterest> {
     return this._vaultClient.calculateSimulatedHoldingsWithInterest(
       vaultState,
@@ -1109,10 +1007,10 @@ export class KaminoManager {
    */
   async getVaultComputedReservesAllocation(
     vaultState: VaultState,
-    slot?: Slot,
-    vaultReserves?: Map<Address, KaminoReserve>,
-    currentSlot?: Slot
-  ): Promise<Map<Address, Decimal>> {
+    slot?: number,
+    vaultReserves?: PubkeyHashMap<PublicKey, KaminoReserve>,
+    currentSlot?: number
+  ): Promise<PubkeyHashMap<PublicKey, Decimal>> {
     return this._vaultClient.getVaultComputedReservesAllocation(vaultState, slot, vaultReserves, currentSlot);
   }
 
@@ -1132,97 +1030,10 @@ export class KaminoManager {
   }
 
   /**
-   * 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
-   */
-  computeUserFarmStateForUserInVault(
-    farmsProgramId: Address,
-    vault: Address,
-    reserve: Address,
-    user: Address
-  ): Promise<ProgramDerivedAddress> {
-    return this._vaultClient.computeUserFarmStateDelegateePDAForUserInVault(farmsProgramId, reserve, vault, user);
-  }
-
-  /**
-   * 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
+   * This will compute the PDA that is used as delegatee in Farms program to compute the user state PDA
    */
-  async getVaultFarmRewardsAPY(vault: KaminoVault, vaultTokenPrice: Decimal, slot?: Slot): Promise<FarmIncentives> {
-    return this._vaultClient.getVaultRewardsAPY(vault, vaultTokenPrice, slot);
-  }
-
-  /**
-   * This will return the APY of the reserve farms (debt and supply)
-   * @param reserve - the reserve to get the farms APY for
-   * @param reserveTokenPrice - the price of the reserve token in USD (e.g. 1.0 for USDC)
-   * @param [reserveState] - the reserve state. Optional. If not provided, the function will fetch the reserve state
-   * @param [kaminoMarket] - the kamino market. Optional. If not provided, the function will fetch the kamino market
-   * @returns the APY of the farm built on top of the reserve
-   */
-  async getReserveFarmRewardsAPY(
-    reserve: Address,
-    reserveTokenPrice: Decimal,
-    reserveState?: Reserve,
-    kaminoMarket?: KaminoMarket
-  ): Promise<ReserveIncentives> {
-    const reserveIncentives: ReserveIncentives = {
-      collateralFarmIncentives: null,
-      debtFarmIncentives: null,
-    };
-
-    console.log('this._kaminoLendProgramId', this._kaminoLendProgramId.toString());
-    const reserveAccount = reserveState
-      ? reserveState
-      : await Reserve.fetch(this._rpc, reserve, this._kaminoLendProgramId);
-    if (!reserveAccount) {
-      throw new Error(`Reserve ${reserve} not found`);
-    }
-
-    let market = kaminoMarket;
-    if (!market) {
-      const fetckedMarket = await KaminoMarket.load(this._rpc, reserveAccount.lendingMarket, 450);
-      if (!fetckedMarket) {
-        throw new Error(`Market ${reserveAccount.lendingMarket} not found`);
-      }
-      market = fetckedMarket;
-    }
-
-    const kaminoReserve = market.getReserveByAddress(reserve);
-    if (!kaminoReserve) {
-      throw new Error(`Strategy state not found for strategy: ${reserve}`);
-    }
-
-    const farmCollateral = kaminoReserve.state.farmCollateral;
-    const farmDebt = kaminoReserve.state.farmDebt;
-
-    const stakedTokenMintDecimals = kaminoReserve.getMintDecimals();
-    const reserveCtokenPrice = reserveTokenPrice.div(kaminoReserve.getCollateralExchangeRate());
-
-    const farmsClient = new Farms(this._rpc);
-    if (farmCollateral !== DEFAULT_PUBLIC_KEY) {
-      const farmIncentivesCollateral = await getFarmIncentives(
-        farmsClient,
-        farmCollateral,
-        reserveCtokenPrice,
-        6 // all cTokens have 6 decimals
-      );
-      reserveIncentives.collateralFarmIncentives = farmIncentivesCollateral;
-    }
-
-    if (farmDebt !== DEFAULT_PUBLIC_KEY) {
-      const farmIncentivesDebt = await getFarmIncentives(
-        farmsClient,
-        farmDebt,
-        reserveTokenPrice,
-        stakedTokenMintDecimals
-      );
-      reserveIncentives.debtFarmIncentives = farmIncentivesDebt;
-    }
-
-    return reserveIncentives;
+  computeUserFarmStateForUserInVault(farmProgramID: PublicKey, vault: PublicKey, reserve: PublicKey, user: PublicKey) {
+    return this._vaultClient.computeUserFarmStateDelegateePDAForUserInVault(farmProgramID, reserve, vault, user);
   }
 
   /**
@@ -1230,7 +1041,7 @@ export class KaminoManager {
    * @param vaultState - the vault state to load reserves for
    * @returns a hashmap from each reserve pubkey to the reserve state
    */
-  async loadVaultReserves(vaultState: VaultState): Promise<Map<Address, KaminoReserve>> {
+  async loadVaultReserves(vaultState: VaultState): Promise<PubkeyHashMap<PublicKey, KaminoReserve>> {
     return this._vaultClient.loadVaultReserves(vaultState);
   }
 
@@ -1239,7 +1050,7 @@ export class KaminoManager {
    * @param vaults - the vault states to load reserves for
    * @returns a hashmap from each reserve pubkey to the reserve state
    */
-  async loadVaultsReserves(vaults: VaultState[]): Promise<Map<Address, KaminoReserve>> {
+  async loadVaultsReserves(vaults: VaultState[]): Promise<PubkeyHashMap<PublicKey, KaminoReserve>> {
     return this._vaultClient.loadVaultsReserves(vaults);
   }
 
@@ -1248,7 +1059,7 @@ export class KaminoManager {
    * @param vaultState - 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[] {
     return this._vaultClient.getVaultReserves(vault);
   }
 
@@ -1260,37 +1071,36 @@ export class KaminoManager {
    */
   async getVaultCollaterals(
     vaultState: VaultState,
-    slot: Slot,
-    vaultReservesMap?: Map<Address, KaminoReserve>,
+    slot: number,
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>,
     kaminoMarkets?: KaminoMarket[]
-  ): Promise<Map<Address, MarketOverview>> {
+  ): Promise<PubkeyHashMap<PublicKey, MarketOverview>> {
     return this._vaultClient.getVaultCollaterals(vaultState, slot, vaultReservesMap, kaminoMarkets);
   }
 
   /**
    * 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
    * @param kaminoVault - vault to invest from
    * @returns - an array of invest instructions for each invest action required for the vault reserves
    */
-  async investAllReservesIxs(payer: TransactionSigner, kaminoVault: KaminoVault): Promise<IInstruction[]> {
+  async investAllReservesIxs(payer: PublicKey, kaminoVault: KaminoVault): Promise<TransactionInstruction[]> {
     return this._vaultClient.investAllReservesIxs(payer, kaminoVault);
   }
 
   /**
    * 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 kaminoVault - vault to invest from
-   * @param reserveWithAddress - reserve to invest into or disinvest from
+   * @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: TransactionSigner,
+    payer: PublicKey,
     kaminoVault: KaminoVault,
     reserveWithAddress: ReserveWithAddress,
-    vaultReservesMap?: Map<Address, KaminoReserve>
-  ): Promise<IInstruction[]> {
+    vaultReservesMap?: PubkeyHashMap<PublicKey, KaminoReserve>
+  ): Promise<TransactionInstruction[]> {
     return this._vaultClient.investSingleReserveIxs(payer, kaminoVault, reserveWithAddress, vaultReservesMap);
   }
 
@@ -1299,7 +1109,7 @@ export class KaminoManager {
    * @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> {
     return this._vaultClient.getAllocationsDistribuionPct(vaultState);
   }
 
@@ -1308,7 +1118,7 @@ export class KaminoManager {
    * @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> {
     return this._vaultClient.getVaultAllocations(vaultState);
   }
 
@@ -1319,7 +1129,7 @@ export class KaminoManager {
    * @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 {
     return this._vaultClient.getSuppliedInReserve(vaultState, slot, reserve);
   }
 
@@ -1335,10 +1145,10 @@ export class KaminoManager {
   ): Promise<Array<ScopeOracleConfig>> {
     const scopeOracleConfigs: Array<ScopeOracleConfig> = [];
 
-    const scope = new Scope(cluster, this._rpc);
+    const scope = new Scope(cluster, this._connection);
     const oracleMappings = await scope.getOracleMappings({ feed: feed });
     const [, feedConfig] = await scope.getFeedConfiguration({ feed: feed });
-    const tokenMetadatas = await TokenMetadatas.fetch(this._rpc, feedConfig.tokensMetadata);
+    const tokenMetadatas = await TokenMetadatas.fetch(this._connection, feedConfig.tokensMetadata);
     const decoder = new TextDecoder('utf-8');
 
     console.log('feedConfig.tokensMetadata', feedConfig.tokensMetadata);
@@ -1348,7 +1158,7 @@ export class KaminoManager {
     }
 
     for (let index = 0; index < oracleMappings.priceInfoAccounts.length; index++) {
-      if (oracleMappings.priceInfoAccounts[index] !== DEFAULT_PUBLIC_KEY) {
+      if (!oracleMappings.priceInfoAccounts[index].equals(PublicKey.default)) {
         const name = decoder.decode(Uint8Array.from(tokenMetadatas.metadatasArray[index].name)).replace(/\0/g, '');
         const oracleType = parseOracleType(oracleMappings.priceTypes[index]);
 
@@ -1370,54 +1180,39 @@ export class KaminoManager {
 
   /**
    * This retruns an array of instructions to be used to update the lending market configurations
-   * @param lendingMarketOwner - market admin
    * @param marketWithAddress - the market address and market state object
    * @param newMarket - the lending market state with the new configuration - to be build we new config options from the previous state
    * @returns - an array of instructions
    */
-  updateLendingMarketIxs(
-    lendingMarketOwner: TransactionSigner,
-    marketWithAddress: MarketWithAddress,
-    newMarket: LendingMarket
-  ): IInstruction[] {
-    return parseForChangesMarketConfigAndGetIxs(
-      lendingMarketOwner,
-      marketWithAddress,
-      newMarket,
-      this._kaminoLendProgramId
-    );
+  updateLendingMarketIxs(marketWithAddress: MarketWithAddress, newMarket: LendingMarket): TransactionInstruction[] {
+    return parseForChangesMarketConfigAndGetIxs(marketWithAddress, newMarket, this._kaminoLendProgramId);
   }
 
   /**
    * This retruns an array of instructions to be used to update the pending lending market admin; if the admin is the same the list will be empty otherwise it will have an instruction to update the cached (pending) admin
-   * @param currentAdmin - current lending market owner
    * @param marketWithAddress - the market address and market state object
    * @param newAdmin - the new admin
    * @returns - an array of instructions
    */
   updatePendingLendingMarketAdminIx(
-    currentAdmin: TransactionSigner,
     marketWithAddress: MarketWithAddress,
-    newAdmin: Address
-  ): IInstruction[] {
+    newAdmin: PublicKey
+  ): TransactionInstruction[] {
     const newMarket = new LendingMarket({ ...marketWithAddress.state, lendingMarketOwnerCached: newAdmin });
-    return this.updateLendingMarketIxs(currentAdmin, marketWithAddress, newMarket);
+    return this.updateLendingMarketIxs(marketWithAddress, newMarket);
   }
 
   /**
-   * This returns an instruction to be used to update the market owner. This can only be executed by the current lendingMarketOwnerCached
+   * This retruns an instruction to be used to update the market owner. This can only be executed by the current lendingMarketOwnerCached
    * @param marketWithAddress - the market address and market state object
-   * @param lendingMarketOwnerCached - lendingMarketOwnerCached signer - a noop signer suitable for multisigs is used if not provided
    * @returns - an instruction for the new owner
    */
-  updateLendingMarketOwnerIxs(
-    marketWithAddress: MarketWithAddress,
-    lendingMarketOwnerCached: TransactionSigner = noopSigner(marketWithAddress.state.lendingMarketOwnerCached)
-  ): IInstruction {
+  updateLendingMarketOwnerIxs(marketWithAddress: MarketWithAddress): TransactionInstruction {
     const accounts: UpdateLendingMarketOwnerAccounts = {
-      lendingMarketOwnerCached,
+      lendingMarketOwnerCached: marketWithAddress.state.lendingMarketOwnerCached,
       lendingMarket: marketWithAddress.address,
     };
+
     return updateLendingMarketOwner(accounts, this._kaminoLendProgramId);
   }
 
@@ -1426,41 +1221,38 @@ export class KaminoManager {
    * @param wallet - the wallet to check
    * @returns true if the wallet is a squads multisig, false otherwise
    */
-  static async walletIsSquadsMultisig(wallet: Address) {
+  static async walletIsSquadsMultisig(wallet: PublicKey) {
     return walletIsSquadsMultisig(wallet);
   }
 
   /**
    * This will get the wallet type, admins number and threshold for the given authority
-   * @param rpc - the rpc to use
+   * @param connection - the connection to use
    * @param address - the address to get the wallet info for
    * @returns the wallet type, admins number and threshold
    */
-  static async getMarketOrVaultAdminInfo(
-    rpc: Rpc<GetAccountInfoApi>,
-    address: Address
-  ): Promise<WalletType | undefined> {
+  static async getMarketOrVaultAdminInfo(connection: Connection, address: PublicKey): Promise<WalletType | undefined> {
     try {
       // Try to fetch vault state first
-      const vaultState = await VaultState.fetch(rpc, address);
+      const vaultState = await VaultState.fetch(connection, address);
       if (!vaultState) {
         throw new Error('Vault not found');
       }
-      return await KaminoManager.getWalletInfo(rpc, vaultState.vaultAdminAuthority);
+      return await KaminoManager.getWalletInfo(connection, vaultState.vaultAdminAuthority);
     } catch (error) {
       // If vault not found, try to fetch market state
-      const market = await LendingMarket.fetch(rpc, address);
+      const market = await LendingMarket.fetch(connection, address);
       if (!market) {
         return undefined;
       }
-      return await KaminoManager.getWalletInfo(rpc, market.lendingMarketOwner);
+      return await KaminoManager.getWalletInfo(connection, market.lendingMarketOwner);
     }
   }
 
   /**
    * Helper method to get wallet information for a given authority
    */
-  private static async getWalletInfo(connection: Rpc<GetAccountInfoApi>, authority: Address): Promise<WalletType> {
+  private static async getWalletInfo(connection: Connection, authority: PublicKey): Promise<WalletType> {
     const isSquadsMultisig = await KaminoManager.walletIsSquadsMultisig(authority);
     let walletAdminsNumber = 1;
     let walletThreshold = 1;
@@ -1509,37 +1301,29 @@ export const MARKET_UPDATER = new ConfigUpdater(UpdateLendingMarketMode.fromDeco
 }));
 
 function parseForChangesMarketConfigAndGetIxs(
-  lendingMarketOwner: TransactionSigner,
   marketWithAddress: MarketWithAddress,
   newMarket: LendingMarket,
-  programId: Address
-): IInstruction[] {
+  programId: PublicKey
+): TransactionInstruction[] {
   const encodedMarketUpdates = MARKET_UPDATER.encodeAllUpdates(marketWithAddress.state, newMarket);
   return encodedMarketUpdates.map((encodedMarketUpdate) =>
-    updateMarketConfigIx(
-      lendingMarketOwner,
-      marketWithAddress,
-      encodedMarketUpdate.mode,
-      encodedMarketUpdate.value,
-      programId
-    )
+    updateMarketConfigIx(marketWithAddress, encodedMarketUpdate.mode, encodedMarketUpdate.value, programId)
   );
 }
 
 function updateMarketConfigIx(
-  lendingMarketOwner: TransactionSigner,
   marketWithAddress: MarketWithAddress,
   mode: UpdateLendingMarketModeKind,
   value: Uint8Array,
-  programId: Address
-): IInstruction {
+  programId: PublicKey
+): TransactionInstruction {
   const accounts: UpdateLendingMarketAccounts = {
-    lendingMarketOwner,
+    lendingMarketOwner: marketWithAddress.state.lendingMarketOwner,
     lendingMarket: marketWithAddress.address,
   };
 
   const args: UpdateLendingMarketArgs = {
-    mode: new BN(mode.discriminator),
+    mode: new anchor.BN(mode.discriminator),
     // NOTE: the Market's update handler expects a `[u8; 72]` (contrary to e.g. the Reserve's update handler accepting
     // `Vec<u8>`). Hence, we need to add explicit padding here:
     value: [...value, ...Array(72 - value.length).fill(0)],