@kamino-finance/klend-sdk 7.0.12 → 7.1.0

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);

package/src/referrals/instructions.ts

@@ -1,4 +1,4 @@
-import { Address, IInstruction, Rpc, SolanaRpcApi, TransactionSigner } from '@solana/kit';
+import { Address, Instruction, Rpc, SolanaRpcApi, TransactionSigner } from '@solana/kit';
 import { KaminoMarket } from '../classes';
 import { DEFAULT_PUBLIC_KEY, referrerStatePda, referrerTokenStatePda, shortUrlPda, userMetadataPda } from '../utils';
 import {
@@ -26,7 +26,7 @@ export const getInitAllReferrerTokenStateIxs = async ({
 
   await kaminoMarket.loadReserves();
 
-  const initReferrerTokenStateIxs: IInstruction[] = [];
+  const initReferrerTokenStateIxs: Instruction[] = [];
 
   const tokenStatesToCreate: [Address, Address][] = [];
   const reserves = kaminoMarket.getReserves();
@@ -54,6 +54,7 @@ export const getInitAllReferrerTokenStateIxs = async ({
         rent: SYSVAR_RENT_ADDRESS,
         systemProgram: SYSTEM_PROGRAM_ADDRESS,
       },
+      undefined,
       kaminoMarket.programId
     );
 
@@ -90,6 +91,7 @@ export const getInitReferrerStateAndShortUrlIxs = async ({
       rent: SYSVAR_RENT_ADDRESS,
       systemProgram: SYSTEM_PROGRAM_ADDRESS,
     },
+    undefined,
     programId
   );
 
@@ -105,7 +107,7 @@ export const getDeleteReferrerStateAndShortUrlIxs = async ({
   referrer: TransactionSigner;
   rpc: Rpc<SolanaRpcApi>;
   programId: Address;
-}): Promise<IInstruction> => {
+}): Promise<Instruction> => {
   const [referrerStateAddress] = await referrerStatePda(referrer.address, programId);
   const referrerState = await ReferrerState.fetch(rpc, referrerStateAddress, programId);
 
@@ -117,6 +119,7 @@ export const getDeleteReferrerStateAndShortUrlIxs = async ({
       rent: SYSVAR_RENT_ADDRESS,
       systemProgram: SYSTEM_PROGRAM_ADDRESS,
     },
+    undefined,
     programId
   );
 };

package/src/utils/ata.ts

@@ -4,7 +4,7 @@ import {
   GetAccountInfoApi,
   GetMultipleAccountsApi,
   GetTokenAccountBalanceApi,
-  IInstruction,
+  Instruction,
   Lamports,
   MaybeAccount,
   Rpc,
@@ -41,7 +41,7 @@ export async function createAssociatedTokenAccountIdempotentInstruction(
   owner: Address = payer.address,
   tokenProgram: Address = TOKEN_PROGRAM_ADDRESS,
   ata?: Address
-): Promise<[Address, IInstruction]> {
+): Promise<[Address, Instruction]> {
   let ataAddress = ata;
   if (!ataAddress) {
     ataAddress = await getAssociatedTokenAddress(mint, owner, tokenProgram, ASSOCIATED_TOKEN_PROGRAM_ADDRESS);
@@ -82,12 +82,12 @@ export const getAtasWithCreateIxsIfMissing = async (
   rpc: Rpc<GetMultipleAccountsApi>,
   user: TransactionSigner,
   mints: Array<{ mint: Address; tokenProgram: Address }>
-): Promise<{ atas: Address[]; createAtaIxs: IInstruction[] }> => {
+): Promise<{ atas: Address[]; createAtaIxs: Instruction[] }> => {
   const atas: Array<Address> = await Promise.all(
     mints.map(async (x) => getAssociatedTokenAddress(x.mint, user.address, x.tokenProgram))
   );
   const accountInfos = await rpc.getMultipleAccounts(atas).send();
-  const createAtaIxs: IInstruction[] = [];
+  const createAtaIxs: Instruction[] = [];
   for (let i = 0; i < atas.length; i++) {
     if (accountInfos.value[i] === null) {
       const { mint, tokenProgram } = mints[i];
@@ -110,8 +110,8 @@ export const getAtasWithCreateIxsIfMissing = async (
 export async function createAtasIdempotent(
   user: TransactionSigner,
   mints: Array<{ mint: Address; tokenProgram: Address }>
-): Promise<Array<{ ata: Address; createAtaIx: IInstruction }>> {
-  const res: Array<{ ata: Address; createAtaIx: IInstruction }> = [];
+): Promise<Array<{ ata: Address; createAtaIx: Instruction }>> {
+  const res: Array<{ ata: Address; createAtaIx: Instruction }> = [];
   for (const mint of mints) {
     const [ata, createAtaIx] = await createAssociatedTokenAccountIdempotentInstruction(
       user,
@@ -128,7 +128,7 @@ export async function createAtasIdempotent(
 }
 
 export function getTransferWsolIxs(owner: TransactionSigner, ata: Address, amountLamports: Lamports) {
-  const ixs: IInstruction[] = [];
+  const ixs: Instruction[] = [];
 
   ixs.push(
     getTransferSolInstruction({
@@ -177,8 +177,8 @@ export async function getTokenAccountBalanceDecimal(
 
 export type CreateWsolAtaIxs = {
   wsolAta: Address;
-  createAtaIxs: IInstruction[];
-  closeAtaIxs: IInstruction[];
+  createAtaIxs: Instruction[];
+  closeAtaIxs: Instruction[];
 };
 
 /**
@@ -193,8 +193,8 @@ export const createWsolAtaIfMissing = async (
   amount: Decimal,
   owner: TransactionSigner
 ): Promise<CreateWsolAtaIxs> => {
-  const createIxs: IInstruction[] = [];
-  const closeIxs: IInstruction[] = [];
+  const createIxs: Instruction[] = [];
+  const closeIxs: Instruction[] = [];
 
   const wsolAta: Address = await getAssociatedTokenAddress(WRAPPED_SOL_MINT, owner.address, TOKEN_PROGRAM_ADDRESS);
 

package/src/utils/instruction.ts

@@ -1,12 +1,12 @@
 import Decimal from 'decimal.js';
 
-import { Address, IInstruction, Rpc, GetMultipleAccountsApi, Account, isAddress } from '@solana/kit';
+import { Address, Instruction, Rpc, GetMultipleAccountsApi, Account, isAddress } from '@solana/kit';
 import { batchFetch } from '@kamino-finance/kliquidity-sdk';
 import { getSetComputeUnitLimitInstruction, getSetComputeUnitPriceInstruction } from '@solana-program/compute-budget';
 import { AddressLookupTable, fetchAllAddressLookupTable } from '@solana-program/address-lookup-table';
 import { COMPUTE_BUDGET_PROGRAM_ID } from './pubkey';
 
-export function buildComputeBudgetIx(units: number): IInstruction {
+export function buildComputeBudgetIx(units: number): Instruction {
   return getSetComputeUnitLimitInstruction({ units });
 }
 
@@ -17,8 +17,8 @@ export async function getLookupTableAccounts(
   return batchFetch(addresses, (batch) => fetchAllAddressLookupTable(rpc, batch));
 }
 
-export const getComputeBudgetAndPriorityFeeIxs = (units: number, priorityFeeLamports?: Decimal): IInstruction[] => {
-  const ixs: IInstruction[] = [];
+export const getComputeBudgetAndPriorityFeeIxs = (units: number, priorityFeeLamports?: Decimal): Instruction[] => {
+  const ixs: Instruction[] = [];
   ixs.push(getSetComputeUnitLimitInstruction({ units }));
 
   if (priorityFeeLamports && priorityFeeLamports.gt(0)) {
@@ -41,7 +41,7 @@ export function notEmpty<TValue>(value: TValue | null | undefined): value is TVa
 }
 
 export function uniqueAccountsWithProgramIds(
-  ixs: IInstruction[],
+  ixs: Instruction[],
   addressLookupTables: Address[] | Account<AddressLookupTable>[] = []
 ): Array<Address> {
   let luts: Address[];
@@ -66,7 +66,7 @@ export function uniqueAccountsWithProgramIds(
   return [...uniqueAccounts];
 }
 
-export function removeBudgetIxs(ixs: IInstruction[]): IInstruction[] {
+export function removeBudgetIxs(ixs: Instruction[]): Instruction[] {
   return ixs.filter(({ programAddress }) => {
     return programAddress !== COMPUTE_BUDGET_PROGRAM_ID;
   });

package/src/utils/lookupTable.ts

@@ -1,4 +1,4 @@
-import { Address, GetAccountInfoApi, GetSlotApi, IInstruction, Rpc, Slot, TransactionSigner } from '@solana/kit';
+import { Address, GetAccountInfoApi, GetSlotApi, Instruction, Rpc, Slot, TransactionSigner } from '@solana/kit';
 import {
   fetchAddressLookupTable,
   findAddressLookupTablePda,
@@ -22,7 +22,7 @@ export async function printAddressLookupTable(rpc: Rpc<GetAccountInfoApi>, looku
 export async function createLookupTableIx(
   connection: Rpc<GetSlotApi>,
   authority: TransactionSigner
-): Promise<[IInstruction, Address]> {
+): Promise<[Instruction, Address]> {
   const recentSlot = await connection.getSlot({ commitment: 'finalized' }).send();
   return initLookupTableIx(authority, recentSlot);
 }
@@ -32,7 +32,7 @@ export function extendLookupTableChunkIx(
   lookupTablePk: Address,
   keys: Address[],
   payer: TransactionSigner = authority
-): IInstruction {
+): Instruction {
   return getExtendLookupTableInstruction({
     authority,
     payer,
@@ -46,9 +46,9 @@ export const extendLookupTableIxs = (
   table: Address,
   keys: Address[],
   payer: TransactionSigner = authority
-): IInstruction[] => {
+): Instruction[] => {
   const chunkSize = 25;
-  const extendLookupIxs: IInstruction[] = [];
+  const extendLookupIxs: Instruction[] = [];
   for (let i = 0; i < keys.length; i += chunkSize) {
     const chunk = keys.slice(i, i + chunkSize);
     extendLookupIxs.push(extendLookupTableChunkIx(authority, table, chunk, payer));
@@ -65,7 +65,7 @@ export const extendLookupTableIxs = (
 export async function initLookupTableIx(
   authority: TransactionSigner,
   recentSlot: Slot
-): Promise<[IInstruction, Address]> {
+): Promise<[Instruction, Address]> {
   const address = await findAddressLookupTablePda({ authority: authority.address, recentSlot });
   const createLookupTableIx = getCreateLookupTableInstruction({
     authority,
@@ -82,7 +82,7 @@ export async function initLookupTableIx(
  * @param lookupTable - the lookup table to deactivate
  * @returns - the instruction to deactivate the lookup table
  */
-export function deactivateLookupTableIx(authority: TransactionSigner, lookupTable: Address): IInstruction {
+export function deactivateLookupTableIx(authority: TransactionSigner, lookupTable: Address): Instruction {
   return getDeactivateLookupTableInstruction({
     authority,
     address: lookupTable,
@@ -96,7 +96,7 @@ export function deactivateLookupTableIx(authority: TransactionSigner, lookupTabl
  * @returns - the instruction to close the lookup table
  */
 /// this require the LUT to be deactivated at least 500 blocks before
-export function closeLookupTableIx(authority: TransactionSigner, lookupTable: Address): IInstruction {
+export function closeLookupTableIx(authority: TransactionSigner, lookupTable: Address): Instruction {
   return getCloseLookupTableInstruction({
     authority,
     address: lookupTable,