@kamino-finance/klend-sdk 7.0.13 → 7.1.1

package/src/classes/manager.ts

@@ -1,6 +1,6 @@
 import {
   Address,
-  IInstruction,
+  Instruction,
   generateKeyPairSigner,
   TransactionSigner,
   Slot,
@@ -145,11 +145,11 @@ 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[] }> {
+  async createMarketIxs(params: CreateKaminoMarketParams): Promise<{ market: TransactionSigner; ixs: Instruction[] }> {
     const marketAccount = await generateKeyPairSigner();
     const size = BigInt(LendingMarket.layout.span + 8);
     const [lendingMarketAuthority] = await lendingMarketAuthPda(marketAccount.address, this._kaminoLendProgramId);
-    const createMarketIxs: IInstruction[] = [];
+    const createMarketIxs: Instruction[] = [];
 
     createMarketIxs.push(
       getCreateAccountInstruction({
@@ -173,7 +173,7 @@ export class KaminoManager {
       quoteCurrency: Array(32).fill(0),
     };
 
-    createMarketIxs.push(initLendingMarket(args, accounts, this._kaminoLendProgramId));
+    createMarketIxs.push(initLendingMarket(args, accounts, undefined, this._kaminoLendProgramId));
 
     return { market: marketAccount, ixs: createMarketIxs };
   }
@@ -188,7 +188,7 @@ export class KaminoManager {
    */
   async addAssetToMarketIxs(
     params: AddAssetToMarketParams
-  ): Promise<{ reserve: TransactionSigner; txnIxs: IInstruction[][] }> {
+  ): Promise<{ reserve: TransactionSigner; txnIxs: Instruction[][] }> {
     const market = await LendingMarket.fetch(this._rpc, params.marketAddress, this._kaminoLendProgramId);
     if (!market) {
       throw new Error('Market not found');
@@ -217,7 +217,7 @@ export class KaminoManager {
       false
     );
 
-    const txnIxs: IInstruction[][] = [];
+    const txnIxs: Instruction[][] = [];
     txnIxs.push(createReserveInstructions);
     txnIxs.push(updateReserveInstructions);
 
@@ -284,7 +284,7 @@ export class KaminoManager {
     vaultAdminAuthority?: TransactionSigner,
     unallocatedWeight?: BN,
     unallocatedCap?: BN
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     return this._vaultClient.updateVaultUnallocatedWeightAndCapIxs(
       vault,
       vaultAdminAuthority,
@@ -304,7 +304,7 @@ export class KaminoManager {
     vault: KaminoVault,
     reserve: Address,
     vaultAdminAuthority?: TransactionSigner
-  ): Promise<IInstruction | undefined> {
+  ): Promise<Instruction | undefined> {
     return this._vaultClient.removeReserveFromAllocationIx(vault, reserve, vaultAdminAuthority);
   }
 
@@ -321,7 +321,7 @@ export class KaminoManager {
     kaminoVault: KaminoVault,
     reserveAddress: Address,
     reserveState?: Reserve
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     const connection = this.getRpc();
     const vaultState = await kaminoVault.getState(connection);
 
@@ -453,7 +453,7 @@ export class KaminoManager {
     scopeOracleConfig: ScopeOracleConfig,
     scopeTwapConfig?: ScopeOracleConfig,
     maxAgeBufferSeconds: number = 20
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     const reserveConfig = reserve.state.config;
 
     let scopeTwapId = U16_MAX;
@@ -504,11 +504,11 @@ export class KaminoManager {
     config: ReserveConfig,
     reserveStateOverride?: Reserve,
     updateEntireConfig: boolean = false
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     const reserveState = reserveStateOverride
       ? reserveStateOverride
       : (await Reserve.fetch(this._rpc, reserve, this._kaminoLendProgramId))!;
-    const ixs: IInstruction[] = [];
+    const ixs: Instruction[] = [];
 
     if (!reserveState || updateEntireConfig) {
       ixs.push(
@@ -568,7 +568,7 @@ export class KaminoManager {
     vault: KaminoVault,
     sharesAmount?: Decimal,
     farmState?: FarmState
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     return this._vaultClient.stakeSharesIxs(user, vault, sharesAmount, farmState);
   }
 
@@ -633,7 +633,7 @@ export class KaminoManager {
     vault: KaminoVault,
     maxAmountToGiveUp: Decimal,
     vaultAdminAuthority?: TransactionSigner
-  ): Promise<IInstruction> {
+  ): Promise<Instruction> {
     return this._vaultClient.giveUpPendingFeesIx(vault, maxAmountToGiveUp, vaultAdminAuthority);
   }
 
@@ -669,7 +669,7 @@ export class KaminoManager {
     vault: KaminoVault,
     slot: Slot,
     vaultAdminAuthority?: TransactionSigner
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     return this._vaultClient.withdrawPendingFeesIxs(vault, slot, undefined, vaultAdminAuthority);
   }
 
@@ -686,7 +686,7 @@ export class KaminoManager {
     lut: Address,
     keys: Address[],
     accountsInLUT?: Address[]
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     return this._vaultClient.insertIntoLookupTableIxs(payer, lut, keys, accountsInLUT);
   }
 
@@ -1315,7 +1315,7 @@ export class KaminoManager {
    * @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: TransactionSigner, kaminoVault: KaminoVault): Promise<Instruction[]> {
     return this._vaultClient.investAllReservesIxs(payer, kaminoVault);
   }
 
@@ -1332,7 +1332,7 @@ export class KaminoManager {
     kaminoVault: KaminoVault,
     reserveWithAddress: ReserveWithAddress,
     vaultReservesMap?: Map<Address, KaminoReserve>
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     return this._vaultClient.investSingleReserveIxs(payer, kaminoVault, reserveWithAddress, vaultReservesMap);
   }
 
@@ -1440,7 +1440,7 @@ export class KaminoManager {
     lendingMarketOwner: TransactionSigner,
     marketWithAddress: MarketWithAddress,
     newMarket: LendingMarket
-  ): IInstruction[] {
+  ): Instruction[] {
     return parseForChangesMarketConfigAndGetIxs(
       lendingMarketOwner,
       marketWithAddress,
@@ -1460,7 +1460,7 @@ export class KaminoManager {
     currentAdmin: TransactionSigner,
     marketWithAddress: MarketWithAddress,
     newAdmin: Address
-  ): IInstruction[] {
+  ): Instruction[] {
     const newMarket = new LendingMarket({ ...marketWithAddress.state, lendingMarketOwnerCached: newAdmin });
     return this.updateLendingMarketIxs(currentAdmin, marketWithAddress, newMarket);
   }
@@ -1474,12 +1474,12 @@ export class KaminoManager {
   updateLendingMarketOwnerIxs(
     marketWithAddress: MarketWithAddress,
     lendingMarketOwnerCached: TransactionSigner = noopSigner(marketWithAddress.state.lendingMarketOwnerCached)
-  ): IInstruction {
+  ): Instruction {
     const accounts: UpdateLendingMarketOwnerAccounts = {
       lendingMarketOwnerCached,
       lendingMarket: marketWithAddress.address,
     };
-    return updateLendingMarketOwner(accounts, this._kaminoLendProgramId);
+    return updateLendingMarketOwner(accounts, undefined, this._kaminoLendProgramId);
   }
 
   /**
@@ -1574,7 +1574,7 @@ function parseForChangesMarketConfigAndGetIxs(
   marketWithAddress: MarketWithAddress,
   newMarket: LendingMarket,
   programId: Address
-): IInstruction[] {
+): Instruction[] {
   const encodedMarketUpdates = MARKET_UPDATER.encodeAllUpdates(marketWithAddress.state, newMarket);
   return encodedMarketUpdates.map((encodedMarketUpdate) =>
     updateMarketConfigIx(
@@ -1593,7 +1593,7 @@ function updateMarketConfigIx(
   mode: UpdateLendingMarketModeKind,
   value: Uint8Array,
   programId: Address
-): IInstruction {
+): Instruction {
   const accounts: UpdateLendingMarketAccounts = {
     lendingMarketOwner,
     lendingMarket: marketWithAddress.address,
@@ -1606,7 +1606,7 @@ function updateMarketConfigIx(
     value: [...value, ...Array(72 - value.length).fill(0)],
   };
 
-  const ix = updateLendingMarket(args, accounts, programId);
+  const ix = updateLendingMarket(args, accounts, undefined, programId);
 
   return ix;
 }

package/src/classes/reserve.ts

@@ -1,7 +1,7 @@
 /* eslint-disable max-classes-per-file */
 import {
   Address,
-  IInstruction,
+  Instruction,
   Slot,
   TransactionSigner,
   Rpc,
@@ -1151,7 +1151,7 @@ export async function createReserveIxs(
   liquidityMintTokenProgram: Address,
   reserveAddress: TransactionSigner,
   programId: Address
-): Promise<IInstruction[]> {
+): Promise<Instruction[]> {
   const size = BigInt(Reserve.layout.span + 8);
   const createReserveIx = getCreateAccountInstruction({
     payer: owner,
@@ -1185,7 +1185,7 @@ export async function createReserveIxs(
     rent: SYSVAR_RENT_ADDRESS,
   };
 
-  const initReserveIx = initReserve(accounts, programId);
+  const initReserveIx = initReserve(accounts, undefined, programId);
 
   return [createReserveIx, initReserveIx];
 }
@@ -1198,7 +1198,7 @@ export async function updateReserveConfigIx(
   value: Uint8Array,
   programId: Address,
   skipConfigIntegrityValidation: boolean = false
-): Promise<IInstruction> {
+): Promise<Instruction> {
   const args: UpdateReserveConfigArgs = {
     mode,
     value,
@@ -1213,7 +1213,7 @@ export async function updateReserveConfigIx(
     globalConfig,
   };
 
-  return updateReserveConfig(args, accounts, programId);
+  return updateReserveConfig(args, accounts, undefined, programId);
 }
 
 export const RESERVE_CONFIG_UPDATER = new ConfigUpdater(UpdateConfigMode.fromDecoded, ReserveConfig, (config) => ({
@@ -1282,7 +1282,7 @@ export async function updateEntireReserveConfigIx(
   reserveAddress: Address,
   reserveConfig: ReserveConfig,
   programId: Address
-): Promise<IInstruction> {
+): Promise<Instruction> {
   const args: UpdateReserveConfigArgs = {
     mode: new UpdateConfigMode.UpdateEntireReserveConfig(),
     value: encodeUsingLayout(ReserveConfig.layout(), reserveConfig),
@@ -1297,7 +1297,7 @@ export async function updateEntireReserveConfigIx(
     globalConfig,
   };
 
-  const ix = updateReserveConfig(args, accounts, programId);
+  const ix = updateReserveConfig(args, accounts, undefined, programId);
 
   return ix;
 }
@@ -1309,7 +1309,7 @@ export function parseForChangesReserveConfigAndGetIxs(
   reserveConfig: ReserveConfig,
   programId: Address,
   lendingMarketOwner: TransactionSigner = noopSigner(marketWithAddress.state.lendingMarketOwner)
-): Promise<IInstruction[]> {
+): Promise<Instruction[]> {
   const encodedConfigUpdates = RESERVE_CONFIG_UPDATER.encodeAllUpdates(reserve?.config, reserveConfig);
   encodedConfigUpdates.sort((left, right) => priorityOf(left.mode) - priorityOf(right.mode));
   return Promise.all(

package/src/classes/vault.ts

@@ -13,8 +13,8 @@ import {
   GetProgramAccountsDatasizeFilter,
   GetProgramAccountsMemcmpFilter,
   getProgramDerivedAddress,
-  IAccountMeta,
-  IInstruction,
+  AccountMeta,
+  Instruction,
   lamports,
   ProgramDerivedAddress,
   Rpc,
@@ -243,8 +243,8 @@ export class KaminoVaultClient {
     ]);
 
     let adminTokenAccount: Address;
-    const prerequisiteIxs: IInstruction[] = [];
-    const cleanupIxs: IInstruction[] = [];
+    const prerequisiteIxs: Instruction[] = [];
+    const cleanupIxs: Instruction[] = [];
     if (vaultConfig.tokenMint === WRAPPED_SOL_MINT) {
       const { wsolAta, createAtaIxs, closeAtaIxs } = await createWsolAtaIfMissing(
         this.getConnection(),
@@ -278,7 +278,7 @@ export class KaminoVaultClient {
       sharesTokenProgram: TOKEN_PROGRAM_ADDRESS,
       adminTokenAccount,
     };
-    const initVaultIx = initVault(initVaultAccounts, this._kaminoVaultProgramId);
+    const initVaultIx = initVault(initVaultAccounts, undefined, this._kaminoVaultProgramId);
 
     // create and set up the vault lookup table
     const [createLUTIx, lut] = await initLookupTableIx(vaultConfig.admin, slot);
@@ -432,6 +432,7 @@ export class KaminoVaultClient {
     const updateReserveAllocationIx = updateReserveAllocation(
       updateReserveAllocationArgs,
       updateReserveAllocationAccounts,
+      undefined,
       this._kaminoVaultProgramId
     );
 
@@ -477,7 +478,7 @@ export class KaminoVaultClient {
     const unallocatedWeightToUse = unallocatedWeight ? unallocatedWeight : vaultState.unallocatedWeight;
     const unallocatedCapToUse = unallocatedCap ? unallocatedCap : vaultState.unallocatedTokensCap;
 
-    const ixs: IInstruction[] = [];
+    const ixs: Instruction[] = [];
 
     if (!unallocatedWeightToUse.eq(vaultState.unallocatedWeight)) {
       const updateVaultUnallocatedWeightIx = await this.updateVaultConfigIxs(
@@ -657,7 +658,7 @@ export class KaminoVaultClient {
     vault: KaminoVault,
     reserve: Address,
     vaultAdminAuthority?: TransactionSigner
-  ): Promise<IInstruction | undefined> {
+  ): Promise<Instruction | undefined> {
     const vaultState = await vault.getState(this.getConnection());
     const vaultAdmin = parseVaultAdmin(vaultState, vaultAdminAuthority);
 
@@ -729,6 +730,7 @@ export class KaminoVaultClient {
     let updateVaultConfigIx = updateVaultConfig(
       updateVaultConfigArgs,
       updateVaultConfigAccs,
+      undefined,
       this._kaminoVaultProgramId
     );
     updateVaultConfigIx = this.appendRemainingAccountsForVaultReserves(
@@ -737,7 +739,7 @@ export class KaminoVaultClient {
       vaultReservesState
     );
 
-    const updateLUTIxs: IInstruction[] = [];
+    const updateLUTIxs: Instruction[] = [];
 
     if (mode.kind === new VaultConfigField.PendingVaultAdmin().kind) {
       const newPubkey = address(value);
@@ -807,7 +809,7 @@ export class KaminoVaultClient {
     vault: Address,
     mode: VaultConfigFieldKind,
     value: string
-  ): IInstruction {
+  ): Instruction {
     const updateVaultConfigAccs: UpdateVaultConfigAccounts = {
       vaultAdminAuthority: admin,
       vaultState: vault,
@@ -836,6 +838,7 @@ export class KaminoVaultClient {
     const updateVaultConfigIx = updateVaultConfig(
       updateVaultConfigArgs,
       updateVaultConfigAccs,
+      undefined,
       this._kaminoVaultProgramId
     );
 
@@ -860,14 +863,14 @@ export class KaminoVaultClient {
       vaultState: vault.address,
     };
 
-    const acceptVaultOwnershipIx = updateAdmin(acceptOwneshipAccounts, this._kaminoVaultProgramId);
+    const acceptVaultOwnershipIx = updateAdmin(acceptOwneshipAccounts, undefined, this._kaminoVaultProgramId);
 
     // read the current LUT and create a new one for the new admin and backfill it
     const accountsInExistentLUT = (await getAccountsInLut(this.getConnection(), vaultState.vaultLookupTable)).filter(
       (account) => account !== vaultState.vaultAdminAuthority
     );
 
-    const lutIxs: IInstruction[] = [];
+    const lutIxs: Instruction[] = [];
     const [initNewLutIx, newLut] = await initLookupTableIx(
       signer,
       await this.getConnection().getSlot({ commitment: 'finalized' }).send()
@@ -906,7 +909,7 @@ export class KaminoVaultClient {
     vault: KaminoVault,
     maxAmountToGiveUp: Decimal,
     vaultAdminAuthority?: TransactionSigner
-  ): Promise<IInstruction> {
+  ): Promise<Instruction> {
     const vaultState: VaultState = await vault.getState(this.getConnection());
     const vaultAdmin = parseVaultAdmin(vaultState, vaultAdminAuthority);
 
@@ -924,7 +927,7 @@ export class KaminoVaultClient {
       maxAmountToGiveUp: new BN(maxAmountToGiveUpLamports.toString()),
     };
 
-    return giveUpPendingFees(giveUpPendingFeesArgs, giveUpPendingFeesAccounts, this._kaminoVaultProgramId);
+    return giveUpPendingFees(giveUpPendingFeesArgs, giveUpPendingFeesAccounts, undefined, this._kaminoVaultProgramId);
   }
 
   /**
@@ -941,7 +944,7 @@ export class KaminoVaultClient {
     slot: Slot,
     vaultReservesMap?: Map<Address, KaminoReserve>,
     vaultAdminAuthority?: TransactionSigner
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     const vaultState: VaultState = await vault.getState(this.getConnection());
     const vaultAdmin = parseVaultAdmin(vaultState, vaultAdminAuthority);
     const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
@@ -985,7 +988,7 @@ export class KaminoVaultClient {
       reservesToWithdraw,
       this._kaminoLendProgramId
     );
-    const withdrawIxs: IInstruction[] = await Promise.all(
+    const withdrawIxs: Instruction[] = await Promise.all(
       reservesToWithdraw.map(async (reserve, index) => {
         if (reserveStates[index] === null) {
           throw new Error(`Reserve ${reserve} not found`);
@@ -1008,7 +1011,7 @@ export class KaminoVaultClient {
     return [createAtaIx, ...withdrawIxs];
   }
 
-  // async closeVaultIx(vault: KaminoVault): Promise<IInstruction> {
+  // async closeVaultIx(vault: KaminoVault): Promise<Instruction> {
   //   const vaultState: VaultState = await vault.getState(this.getConnection());
 
   //   const closeVaultAccounts: CloseVaultAccounts = {
@@ -1039,8 +1042,8 @@ export class KaminoVaultClient {
 
     const tokenProgramID = vaultState.tokenProgram;
     const userTokenAta = await getAssociatedTokenAddress(vaultState.tokenMint, user.address, tokenProgramID);
-    const createAtasIxs: IInstruction[] = [];
-    const closeAtasIxs: IInstruction[] = [];
+    const createAtasIxs: Instruction[] = [];
+    const closeAtasIxs: Instruction[] = [];
     if (vaultState.tokenMint === WRAPPED_SOL_MINT) {
       const [{ ata: wsolAta, createAtaIx: createWsolAtaIxn }] = await createAtasIdempotent(user, [
         {
@@ -1090,7 +1093,7 @@ export class KaminoVaultClient {
       ),
     };
 
-    let depositIx = deposit(depositArgs, depositAccounts, this._kaminoVaultProgramId);
+    let depositIx = deposit(depositArgs, depositAccounts, undefined, this._kaminoVaultProgramId);
 
     const vaultReserves = this.getVaultReserves(vaultState);
 
@@ -1126,7 +1129,7 @@ export class KaminoVaultClient {
     vault: KaminoVault,
     sharesAmount?: Decimal,
     farmState?: FarmState
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     const vaultState = await vault.getState(this.getConnection());
 
     let sharesToStakeLamports = new Decimal(U64_MAX);
@@ -1287,7 +1290,7 @@ export class KaminoVaultClient {
     user: TransactionSigner,
     vault: KaminoVault,
     shareAmount: Decimal
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     const vaultState = await vault.getState(this.getConnection());
     const kaminoVault = new KaminoVault(vault.address, vaultState, vault.programId);
 
@@ -1319,7 +1322,7 @@ export class KaminoVaultClient {
     allUserShares: Decimal,
     slot: Slot,
     vaultReservesMap?: Map<Address, KaminoReserve>
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     const vaultState = await vault.getState(this.getConnection());
 
     const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
@@ -1395,7 +1398,7 @@ export class KaminoVaultClient {
       });
     }
 
-    const withdrawIxs: IInstruction[] = [];
+    const withdrawIxs: Instruction[] = [];
     withdrawIxs.push(createAtaIx);
     for (let reserveIndex = 0; reserveIndex < reserveWithSharesAmountToWithdraw.length; reserveIndex++) {
       const reserveWithTokens = reserveWithSharesAmountToWithdraw[reserveIndex];
@@ -1435,7 +1438,7 @@ export class KaminoVaultClient {
    * @param vault - vault to invest from
    * @returns - an array of invest instructions for each invest action required for the vault reserves
    */
-  async investAllReservesIxs(payer: TransactionSigner, vault: KaminoVault): Promise<IInstruction[]> {
+  async investAllReservesIxs(payer: TransactionSigner, vault: KaminoVault): Promise<Instruction[]> {
     const vaultState = await vault.getState(this.getConnection());
     const minInvestAmount = vaultState.minInvestAmount;
     const allReserves = this.getVaultReserves(vaultState);
@@ -1483,7 +1486,7 @@ export class KaminoVaultClient {
       }
     }
 
-    const investIxsPromises: Promise<IInstruction[]>[] = [];
+    const investIxsPromises: Promise<Instruction[]>[] = [];
     // invest first the reserves from which we disinvest, then the other ones
     for (const reserve of reservesToDisinvestFrom) {
       const reserveState = allReservesStateMap.get(reserve);
@@ -1521,7 +1524,7 @@ export class KaminoVaultClient {
       investIxsPromises.push(investIxsPromise);
     }
 
-    let investIxs: IInstruction[] = [];
+    let investIxs: Instruction[] = [];
     investIxs.push(createAtaIx);
     investIxs = await Promise.all(investIxsPromises).then((ixs) => ixs.flat());
 
@@ -1544,12 +1547,12 @@ export class KaminoVaultClient {
     reserve: ReserveWithAddress,
     vaultReservesMap?: Map<Address, KaminoReserve>,
     createAtaIfNeeded: boolean = true
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     const vaultState = await vault.getState(this.getConnection());
     const cTokenVault = await getCTokenVaultPda(vault.address, reserve.address, this._kaminoVaultProgramId);
     const [lendingMarketAuth] = await lendingMarketAuthPda(reserve.state.lendingMarket, this._kaminoLendProgramId);
 
-    const ixs: IInstruction[] = [];
+    const ixs: Instruction[] = [];
 
     const tokenProgram = await getAccountOwner(this.getConnection(), vaultState.tokenMint);
     const [{ ata: payerTokenAta, createAtaIx }] = await createAtasIdempotent(payer, [
@@ -1579,7 +1582,7 @@ export class KaminoVaultClient {
       reserveCollateralTokenProgram: TOKEN_PROGRAM_ADDRESS,
     };
 
-    let investIx = invest(investAccounts, this._kaminoVaultProgramId);
+    let investIx = invest(investAccounts, undefined, this._kaminoVaultProgramId);
 
     const vaultReserves = this.getVaultReserves(vaultState);
     const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
@@ -1610,7 +1613,7 @@ export class KaminoVaultClient {
     userTokenAta: Address,
     shareAmountLamports: Decimal,
     vaultReservesState: Map<Address, KaminoReserve>
-  ): Promise<IInstruction> {
+  ): Promise<Instruction> {
     const [lendingMarketAuth] = await lendingMarketAuthPda(marketAddress, this._kaminoLendProgramId);
 
     const eventAuthority = await getEventAuthorityPda(this._kaminoVaultProgramId);
@@ -1649,7 +1652,7 @@ export class KaminoVaultClient {
       sharesAmount: new BN(shareAmountLamports.floor().toString()),
     };
 
-    let withdrawIxn = withdraw(withdrawArgs, withdrawAccounts, this._kaminoVaultProgramId);
+    let withdrawIxn = withdraw(withdrawArgs, withdrawAccounts, undefined, this._kaminoVaultProgramId);
 
     const vaultReserves = this.getVaultReserves(vaultState);
     withdrawIxn = this.appendRemainingAccountsForVaultReserves(withdrawIxn, vaultReserves, vaultReservesState);
@@ -1664,7 +1667,7 @@ export class KaminoVaultClient {
     userSharesAta: Address,
     userTokenAta: Address,
     shareAmountLamports: Decimal
-  ): Promise<IInstruction> {
+  ): Promise<Instruction> {
     const eventAuthority = await getEventAuthorityPda(this._kaminoVaultProgramId);
     const withdrawFromAvailableAccounts: WithdrawFromAvailableAccounts = {
       user,
@@ -1686,7 +1689,7 @@ export class KaminoVaultClient {
       sharesAmount: new BN(shareAmountLamports.floor().toString()),
     };
 
-    return withdrawFromAvailable(withdrawFromAvailableArgs, withdrawFromAvailableAccounts, this._kaminoVaultProgramId);
+    return withdrawFromAvailable(withdrawFromAvailableArgs, withdrawFromAvailableAccounts, undefined, this._kaminoVaultProgramId);
   }
 
   private async withdrawPendingFeesIx(
@@ -1696,7 +1699,7 @@ export class KaminoVaultClient {
     marketAddress: Address,
     reserve: ReserveWithAddress,
     adminTokenAta: Address
-  ): Promise<IInstruction> {
+  ): Promise<Instruction> {
     const [lendingMarketAuth] = await lendingMarketAuthPda(marketAddress, this._kaminoLendProgramId);
 
     const withdrawPendingFeesAccounts: WithdrawPendingFeesAccounts = {
@@ -1719,7 +1722,7 @@ export class KaminoVaultClient {
       reserveCollateralTokenProgram: TOKEN_PROGRAM_ADDRESS,
     };
 
-    let withdrawPendingFeesIxn = withdrawPendingFees(withdrawPendingFeesAccounts, this._kaminoVaultProgramId);
+    let withdrawPendingFeesIxn = withdrawPendingFees(withdrawPendingFeesAccounts, undefined, this._kaminoVaultProgramId);
 
     const vaultReserves = this.getVaultReserves(vaultState);
     const vaultReservesState = await this.loadVaultReserves(vaultState);
@@ -1788,7 +1791,7 @@ export class KaminoVaultClient {
       allAccountsToBeInserted.push(vaultState.vaultFarm);
     }
 
-    const setupLUTIfNeededIxs: IInstruction[] = [];
+    const setupLUTIfNeededIxs: Instruction[] = [];
     let lut = vaultState.vaultLookupTable;
     if (lut === DEFAULT_PUBLIC_KEY) {
       const recentSlot = await this.getConnection().getSlot({ commitment: 'confirmed' }).send();
@@ -1805,7 +1808,7 @@ export class KaminoVaultClient {
       setupLUTIfNeededIxs.push(updateVaultConfigIxs.updateVaultConfigIx);
     }
 
-    const ixs: IInstruction[] = [];
+    const ixs: Instruction[] = [];
     let overriddenExistentAccounts: Address[] | undefined = undefined;
     if (vaultState.vaultLookupTable === DEFAULT_PUBLIC_KEY) {
       overriddenExistentAccounts = [];
@@ -1846,7 +1849,7 @@ export class KaminoVaultClient {
     lookupTable: Address,
     keys: Address[],
     accountsInLut?: Address[]
-  ): Promise<IInstruction[]> {
+  ): Promise<Instruction[]> {
     let lutContentsList = accountsInLut;
     if (!accountsInLut) {
       lutContentsList = await getAccountsInLut(this.getConnection(), lookupTable);
@@ -1861,7 +1864,7 @@ export class KaminoVaultClient {
     const missingAccountsList = [...new Set<Address>(missingAccounts)];
 
     const chunkSize = 10;
-    const ixs: IInstruction[] = [];
+    const ixs: Instruction[] = [];
 
     for (let i = 0; i < missingAccountsList.length; i += chunkSize) {
       const chunk = missingAccountsList.slice(i, i + chunkSize);
@@ -3263,12 +3266,12 @@ export class KaminoVaultClient {
   }
 
   private appendRemainingAccountsForVaultReserves(
-    ix: IInstruction,
+    ix: Instruction,
     vaultReserves: Address[],
     vaultReservesState: Map<Address, KaminoReserve>
-  ): IInstruction {
-    let vaultReservesAccountMetas: IAccountMeta[] = [];
-    let vaultReservesLendingMarkets: IAccountMeta[] = [];
+  ): Instruction {
+    let vaultReservesAccountMetas: AccountMeta[] = [];
+    let vaultReservesLendingMarkets: AccountMeta[] = [];
     vaultReserves.forEach((reserve) => {
       const reserveState = vaultReservesState.get(reserve);
       if (reserveState === undefined) {