@kamino-finance/klend-sdk 7.0.13 → 7.1.0

package/src/@codegen/pyth_rec/instructions/setWormholeAddress.ts

@@ -2,9 +2,9 @@
 import {
   Address,
   isSome,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
+  AccountMeta,
+  AccountSignerMeta,
+  Instruction,
   Option,
   TransactionSigner,
 } from "@solana/kit"
@@ -15,6 +15,10 @@ import { borshAddress } from "../utils" // eslint-disable-line @typescript-eslin
 import * as types from "../types" // eslint-disable-line @typescript-eslint/no-unused-vars
 import { PROGRAM_ID } from "../programId"
 
+export const DISCRIMINATOR = Buffer.from([
+  154, 174, 252, 157, 91, 215, 179, 156,
+])
+
 export interface SetWormholeAddressArgs {
   wormhole: Address
 }
@@ -24,18 +28,21 @@ export interface SetWormholeAddressAccounts {
   config: Address
 }
 
-export const layout = borsh.struct([borshAddress("wormhole")])
+export const layout = borsh.struct<SetWormholeAddressArgs>([
+  borshAddress("wormhole"),
+])
 
 export function setWormholeAddress(
   args: SetWormholeAddressArgs,
   accounts: SetWormholeAddressAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.payer.address, role: 2, signer: accounts.payer },
     { address: accounts.config, role: 1 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([154, 174, 252, 157, 91, 215, 179, 156])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -43,7 +50,7 @@ export function setWormholeAddress(
     },
     buffer
   )
-  const data = Buffer.concat([identifier, buffer]).slice(0, 8 + len)
-  const ix: IInstruction = { accounts: keys, programAddress, data }
+  const data = Buffer.concat([DISCRIMINATOR, buffer]).slice(0, 8 + len)
+  const ix: Instruction = { accounts: keys, programAddress, data }
   return ix
 }

package/src/classes/action.ts

