@kamino-finance/klend-sdk 7.0.13 → 7.1.1

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,

package/src/utils/metadata.ts

@@ -8,7 +8,7 @@ import {
   UpdateSharesMetadataAccounts,
   UpdateSharesMetadataArgs,
 } from '../lib';
-import { Address, IInstruction, TransactionSigner } from '@solana/kit';
+import { Address, Instruction, TransactionSigner } from '@solana/kit';
 import { SYSTEM_PROGRAM_ADDRESS } from '@solana-program/system';
 import { SYSVAR_RENT_ADDRESS } from '@solana/sysvars';
 
@@ -61,7 +61,7 @@ export async function getInitializeKVaultSharesMetadataIx(
   name: string,
   symbol: string,
   uri: string
-): Promise<IInstruction> {
+): Promise<Instruction> {
   const [sharesMintMetadata] = await getKVaultSharesMetadataPda(sharesMint);
 
   const args: InitializeSharesMetadataArgs = {
@@ -93,7 +93,7 @@ export async function getUpdateSharesMetadataIx(
   name: string,
   symbol: string,
   uri: string
-): Promise<IInstruction> {
+): Promise<Instruction> {
   const [sharesMintMetadata] = await getKVaultSharesMetadataPda(sharesMint);
 
   const args: UpdateSharesMetadataArgs = {

package/src/utils/userMetadata.ts

@@ -1,6 +1,6 @@
 import {
   Address,
-  IInstruction,
+  Instruction,
   none,
   some,
   Rpc,
@@ -46,9 +46,9 @@ export const getUserLutAddressAndSetupIxs = async (
   leverageMints: { coll: Address; debt: Address }[] = [],
   repayWithCollObligation: KaminoObligation | undefined = undefined,
   payer: TransactionSigner = user
-): Promise<[Address, IInstruction[][]]> => {
+): Promise<[Address, Instruction[][]]> => {
   const [userMetadataAddress, userMetadataState] = await kaminoMarket.getUserMetadata(user.address);
-  const initUserMetadataIxs: IInstruction[] = [];
+  const initUserMetadataIxs: Instruction[] = [];
   let userLookupTableAddress: Address;
 
   if (userMetadataState === null) {
@@ -72,6 +72,7 @@ export const getUserLutAddressAndSetupIxs = async (
           rent: SYSVAR_RENT_ADDRESS,
           systemProgram: SYSTEM_PROGRAM_ADDRESS,
         },
+        undefined,
         kaminoMarket.programId
       )
     );