@kamino-finance/klend-sdk 7.0.13 → 7.1.1

package/src/classes/vault_types.ts

@@ -1,40 +1,40 @@
-import { Address, IInstruction } from '@solana/kit';
+import { Address, Instruction } from '@solana/kit';
 import Decimal from 'decimal.js/decimal';
 
 /** the populateLUTIxs should be executed in a separate transaction as we cannot create and populate a lookup table in the same tx */
 export type InitVaultIxs = {
-  createAtaIfNeededIxs: IInstruction[];
-  initVaultIxs: IInstruction[];
-  createLUTIx: IInstruction;
-  populateLUTIxs: IInstruction[];
-  cleanupIxs: IInstruction[];
-  initSharesMetadataIx: IInstruction;
+  createAtaIfNeededIxs: Instruction[];
+  initVaultIxs: Instruction[];
+  createLUTIx: Instruction;
+  populateLUTIxs: Instruction[];
+  cleanupIxs: Instruction[];
+  initSharesMetadataIx: Instruction;
 };
 
 export type AcceptVaultOwnershipIxs = {
-  acceptVaultOwnershipIx: IInstruction;
-  initNewLUTIx: IInstruction;
-  updateLUTIxs: IInstruction[]; // this has to be executed in a transaction after the initNewLUTIx is executed
+  acceptVaultOwnershipIx: Instruction;
+  initNewLUTIx: Instruction;
+  updateLUTIxs: Instruction[]; // this has to be executed in a transaction after the initNewLUTIx is executed
 };
 
 export type UpdateReserveAllocationIxs = {
-  updateReserveAllocationIx: IInstruction;
-  updateLUTIxs: IInstruction[];
+  updateReserveAllocationIx: Instruction;
+  updateLUTIxs: Instruction[];
 };
 
 export type WithdrawAndBlockReserveIxs = {
-  updateReserveAllocationIxs: IInstruction[];
-  investIxs: IInstruction[];
+  updateReserveAllocationIxs: Instruction[];
+  investIxs: Instruction[];
 };
 
 export type DisinvestAllReservesIxs = {
-  updateReserveAllocationIxs: IInstruction[];
-  investIxs: IInstruction[];
+  updateReserveAllocationIxs: Instruction[];
+  investIxs: Instruction[];
 };
 
 export type UpdateVaultConfigIxs = {
-  updateVaultConfigIx: IInstruction;
-  updateLUTIxs: IInstruction[];
+  updateVaultConfigIx: Instruction;
+  updateLUTIxs: Instruction[];
 };
 
 export type VaultComputedAllocation = {
@@ -44,21 +44,21 @@ export type VaultComputedAllocation = {
 
 /** If there are ixs to setup the LUT it means it doesn't already exist and it needs to be created in a separate tx before inserting into it */
 export type SyncVaultLUTIxs = {
-  setupLUTIfNeededIxs: IInstruction[];
-  syncLUTIxs: IInstruction[];
+  setupLUTIfNeededIxs: Instruction[];
+  syncLUTIxs: Instruction[];
 };
 
 /** If the stakeInFarmIfNeededIxs exist they have to be executed after the deposit so the shares received from the deposit are staked in the vault farm */
 export type DepositIxs = {
-  depositIxs: IInstruction[];
-  stakeInFarmIfNeededIxs: IInstruction[];
+  depositIxs: Instruction[];
+  stakeInFarmIfNeededIxs: Instruction[];
 };
 
 /** the ixs to unstake shares from farm and withdraw them from the vault. The `unstakeFromFarmIfNeededIxs` should be in the tx before `withdrawIxs`*/
 export type WithdrawIxs = {
-  unstakeFromFarmIfNeededIxs: IInstruction[];
-  withdrawIxs: IInstruction[];
-  postWithdrawIxs: IInstruction[]; // if needed: wSOL ATA close ix + share ATA close ix
+  unstakeFromFarmIfNeededIxs: Instruction[];
+  withdrawIxs: Instruction[];
+  postWithdrawIxs: Instruction[]; // if needed: wSOL ATA close ix + share ATA close ix
 };
 
 /** The shares an user has in a vault (staked and unstaked), in tokens */

package/src/client/tx/multisig.ts

@@ -6,7 +6,7 @@ import {
   createTransactionMessage,
   getBase58Decoder,
   getCompiledTransactionMessageEncoder,
-  IInstruction,
+  Instruction,
   pipe,
   setTransactionMessageFeePayer,
   setTransactionMessageLifetimeUsingBlockhash,
@@ -20,7 +20,7 @@ const base58Decoder = getBase58Decoder();
 
 export async function printMultisigTx(
   payer: TransactionSigner,
-  ixs: IInstruction[],
+  ixs: Instruction[],
   luts: Account<AddressLookupTable>[] = []
 ) {
   const lutsByAddress: AddressesByLookupTableAddress = {};

package/src/client/tx/priorityFee.ts

@@ -1,4 +1,4 @@
-import { IInstruction } from '@solana/kit';
+import { Instruction } from '@solana/kit';
 import {
   COMPUTE_BUDGET_PROGRAM_ADDRESS,
   getSetComputeUnitLimitInstruction,
@@ -13,7 +13,7 @@ export function getPriorityFeeAndCuIxs({
 }: {
   priorityFeeMultiplier: number;
   computeUnits?: number;
-}): IInstruction[] {
+}): Instruction[] {
   const microLamportsPrioritizationFee = microLamport / computeUnits;
   return [
     getSetComputeUnitLimitInstruction({ units: computeUnits }),
@@ -23,7 +23,7 @@ export function getPriorityFeeAndCuIxs({
   ];
 }
 
-export function removeComputeBudgetProgramInstructions(ixs: IInstruction[]): IInstruction[] {
+export function removeComputeBudgetProgramInstructions(ixs: Instruction[]): Instruction[] {
   const filteredIxs = ixs.filter((ix) => {
     if (ix.programAddress === COMPUTE_BUDGET_PROGRAM_ADDRESS) {
       return false;

package/src/client/tx/processor.ts

@@ -1,5 +1,5 @@
 import { CliConnectionPool } from './CliConnectionPool';
-import { Account, IInstruction, TransactionSigner } from '@solana/kit';
+import { Account, Instruction, TransactionSigner } from '@solana/kit';
 import { sendAndConfirmTx } from './tx';
 import { printSimulateTx } from './simulate';
 import { printMultisigTx } from './multisig';
@@ -9,7 +9,7 @@ import { AddressLookupTable } from '@solana-program/address-lookup-table';
 export async function processTx(
   c: CliConnectionPool,
   payer: TransactionSigner,
-  ixs: IInstruction[],
+  ixs: Instruction[],
   mode: SendTxMode,
   luts: Account<AddressLookupTable>[] = []
 ): Promise<void> {

package/src/client/tx/simulate.ts

@@ -1,5 +1,5 @@
 import {
-  IInstruction,
+  Instruction,
   pipe,
   createTransactionMessage,
   setTransactionMessageFeePayer,
@@ -28,7 +28,7 @@ export const INVALID_BUT_SUFFICIENT_FOR_COMPILATION_BLOCKHASH: BlockhashWithHeig
 export async function printSimulateTx(
   c: CliConnectionPool,
   payer: TransactionSigner,
-  ixs: IInstruction[],
+  ixs: Instruction[],
   luts: Account<AddressLookupTable>[] = []
 ) {
   const lutsByAddress: AddressesByLookupTableAddress = {};

package/src/client/tx/tx.ts

@@ -11,7 +11,7 @@ import {
   GetLatestBlockhashApi,
   getSignatureFromTransaction,
   GetSignatureStatusesApi,
-  IInstruction,
+  Instruction,
   pipe,
   RpcSubscriptions,
   sendAndConfirmTransactionFactory,
@@ -32,7 +32,7 @@ import { CliConnectionPool } from './CliConnectionPool';
 export async function sendAndConfirmTx(
   c: CliConnectionPool,
   payer: TransactionSigner,
-  ixs: IInstruction[],
+  ixs: Instruction[],
   luts: Account<AddressLookupTable>[] = []
 ): Promise<Signature> {
   const blockhash = await fetchBlockhash(c.rpc);

package/src/idl/klend.json

@@ -2385,7 +2385,7 @@
             },
             {
               "name": "lendingMarketAuthority",
-              "isMut": false,
+              "isMut": true,
               "isSigner": false
             },
             {
@@ -6211,4 +6211,4 @@
       "msg": "Cannot initialize global config because there is no upgrade authority to the program"
     }
   ]
-}
+}

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -19,12 +19,12 @@ import {
   uniqueAccountsWithProgramIds,
 } from '../utils';
 import { AddressLookupTable } from '@solana-program/address-lookup-table';
-import { Account, Address, IInstruction, none, Option, Slot, TransactionSigner } from '@solana/kit';
+import { Account, Address, Instruction, none, Option, Slot, TransactionSigner } from '@solana/kit';
 import Decimal from 'decimal.js';
 import { calcMaxWithdrawCollateral, calcRepayAmountWithSlippage } from './repay_with_collateral_calcs';
 
 export type RepayWithCollIxsResponse<QuoteResponse> = {
-  ixs: IInstruction[];
+  ixs: Instruction[];
   lookupTables: Account<AddressLookupTable>[];
   flashLoanInfo: FlashLoanInfo;
   swapInputs: SwapInputs;
@@ -57,7 +57,7 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   currentSlot: Slot;
   repayAmount: Decimal;
   isClosingPosition: boolean;
-  budgetAndPriorityFeeIxs?: IInstruction[];
+  budgetAndPriorityFeeIxs?: Instruction[];
   scopeRefreshConfig?: ScopePriceRefreshConfig;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
@@ -285,7 +285,7 @@ async function buildRepayWithCollateralIxs<QuoteResponse>(
   obligation: KaminoObligation,
   referrer: Option<Address>,
   currentSlot: Slot,
-  budgetAndPriorityFeeIxs: IInstruction[] | undefined,
+  budgetAndPriorityFeeIxs: Instruction[] | undefined,
   scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
   swapQuoteIxsArray: SwapIxs<QuoteResponse>[],
   isClosingPosition: boolean,

package/src/lending_operations/swap_collateral_operations.ts

@@ -23,7 +23,7 @@ import {
   uniqueAccountsWithProgramIds,
   WRAPPED_SOL_MINT,
 } from '../utils';
-import { Account, Address, IInstruction, isSome, none, Option, Slot, TransactionSigner } from '@solana/kit';
+import { Account, Address, Instruction, isSome, none, Option, Slot, TransactionSigner } from '@solana/kit';
 import Decimal from 'decimal.js';
 import { TOKEN_PROGRAM_ADDRESS } from '@solana-program/token';
 import { AddressLookupTable } from '@solana-program/address-lookup-table';
@@ -69,7 +69,7 @@ export interface SwapCollIxsInputs<QuoteResponse> {
   obligation: KaminoObligation;
   referrer: Option<Address>;
   currentSlot: Slot;
-  budgetAndPriorityFeeIxs?: IInstruction[];
+  budgetAndPriorityFeeIxs?: Instruction[];
   scopeRefreshConfig?: ScopePriceRefreshConfig;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
@@ -84,7 +84,7 @@ export interface SwapCollIxsOutputs<QuoteResponse> {
   /**
    * Instructions for on-chain execution.
    */
-  ixs: IInstruction[];
+  ixs: Instruction[];
 
   /**
    * Required LUTs.
@@ -217,7 +217,7 @@ type SwapCollArgs = {
 };
 
 type SwapCollContext<QuoteResponse> = {
-  budgetAndPriorityFeeIxs: IInstruction[];
+  budgetAndPriorityFeeIxs: Instruction[];
   market: KaminoMarket;
   sourceCollReserve: KaminoReserve;
   targetCollReserve: KaminoReserve;
@@ -269,12 +269,12 @@ function extractArgsAndContext<QuoteResponse>(
 const FAKE_TARGET_COLL_SWAP_OUT_AMOUNT = new Decimal(1); // see the lengthy `getSwapCollIxs()` impl comment
 
 type SwapCollKlendIxs = {
-  setupIxs: IInstruction[];
-  targetCollFlashBorrowIx: IInstruction;
-  depositTargetCollIxs: IInstruction[];
-  withdrawSourceCollIxs: IInstruction[];
-  targetCollFlashRepayIx: IInstruction;
-  cleanupIxs: IInstruction[];
+  setupIxs: Instruction[];
+  targetCollFlashBorrowIx: Instruction;
+  depositTargetCollIxs: Instruction[];
+  withdrawSourceCollIxs: Instruction[];
+  targetCollFlashRepayIx: Instruction;
+  cleanupIxs: Instruction[];
   flashLoanInfo: FlashLoanInfo;
   simulationDetails: {
     targetCollFlashBorrowedAmount: Decimal;
@@ -285,7 +285,7 @@ async function getKlendIxs(
   args: SwapCollArgs,
   targetCollSwapOutAmount: Decimal,
   context: SwapCollContext<any>,
-  scopeRefreshIx: IInstruction[]
+  scopeRefreshIx: Instruction[]
 ): Promise<SwapCollKlendIxs> {
   const { ataCreationIxs, targetCollAta } = await getAtaCreationIxs(context);
   const setupIxs = [...context.budgetAndPriorityFeeIxs, ...ataCreationIxs];
@@ -361,7 +361,7 @@ async function getAtaCreationIxs(context: SwapCollContext<any>) {
 }
 
 async function getAtaCloseIxs(context: SwapCollContext<any>) {
-  const ataCloseIxs: IInstruction[] = [];
+  const ataCloseIxs: Instruction[] = [];
   if (
     context.sourceCollReserve.getLiquidityMint() === WRAPPED_SOL_MINT ||
     context.targetCollReserve.getLiquidityMint() === WRAPPED_SOL_MINT
@@ -402,7 +402,7 @@ async function getTargetCollFlashLoanIxs(
 
 type DepositTargetCollIxs = {
   removesElevationGroup: boolean;
-  ixs: IInstruction[];
+  ixs: Instruction[];
 };
 
 async function getDepositTargetCollIxs(
@@ -454,7 +454,7 @@ async function getWithdrawSourceCollIxs(
   args: SwapCollArgs,
   depositRemovedElevationGroup: boolean,
   context: SwapCollContext<any>
-): Promise<IInstruction[]> {
+): Promise<Instruction[]> {
   const withdrawnSourceCollLamports = args.isClosingSourceColl
     ? U64_MAX
     : args.sourceCollSwapAmount.mul(context.sourceCollReserve.getMintFactor()).toString();
@@ -513,7 +513,7 @@ function elevationGroupIdToRequestAfterWithdraw(
 
 type ExternalSwapIxs<QuoteResponse> = {
   swapOutAmount: Decimal;
-  ixs: IInstruction[];
+  ixs: Instruction[];
   luts: Account<AddressLookupTable>[];
   simulationDetails: {
     quoteResponse?: QuoteResponse;
@@ -617,7 +617,7 @@ function checkResultingObligationValid(
   }
 }
 
-function listIxs(klendIxs: SwapCollKlendIxs, externalSwapIxs?: IInstruction[]): IInstruction[] {
+function listIxs(klendIxs: SwapCollKlendIxs, externalSwapIxs?: Instruction[]): Instruction[] {
   return [
     ...klendIxs.setupIxs,
     klendIxs.targetCollFlashBorrowIx,

package/src/leverage/instructions.ts

@@ -90,7 +90,7 @@ export const getBorrowFlashLoanInstruction = ({
     tokenProgram: reserve.getLiquidityTokenProgram(),
   };
 
-  return flashBorrowReserveLiquidity(args, accounts, programId);
+  return flashBorrowReserveLiquidity(args, accounts, undefined, programId);
 };
 
 export const getRepayFlashLoanInstruction = ({
@@ -136,5 +136,5 @@ export const getRepayFlashLoanInstruction = ({
     tokenProgram: reserve.getLiquidityTokenProgram(),
   };
 
-  return flashRepayReserveLiquidity(args, accounts, programId);
+  return flashRepayReserveLiquidity(args, accounts, undefined, programId);
 };

package/src/leverage/operations.ts

@@ -1,4 +1,4 @@
-import { Address, IInstruction, Slot, Option, none, TransactionSigner, lamports } from '@solana/kit';
+import { Address, Instruction, Slot, Option, none, TransactionSigner, lamports } from '@solana/kit';
 import Decimal from 'decimal.js';
 import {
   KaminoAction,
@@ -431,7 +431,7 @@ async function buildDepositWithLeverageIxs<QuoteResponse>(
   depositTokenIsSol: boolean,
   scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
   calcs: DepositLeverageCalcsResult,
-  budgetAndPriorityFeeIxs: IInstruction[] | undefined,
+  budgetAndPriorityFeeIxs: Instruction[] | undefined,
   swapQuoteIxsArray: SwapIxs<QuoteResponse>[],
   strategy: StrategyWithAddress | undefined,
   collIsKtoken: boolean,
@@ -468,7 +468,7 @@ async function buildDepositWithLeverageIxs<QuoteResponse>(
     budgetAndPriorityFeeIxs
   );
 
-  const fillWsolAtaIxs: IInstruction[] = [];
+  const fillWsolAtaIxs: Instruction[] = [];
   if (depositTokenIsSol) {
     fillWsolAtaIxs.push(
       ...getTransferWsolIxs(
@@ -816,7 +816,7 @@ export async function buildWithdrawWithLeverageIxs<QuoteResponse>(
   depositTokenIsSol: boolean,
   scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
   calcs: WithdrawLeverageCalcsResult,
-  budgetAndPriorityFeeIxs: IInstruction[] | undefined,
+  budgetAndPriorityFeeIxs: Instruction[] | undefined,
   swapQuoteIxsArray: SwapIxs<QuoteResponse>[],
   strategy: StrategyWithAddress | undefined,
   collIsKtoken: boolean,
@@ -845,7 +845,7 @@ export async function buildWithdrawWithLeverageIxs<QuoteResponse>(
     budgetAndPriorityFeeIxs
   );
 
-  const closeWsolAtaIxs: IInstruction[] = [];
+  const closeWsolAtaIxs: Instruction[] = [];
   if (depositTokenIsSol || debtTokenMint === WRAPPED_SOL_MINT) {
     const wsolAta = await getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner.address);
     closeWsolAtaIxs.push(
@@ -862,7 +862,7 @@ export async function buildWithdrawWithLeverageIxs<QuoteResponse>(
 
   // TODO: Mihai/Marius check if we can improve this logic and not convert any SOL
   // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
-  const fillWsolAtaIxs: IInstruction[] = [];
+  const fillWsolAtaIxs: Instruction[] = [];
   if (debtTokenMint === WRAPPED_SOL_MINT) {
     const halfSolBalance =
       Number.parseInt((await market.getRpc().getBalance(owner.address).send()).value.toString()) / LAMPORTS_PER_SOL / 2;
@@ -1390,7 +1390,7 @@ async function buildIncreaseLeverageIxs<QuoteResponse>(
   scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
   collIsKtoken: boolean,
   swapQuoteIxsArray: SwapIxs<QuoteResponse>[],
-  budgetAndPriorityFeeIxs: IInstruction[] | undefined,
+  budgetAndPriorityFeeIxs: Instruction[] | undefined,
   useV2Ixs: boolean
 ): Promise<LeverageIxsOutput[]> {
   const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
@@ -1510,7 +1510,7 @@ async function buildDecreaseLeverageIxs<QuoteResponse>(
   scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
   collIsKtoken: boolean,
   swapQuoteIxsArray: SwapIxs<QuoteResponse>[],
-  budgetAndPriorityFeeIxs: IInstruction[] | undefined,
+  budgetAndPriorityFeeIxs: Instruction[] | undefined,
   useV2Ixs: boolean,
   withdrawSlotOffset: number = WITHDRAW_SLOT_OFFSET
 ): Promise<LeverageIxsOutput[]> {
@@ -1539,8 +1539,8 @@ async function buildDecreaseLeverageIxs<QuoteResponse>(
 
   // TODO: Mihai/Marius check if we can improve this logic and not convert any SOL
   // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
-  const closeWsolAtaIxs: IInstruction[] = [];
-  const fillWsolAtaIxs: IInstruction[] = [];
+  const closeWsolAtaIxs: Instruction[] = [];
+  const fillWsolAtaIxs: Instruction[] = [];
   if (debtTokenMint === WRAPPED_SOL_MINT) {
     const wsolAta = await getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner.address);
 
@@ -1660,7 +1660,7 @@ export const getSetupIxs = async (
   debtReserve: KaminoReserve,
   strategy: StrategyWithAddress | undefined,
   scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-  budgetAndPriorityFeeIxs: IInstruction[] | undefined
+  budgetAndPriorityFeeIxs: Instruction[] | undefined
 ) => {
   const budgetIxs = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxs(3000000);
 
@@ -1696,7 +1696,7 @@ export const getScopeRefreshIx = async (
   debtReserve: KaminoReserve,
   obligation: KaminoObligation | ObligationType | undefined,
   scopeRefreshConfig: ScopePriceRefreshConfig | undefined
-): Promise<IInstruction[]> => {
+): Promise<Instruction[]> => {
   const allReserves =
     obligation && isKaminoObligation(obligation)
       ? [
@@ -1709,7 +1709,7 @@ export const getScopeRefreshIx = async (
         ]
       : [...new Set<Address>([collReserve.address, debtReserve.address])];
 
-  const scopeRefreshIxs: IInstruction[] = [];
+  const scopeRefreshIxs: Instruction[] = [];
   const scopeTokensMap = getTokenIdsForScopeRefresh(market, allReserves);
 
   if (scopeTokensMap.size > 0 && scopeRefreshConfig) {

package/src/leverage/types.ts

@@ -1,4 +1,4 @@
-import { Account, Address, IInstruction, Option, Slot, TransactionSigner } from '@solana/kit';
+import { Account, Address, Instruction, Option, Slot, TransactionSigner } from '@solana/kit';
 import Decimal from 'decimal.js';
 import { KaminoMarket, KaminoObligation } from '../classes';
 import { Kamino, StrategyWithAddress } from '@kamino-finance/kliquidity-sdk';
@@ -22,8 +22,8 @@ export type SwapQuote<QuoteResponse> = {
 };
 
 export type SwapIxs<QuoteResponse> = {
-  preActionIxs: IInstruction[];
-  swapIxs: IInstruction[];
+  preActionIxs: Instruction[];
+  swapIxs: Instruction[];
   lookupTables: Account<AddressLookupTable>[];
   quote: SwapQuote<QuoteResponse>;
 };
@@ -38,7 +38,7 @@ export type FlashLoanInfo = {
 };
 
 export type LeverageIxsOutput = {
-  instructions: IInstruction[];
+  instructions: Instruction[];
   flashLoanInfo: FlashLoanInfo;
 };
 
@@ -51,7 +51,7 @@ export type SwapInputs = {
 };
 
 export type BaseLeverageIxsResponse<QuoteResponse> = {
-  ixs: IInstruction[];
+  ixs: Instruction[];
   lookupTables: Account<AddressLookupTable>[];
   swapInputs: SwapInputs;
   flashLoanInfo: FlashLoanInfo;
@@ -76,7 +76,7 @@ export interface BaseLeverageSwapInputsProps<QuoteResponse> {
   referrer: Option<Address>;
   currentSlot: Slot;
   slippagePct: Decimal;
-  budgetAndPriorityFeeIxs?: IInstruction[];
+  budgetAndPriorityFeeIxs?: Instruction[];
   kamino: Kamino | undefined;
   scopeRefreshConfig?: ScopePriceRefreshConfig;
   quoteBufferBps: Decimal;

package/src/leverage/utils.ts

@@ -2,7 +2,7 @@ import { Kamino, StrategyWithAddress } from '@kamino-finance/kliquidity-sdk';
 import { KaminoMarket, KaminoReserve, lamportsToNumberDecimal } from '../classes';
 import {
   Address,
-  IInstruction,
+  Instruction,
   GetAccountInfoApi,
   Rpc,
   GetTokenAccountBalanceApi,
@@ -22,7 +22,7 @@ export interface KaminoSwapperIxBuilder {
     owner: TransactionSigner,
     slippage: Decimal,
     allKeys: Address[]
-  ): Promise<[IInstruction[], Address[]]>;
+  ): Promise<[Instruction[], Address[]]>;
 }
 
 export interface DepositAmountsForSwap {
@@ -286,7 +286,7 @@ export function swapProviderToKaminoSwapProvider<QuoteResponse>(
     _owner: TransactionSigner,
     _slippage: Decimal,
     _allKeys: Address[]
-  ): Promise<[IInstruction[], Address[]]> => {
+  ): Promise<[Instruction[], Address[]]> => {
     if (input.tokenBToSwapAmount.lt(0)) {
       const swapperIxsArray = await swapper(
         {

package/src/manager/client_kamino_manager.ts

@@ -1,6 +1,6 @@
 import dotenv from 'dotenv';
 import { Command } from 'commander';
-import { Address, address, IInstruction } from '@solana/kit';
+import { Address, address, Instruction } from '@solana/kit';
 import {
   AssetReserveConfigCli,
   calculateAPYFromAPR,
@@ -1184,7 +1184,7 @@ async function main() {
       const instructions = await kaminoManager.investAllReservesIxs(payer, kaminoVault);
 
       for (let i = 0; i < instructions.length; i++) {
-        const txInstructions: IInstruction[] = [];
+        const txInstructions: Instruction[] = [];
         txInstructions.push();
         await processTx(
           env.c,
@@ -1425,6 +1425,8 @@ async function main() {
 
       const walletAddress = address(wallet);
       const userShares = await kaminoManager.getUserSharesBalanceAllVaults(walletAddress);
+
+      console.log(`${userShares.size} positions for wallet ${walletAddress}`);
       userShares.forEach((userShares, vaultAddress) => {
         console.log(
           `User shares for vault ${vaultAddress}: staked shares ${userShares.stakedShares} unstaked shares ${userShares.unstakedShares} total shares ${userShares.totalShares}`
@@ -2168,7 +2170,7 @@ async function createUpdateReserveConfigLutIxs(
   env: ManagerEnv,
   lendingMarketAddress: Address,
   reserveAddress: Address
-): Promise<[Address, IInstruction[]]> {
+): Promise<[Address, Instruction[]]> {
   const globalConfigAddress = await globalConfigPda(env.klendProgramId);
   const contents = [globalConfigAddress, lendingMarketAddress, reserveAddress];
   const signer = await env.getSigner();

package/src/manager/tx/multisig.ts

@@ -6,7 +6,7 @@ import {
   createTransactionMessage,
   getBase58Decoder,
   getCompiledTransactionMessageEncoder,
-  IInstruction,
+  Instruction,
   pipe,
   setTransactionMessageFeePayer,
   setTransactionMessageLifetimeUsingBlockhash,
@@ -20,7 +20,7 @@ const base58Decoder = getBase58Decoder();
 
 export async function printMultisigTx(
   payer: TransactionSigner,
-  ixs: IInstruction[],
+  ixs: Instruction[],
   luts: Account<AddressLookupTable>[] = []
 ) {
   const lutsByAddress: AddressesByLookupTableAddress = {};

package/src/manager/tx/priorityFee.ts

@@ -1,4 +1,4 @@
-import { IInstruction } from '@solana/kit';
+import { Instruction } from '@solana/kit';
 import {
   COMPUTE_BUDGET_PROGRAM_ADDRESS,
   getSetComputeUnitLimitInstruction,
@@ -13,7 +13,7 @@ export function getPriorityFeeAndCuIxs({
 }: {
   priorityFeeMultiplier: number;
   computeUnits?: number;
-}): IInstruction[] {
+}): Instruction[] {
   const microLamportsPrioritizationFee = microLamport / computeUnits;
   return [
     getSetComputeUnitLimitInstruction({ units: computeUnits }),
@@ -23,7 +23,7 @@ export function getPriorityFeeAndCuIxs({
   ];
 }
 
-export function removeComputeBudgetProgramInstructions(ixs: IInstruction[]): IInstruction[] {
+export function removeComputeBudgetProgramInstructions(ixs: Instruction[]): Instruction[] {
   const filteredIxs = ixs.filter((ix) => {
     if (ix.programAddress === COMPUTE_BUDGET_PROGRAM_ADDRESS) {
       return false;

package/src/manager/tx/processor.ts

@@ -1,5 +1,5 @@
 import { ManagerConnectionPool } from './ManagerConnectionPool';
-import { Account, IInstruction, TransactionSigner } from '@solana/kit';
+import { Account, Instruction, TransactionSigner } from '@solana/kit';
 import { sendAndConfirmTx } from './tx';
 import { printSimulateTx } from './simulate';
 import { printMultisigTx } from './multisig';
@@ -9,7 +9,7 @@ import { AddressLookupTable } from '@solana-program/address-lookup-table';
 export async function processTx(
   c: ManagerConnectionPool,
   payer: TransactionSigner,
-  ixs: IInstruction[],
+  ixs: Instruction[],
   mode: SendTxMode,
   luts: Account<AddressLookupTable>[] = []
 ): Promise<void> {

package/src/manager/tx/simulate.ts

@@ -1,5 +1,5 @@
 import {
-  IInstruction,
+  Instruction,
   pipe,
   createTransactionMessage,
   setTransactionMessageFeePayer,
@@ -28,7 +28,7 @@ export const INVALID_BUT_SUFFICIENT_FOR_COMPILATION_BLOCKHASH: BlockhashWithHeig
 export async function printSimulateTx(
   c: ManagerConnectionPool,
   payer: TransactionSigner,
-  ixs: IInstruction[],
+  ixs: Instruction[],
   luts: Account<AddressLookupTable>[] = []
 ) {
   const lutsByAddress: AddressesByLookupTableAddress = {};

package/src/manager/tx/tx.ts

@@ -11,7 +11,7 @@ import {
   GetLatestBlockhashApi,
   getSignatureFromTransaction,
   GetSignatureStatusesApi,
-  IInstruction,
+  Instruction,
   pipe,
   RpcSubscriptions,
   sendAndConfirmTransactionFactory,
@@ -32,7 +32,7 @@ import { ManagerConnectionPool } from './ManagerConnectionPool';
 export async function sendAndConfirmTx(
   c: ManagerConnectionPool,
   payer: TransactionSigner,
-  ixs: IInstruction[],
+  ixs: Instruction[],
   luts: Account<AddressLookupTable>[] = []
 ): Promise<Signature> {
   const blockhash = await fetchBlockhash(c.rpc);