@@ -2,8 +2,8 @@ import {
   AccountRole,
   Address,
   fetchEncodedAccount,
-  IAccountMeta,
-  IInstruction,
+  AccountMeta,
+  Instruction,
   isNone,
   isSome,
   none,
@@ -127,22 +127,22 @@ export class KaminoAction {
   amount: BN;
   outflowAmount?: BN;
 
-  computeBudgetIxs: Array<IInstruction>;
+  computeBudgetIxs: Array<Instruction>;
   computeBudgetIxsLabels: Array<string>;
 
-  setupIxs: Array<IInstruction>;
+  setupIxs: Array<Instruction>;
   setupIxsLabels: Array<string>;
 
-  inBetweenIxs: Array<IInstruction>;
+  inBetweenIxs: Array<Instruction>;
   inBetweenIxsLabels: Array<string>;
 
-  lendingIxs: Array<IInstruction>;
+  lendingIxs: Array<Instruction>;
   lendingIxsLabels: Array<string>;
 
-  cleanupIxs: Array<IInstruction>;
+  cleanupIxs: Array<Instruction>;
   cleanupIxsLabels: Array<string>;
 
-  refreshFarmsCleanupTxnIxs: Array<IInstruction>;
+  refreshFarmsCleanupTxnIxs: Array<Instruction>;
   refreshFarmsCleanupTxnIxsLabels: Array<string>;
 
   depositReserves: Array<Address>;
@@ -1180,7 +1180,7 @@ export class KaminoAction {
     kaminoMarket: KaminoMarket,
     obligation: KaminoObligation,
     orderAtIndex: ObligationOrderAtIndex
-  ): IInstruction {
+  ): Instruction {
     return setObligationOrder(
       {
         index: orderAtIndex.index,
@@ -1191,6 +1191,7 @@ export class KaminoAction {
         obligation: obligation.obligationAddress,
         owner,
       },
+      undefined,
       kaminoMarket.programId
     );
   }
@@ -1216,6 +1217,7 @@ export class KaminoAction {
           liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -1242,6 +1244,7 @@ export class KaminoAction {
           liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -1271,6 +1274,7 @@ export class KaminoAction {
           liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -1307,6 +1311,7 @@ export class KaminoAction {
           farmsAccounts,
           farmsProgram: FARMS_PROGRAM_ID,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -1330,6 +1335,7 @@ export class KaminoAction {
           tokenProgram: TOKEN_PROGRAM_ADDRESS,
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -1363,6 +1369,7 @@ export class KaminoAction {
           farmsAccounts,
           farmsProgram: FARMS_PROGRAM_ID,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -1374,7 +1381,7 @@ export class KaminoAction {
 
     const depositReservesList = this.getAdditionalDepositReservesList();
 
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -1396,6 +1403,7 @@ export class KaminoAction {
         tokenProgram: this.reserve.getLiquidityTokenProgram(),
         instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
       },
+      undefined,
       this.kaminoMarket.programId
     );
     borrowIx = {
@@ -1414,7 +1422,7 @@ export class KaminoAction {
 
     const depositReservesList = this.getAdditionalDepositReservesList();
 
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -1446,6 +1454,7 @@ export class KaminoAction {
         farmsAccounts,
         farmsProgram: FARMS_PROGRAM_ID,
       },
+      undefined,
       this.kaminoMarket.programId
     );
     borrowIx = {
@@ -1483,6 +1492,7 @@ export class KaminoAction {
           liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -1520,6 +1530,7 @@ export class KaminoAction {
           farmsAccounts: farmsAccounts,
           farmsProgram: FARMS_PROGRAM_ID,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -1534,7 +1545,7 @@ export class KaminoAction {
 
     const depositReservesList = this.getAdditionalDepositReservesList();
 
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -1553,6 +1564,7 @@ export class KaminoAction {
         tokenProgram: this.reserve.getLiquidityTokenProgram(),
         instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
       },
+      undefined,
       this.kaminoMarket.programId
     );
 
@@ -1580,7 +1592,7 @@ export class KaminoAction {
       this.reserve
     );
 
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -1604,6 +1616,7 @@ export class KaminoAction {
         farmsAccounts,
         farmsProgram: FARMS_PROGRAM_ID,
       },
+      undefined,
       this.kaminoMarket.programId
     );
 
@@ -1629,10 +1642,10 @@ export class KaminoAction {
 
     const depositReservesList = this.getAdditionalDepositReservesList();
 
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
-    const borrowReserveAccountMetas: IAccountMeta[] = this.borrowReserves.map((reserve) => {
+    const borrowReserveAccountMetas: AccountMeta[] = this.borrowReserves.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -1687,6 +1700,7 @@ export class KaminoAction {
         debtFarmsAccounts: debtFarmAccounts,
         farmsProgram: FARMS_PROGRAM_ID,
       },
+      undefined,
       this.kaminoMarket.programId
     );
 
@@ -1708,10 +1722,10 @@ export class KaminoAction {
 
     const depositReservesList = this.getAdditionalDepositReservesList();
 
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
-    const borrowReserveAccountMetas: IAccountMeta[] = this.borrowReserves.map((reserve) => {
+    const borrowReserveAccountMetas: AccountMeta[] = this.borrowReserves.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -1775,6 +1789,7 @@ export class KaminoAction {
         withdrawFarmsAccounts,
         farmsProgram: FARMS_PROGRAM_ID,
       },
+      undefined,
       this.kaminoMarket.programId
     );
 
@@ -1810,6 +1825,7 @@ export class KaminoAction {
           liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -1826,7 +1842,7 @@ export class KaminoAction {
     if (depositReservesList.length === 0) {
       depositReservesList.push(this.reserve.address);
     }
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -1848,6 +1864,7 @@ export class KaminoAction {
         tokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
         instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
       },
+      undefined,
       this.kaminoMarket.programId
     );
 
@@ -1893,6 +1910,7 @@ export class KaminoAction {
           farmsAccounts: collateralFarmsAccounts,
           farmsProgram: FARMS_PROGRAM_ID,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -1909,7 +1927,7 @@ export class KaminoAction {
     if (depositReservesList.length === 0) {
       depositReservesList.push(this.reserve.address);
     }
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -1940,6 +1958,7 @@ export class KaminoAction {
         farmsAccounts: debtFarmsAccounts,
         farmsProgram: FARMS_PROGRAM_ID,
       },
+      undefined,
       this.kaminoMarket.programId
     );
 
@@ -1960,7 +1979,7 @@ export class KaminoAction {
 
     const depositReservesList = this.getAdditionalDepositReservesList();
 
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
     let repayIx = repayObligationLiquidity(
@@ -1978,6 +1997,7 @@ export class KaminoAction {
         tokenProgram: this.reserve.getLiquidityTokenProgram(),
         instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
       },
+      undefined,
       this.kaminoMarket.programId
     );
 
@@ -2016,6 +2036,7 @@ export class KaminoAction {
           liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
           instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -2034,7 +2055,7 @@ export class KaminoAction {
 
     const depositReservesList = this.getAdditionalDepositReservesList();
 
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -2063,6 +2084,7 @@ export class KaminoAction {
         farmsAccounts: debtFarmsAccounts,
         farmsProgram: FARMS_PROGRAM_ID,
       },
+    undefined,
       this.kaminoMarket.programId
     );
 
@@ -2113,6 +2135,7 @@ export class KaminoAction {
           farmsAccounts: collateralFarmsAccounts,
           farmsProgram: FARMS_PROGRAM_ID,
         },
+        undefined,
         this.kaminoMarket.programId
       )
     );
@@ -2129,7 +2152,7 @@ export class KaminoAction {
     }
 
     const depositReservesList = this.getAdditionalDepositReservesList();
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -2162,6 +2185,7 @@ export class KaminoAction {
         withdrawLiquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
         instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
       },
+    undefined,
       this.kaminoMarket.programId
     );
     liquidateIx = {
@@ -2185,7 +2209,7 @@ export class KaminoAction {
     }
 
     const depositReservesList = this.getAdditionalDepositReservesList();
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
@@ -2233,6 +2257,7 @@ export class KaminoAction {
         collateralFarmsAccounts,
         farmsProgram: FARMS_PROGRAM_ID,
       },
+    undefined,
       this.kaminoMarket.programId
     );
     liquidateIx = {
@@ -2671,6 +2696,7 @@ export class KaminoAction {
           ),
           scopePrices: KaminoAction.optionalAccount(state.config.tokenInfo.scopeConfiguration.priceFeed),
         },
+        undefined,
         this.kaminoMarket.programId
       );
 
@@ -2687,8 +2713,8 @@ export class KaminoAction {
     });
   }
 
-  public static getRefreshAllReserves(kaminoMarket: KaminoMarket, reserves: Address[]): IInstruction[] {
-    return reserves.map((reserveAddress): IInstruction => {
+  public static getRefreshAllReserves(kaminoMarket: KaminoMarket, reserves: Address[]): Instruction[] {
+    return reserves.map((reserveAddress): Instruction => {
       const foundReserve = kaminoMarket.getReserveByAddress(reserveAddress);
       if (!foundReserve) {
         throw new Error(`Could not find reserve ${reserveAddress} in reserves`);
@@ -2704,6 +2730,7 @@ export class KaminoAction {
           switchboardTwapOracle: this.optionalAccount(state.config.tokenInfo.switchboardConfiguration.twapAggregator),
           scopePrices: this.optionalAccount(state.config.tokenInfo.scopeConfiguration.priceFeed),
         },
+        undefined,
         kaminoMarket.programId
       );
     });
@@ -2720,6 +2747,7 @@ export class KaminoAction {
         lendingMarket: marketAddress,
         obligation: obligationPda,
       },
+      undefined,
       this.kaminoMarket.programId
     );
 
@@ -2728,16 +2756,16 @@ export class KaminoAction {
     const depositReservesList = this.getAdditionalDepositReservesList().filter(
       (reserve) => !skipReservesSet.has(reserve)
     );
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
     const borrowReservesList = this.borrowReserves.filter((reserve) => !skipReservesSet.has(reserve));
-    const borrowReserveAccountMetas: IAccountMeta[] = borrowReservesList.map((reserve) => {
+    const borrowReserveAccountMetas: AccountMeta[] = borrowReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
-    const borrowReservesReferrerTokenStates: IAccountMeta[] = [];
+    const borrowReservesReferrerTokenStates: AccountMeta[] = [];
     if (isSome(this.referrer)) {
       borrowReservesReferrerTokenStates.push(
         ...(await Promise.all(
@@ -2784,23 +2812,23 @@ export class KaminoAction {
       lendingMarket: this.kaminoMarket.getAddress(),
     };
 
-    let requestElevationGroupIx = requestElevationGroup(args, accounts, this.kaminoMarket.programId);
+    let requestElevationGroupIx = requestElevationGroup(args, accounts, undefined, this.kaminoMarket.programId);
 
     const skipReservesSet = new Set<Address>(skipReserves);
 
     const depositReservesList = this.getAdditionalDepositReservesList().filter(
       (reserve) => !skipReservesSet.has(reserve)
     );
-    const depositReserveAccountMetas: IAccountMeta[] = depositReservesList.map((reserve) => {
+    const depositReserveAccountMetas: AccountMeta[] = depositReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
     const borrowReservesList = this.borrowReserves.filter((reserve) => !skipReservesSet.has(reserve));
-    const borrowReserveAccountMetas: IAccountMeta[] = borrowReservesList.map((reserve) => {
+    const borrowReserveAccountMetas: AccountMeta[] = borrowReservesList.map((reserve) => {
       return { address: reserve, role: AccountRole.WRITABLE };
     });
 
-    const borrowReservesReferrerTokenStates: IAccountMeta[] = [];
+    const borrowReservesReferrerTokenStates: AccountMeta[] = [];
     if (isSome(this.referrer)) {
       borrowReservesReferrerTokenStates.push(
         ...(await Promise.all(
@@ -2879,7 +2907,7 @@ export class KaminoAction {
         rent: SYSVAR_RENT_ADDRESS,
         systemProgram: SYSTEM_PROGRAM_ADDRESS,
       };
-      const refreshFarmForObligationix = refreshObligationFarmsForReserve(args, accounts, this.kaminoMarket.programId);
+      const refreshFarmForObligationix = refreshObligationFarmsForReserve(args, accounts, undefined, this.kaminoMarket.programId);
 
       if (addAsSupportIx === 'setup') {
         this.setupIxs.push(refreshFarmForObligationix);
@@ -2967,7 +2995,7 @@ export class KaminoAction {
         rent: SYSVAR_RENT_ADDRESS,
         systemProgram: SYSTEM_PROGRAM_ADDRESS,
       };
-      const initObligationForFarm = initObligationFarmsForReserve(args, accounts, this.kaminoMarket.programId);
+      const initObligationForFarm = initObligationFarmsForReserve(args, accounts, undefined, this.kaminoMarket.programId);
       if (addAsSupportIx === 'setup') {
         this.setupIxs.push(initObligationForFarm);
         this.setupIxsLabels.push(
@@ -3004,6 +3032,7 @@ export class KaminoAction {
           rent: SYSVAR_RENT_ADDRESS,
           systemProgram: SYSTEM_PROGRAM_ADDRESS,
         },
+        undefined,
         this.kaminoMarket.programId
       );
       this.setupIxs.push(initObligationIx);
@@ -3030,6 +3059,7 @@ export class KaminoAction {
         rent: SYSVAR_RENT_ADDRESS,
         systemProgram: SYSTEM_PROGRAM_ADDRESS,
       },
+      undefined,
       this.kaminoMarket.programId
     );
     this.setupIxs.push(initUserMetadataIx);
@@ -3050,6 +3080,7 @@ export class KaminoAction {
         rent: SYSVAR_RENT_ADDRESS,
         systemProgram: SYSTEM_PROGRAM_ADDRESS,
       },
+      undefined,
       this.kaminoMarket.programId
     );
     this.setupIxs.unshift(initReferrerTokenStateIx);
@@ -3075,6 +3106,7 @@ export class KaminoAction {
         lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
         tokenProgram: this.reserve.getLiquidityTokenProgram(),
       },
+      undefined,
       this.kaminoMarket.programId
     );
 
@@ -3190,8 +3222,8 @@ export class KaminoAction {
   }
 
   private async updateWSOLAccount(action: ActionType) {
-    const preIxs: Array<IInstruction> = [];
-    const postIxs: Array<IInstruction> = [];
+    const preIxs: Array<Instruction> = [];
+    const postIxs: Array<Instruction> = [];
     const preIxsLabels: Array<string> = [];
     const postIxsLabels: Array<string> = [];
 
@@ -3459,7 +3491,7 @@ export class KaminoAction {
     }
   }
 
-  private async getReferrerTokenStateAccountMeta(reserve: Address, writable: boolean): Promise<IAccountMeta> {
+  private async getReferrerTokenStateAccountMeta(reserve: Address, writable: boolean): Promise<AccountMeta> {
     if (isSome(this.referrer)) {
       return {
         address: await referrerTokenStatePda(this.referrer.value, reserve, this.kaminoMarket.programId),
@@ -3493,15 +3525,15 @@ export class KaminoAction {
     return getAssociatedTokenAddress(reserve.getCTokenMint(), this.owner.address);
   }
 
-  public static actionToIxs(action: KaminoAction): Array<IInstruction> {
-    const ixs: IInstruction[] = [...action.computeBudgetIxs, ...action.setupIxs];
+  public static actionToIxs(action: KaminoAction): Array<Instruction> {
+    const ixs: Instruction[] = [...action.computeBudgetIxs, ...action.setupIxs];
     ixs.push(...KaminoAction.actionToLendingIxs(action));
     ixs.push(...action.cleanupIxs);
     return ixs;
   }
 
-  public static actionToLendingIxs(action: KaminoAction): Array<IInstruction> {
-    const ixs: IInstruction[] = [];
+  public static actionToLendingIxs(action: KaminoAction): Array<Instruction> {
+    const ixs: Instruction[] = [];
     for (let i = 0; i < action.lendingIxs.length; i++) {
       ixs.push(action.lendingIxs[i]);
       if (i !== action.lendingIxs.length - 1) {

package/src/classes/farm_utils.ts

@@ -14,7 +14,7 @@ import {
   Address,
   fetchEncodedAccount,
   generateKeyPairSigner,
-  IInstruction,
+  Instruction,
   Rpc,
   SolanaRpcApi,
   TransactionSigner,
@@ -31,7 +31,7 @@ export async function getFarmStakeIxs(
   lamportsToStake: Decimal,
   farmAddress: Address,
   fetchedFarmState?: FarmState
-): Promise<IInstruction[]> {
+): Promise<Instruction[]> {
   const farmState = fetchedFarmState ? fetchedFarmState : await FarmState.fetch(rpc, farmAddress);
   if (!farmState) {
     throw new Error(`Farm state not found for ${farmAddress}`);
@@ -40,7 +40,7 @@ export async function getFarmStakeIxs(
   const farmClient = new Farms(rpc);
   const scopePricesArg = getScopePricesFromFarm(farmState);
 
-  const stakeIxs: IInstruction[] = [];
+  const stakeIxs: Instruction[] = [];
   const userState = await getUserStatePDA(farmClient.getProgramID(), farmAddress, user.address);
   const userStateExists = await fetchEncodedAccount(rpc, userState);
   if (!userStateExists.exists) {
@@ -65,7 +65,7 @@ export async function getFarmUnstakeIx(
   lamportsToUnstake: Decimal,
   farmAddress: Address,
   fetchedFarmState?: FarmState
-): Promise<IInstruction> {
+): Promise<Instruction> {
   const farmState = fetchedFarmState ? fetchedFarmState : await FarmState.fetch(rpc, farmAddress);
   if (!farmState) {
     throw new Error(`Farm state not found for ${farmAddress}`);
@@ -83,7 +83,7 @@ export async function getFarmWithdrawUnstakedDepositIx(
   user: TransactionSigner,
   farm: Address,
   stakeTokenMint: Address
-): Promise<IInstruction> {
+): Promise<Instruction> {
   const farmClient = new Farms(rpc);
   const userState = await getUserStatePDA(farmClient.getProgramID(), farm, user.address);
   return farmClient.withdrawUnstakedDepositIx(user, userState, farm, stakeTokenMint);
@@ -148,7 +148,7 @@ export async function setVaultIdForFarmIx(
   farmAdmin: TransactionSigner,
   farm: Address,
   vault: Address
-): Promise<IInstruction> {
+): Promise<Instruction> {
   const farmClient = new Farms(rpc);
   return farmClient.updateFarmConfigIx(
     farmAdmin,
@@ -165,12 +165,12 @@ export function getSharesInFarmUserPosition(userState: UserState, tokenDecimals:
 
 export type SetupFarmIxsWithFarm = {
   farm: TransactionSigner;
-  setupFarmIxs: IInstruction[];
+  setupFarmIxs: Instruction[];
 };
 
 export type UnstakeAndWithdrawFromFarmIxs = {
-  unstakeIx: IInstruction;
-  withdrawIx: IInstruction;
+  unstakeIx: Instruction;
+  withdrawIx: Instruction;
 };
 
 export function getRewardPerTimeUnitSecond(reward: RewardInfo) {