@kamino-finance/klend-sdk 7.0.13 → 7.1.1

package/src/@codegen/jupiter_perps/instructions/updateIncreasePositionRequest.ts

@@ -2,9 +2,9 @@
 import {
   Address,
   isSome,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
+  AccountMeta,
+  AccountSignerMeta,
+  Instruction,
   Option,
   TransactionSigner,
 } from "@solana/kit"
@@ -15,6 +15,8 @@ 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([100, 110, 83, 102, 86, 7, 105, 157])
+
 export interface UpdateIncreasePositionRequestArgs {
   params: types.UpdateIncreasePositionRequestParamsFields
 }
@@ -29,16 +31,17 @@ export interface UpdateIncreasePositionRequestAccounts {
   custodyOracleAccount: Address
 }
 
-export const layout = borsh.struct([
+export const layout = borsh.struct<UpdateIncreasePositionRequestArgs>([
   types.UpdateIncreasePositionRequestParams.layout("params"),
 ])
 
 export function updateIncreasePositionRequest(
   args: UpdateIncreasePositionRequestArgs,
   accounts: UpdateIncreasePositionRequestAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.owner.address, role: 3, signer: accounts.owner },
     { address: accounts.perpetuals, role: 0 },
     { address: accounts.pool, role: 0 },
@@ -46,8 +49,8 @@ export function updateIncreasePositionRequest(
     { address: accounts.positionRequest, role: 1 },
     { address: accounts.custody, role: 0 },
     { address: accounts.custodyOracleAccount, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([100, 110, 83, 102, 86, 7, 105, 157])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -57,7 +60,7 @@ export function updateIncreasePositionRequest(
     },
     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/@codegen/jupiter_perps/instructions/withdrawFees.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([
+  198, 212, 171, 109, 144, 215, 174, 89,
+])
+
 export interface WithdrawFeesArgs {
   params: types.WithdrawFeesParamsFields
 }
@@ -31,14 +35,17 @@ export interface WithdrawFeesAccounts {
   tokenProgram: Address
 }
 
-export const layout = borsh.struct([types.WithdrawFeesParams.layout("params")])
+export const layout = borsh.struct<WithdrawFeesArgs>([
+  types.WithdrawFeesParams.layout("params"),
+])
 
 export function withdrawFees(
   args: WithdrawFeesArgs,
   accounts: WithdrawFeesAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.keeper.address, role: 2, signer: accounts.keeper },
     { address: accounts.transferAuthority, role: 0 },
     { address: accounts.perpetuals, role: 0 },
@@ -48,8 +55,8 @@ export function withdrawFees(
     { address: accounts.custodyOracleAccount, role: 0 },
     { address: accounts.receivingTokenAccount, role: 1 },
     { address: accounts.tokenProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([198, 212, 171, 109, 144, 215, 174, 89])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -57,7 +64,7 @@ export function withdrawFees(
     },
     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/@codegen/klend/accounts/GlobalConfig.ts

@@ -76,7 +76,9 @@ export class GlobalConfig {
       return null
     }
     if (info.programAddress !== programId) {
-      throw new Error("account doesn't belong to this program")
+      throw new Error(
+        `GlobalConfigFields account ${address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+      )
     }
 
     return this.decode(Buffer.from(info.data))
@@ -94,7 +96,9 @@ export class GlobalConfig {
         return null
       }
       if (info.programAddress !== programId) {
-        throw new Error("account doesn't belong to this program")
+        throw new Error(
+          `GlobalConfigFields account ${info.address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+        )
       }
 
       return this.decode(Buffer.from(info.data))

package/src/@codegen/klend/accounts/LendingMarket.ts

@@ -349,7 +349,9 @@ export class LendingMarket {
       return null
     }
     if (info.programAddress !== programId) {
-      throw new Error("account doesn't belong to this program")
+      throw new Error(
+        `LendingMarketFields account ${address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+      )
     }
 
     return this.decode(Buffer.from(info.data))
@@ -367,7 +369,9 @@ export class LendingMarket {
         return null
       }
       if (info.programAddress !== programId) {
-        throw new Error("account doesn't belong to this program")
+        throw new Error(
+          `LendingMarketFields account ${info.address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+        )
       }
 
       return this.decode(Buffer.from(info.data))

package/src/@codegen/klend/accounts/Obligation.ts

@@ -288,7 +288,9 @@ export class Obligation {
       return null
     }
     if (info.programAddress !== programId) {
-      throw new Error("account doesn't belong to this program")
+      throw new Error(
+        `ObligationFields account ${address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+      )
     }
 
     return this.decode(Buffer.from(info.data))
@@ -306,7 +308,9 @@ export class Obligation {
         return null
       }
       if (info.programAddress !== programId) {
-        throw new Error("account doesn't belong to this program")
+        throw new Error(
+          `ObligationFields account ${info.address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+        )
       }
 
       return this.decode(Buffer.from(info.data))

package/src/@codegen/klend/accounts/ReferrerState.ts

@@ -54,7 +54,9 @@ export class ReferrerState {
       return null
     }
     if (info.programAddress !== programId) {
-      throw new Error("account doesn't belong to this program")
+      throw new Error(
+        `ReferrerStateFields account ${address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+      )
     }
 
     return this.decode(Buffer.from(info.data))
@@ -72,7 +74,9 @@ export class ReferrerState {
         return null
       }
       if (info.programAddress !== programId) {
-        throw new Error("account doesn't belong to this program")
+        throw new Error(
+          `ReferrerStateFields account ${info.address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+        )
       }
 
       return this.decode(Buffer.from(info.data))

package/src/@codegen/klend/accounts/ReferrerTokenState.ts

@@ -90,7 +90,9 @@ export class ReferrerTokenState {
       return null
     }
     if (info.programAddress !== programId) {
-      throw new Error("account doesn't belong to this program")
+      throw new Error(
+        `ReferrerTokenStateFields account ${address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+      )
     }
 
     return this.decode(Buffer.from(info.data))
@@ -108,7 +110,9 @@ export class ReferrerTokenState {
         return null
       }
       if (info.programAddress !== programId) {
-        throw new Error("account doesn't belong to this program")
+        throw new Error(
+          `ReferrerTokenStateFields account ${info.address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+        )
       }
 
       return this.decode(Buffer.from(info.data))

package/src/@codegen/klend/accounts/Reserve.ts

@@ -150,7 +150,9 @@ export class Reserve {
       return null
     }
     if (info.programAddress !== programId) {
-      throw new Error("account doesn't belong to this program")
+      throw new Error(
+        `ReserveFields account ${address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+      )
     }
 
     return this.decode(Buffer.from(info.data))
@@ -168,7 +170,9 @@ export class Reserve {
         return null
       }
       if (info.programAddress !== programId) {
-        throw new Error("account doesn't belong to this program")
+        throw new Error(
+          `ReserveFields account ${info.address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+        )
       }
 
       return this.decode(Buffer.from(info.data))

package/src/@codegen/klend/accounts/ShortUrl.ts

@@ -54,7 +54,9 @@ export class ShortUrl {
       return null
     }
     if (info.programAddress !== programId) {
-      throw new Error("account doesn't belong to this program")
+      throw new Error(
+        `ShortUrlFields account ${address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+      )
     }
 
     return this.decode(Buffer.from(info.data))
@@ -72,7 +74,9 @@ export class ShortUrl {
         return null
       }
       if (info.programAddress !== programId) {
-        throw new Error("account doesn't belong to this program")
+        throw new Error(
+          `ShortUrlFields account ${info.address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+        )
       }
 
       return this.decode(Buffer.from(info.data))

package/src/@codegen/klend/accounts/UserMetadata.ts

@@ -87,7 +87,9 @@ export class UserMetadata {
       return null
     }
     if (info.programAddress !== programId) {
-      throw new Error("account doesn't belong to this program")
+      throw new Error(
+        `UserMetadataFields account ${address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+      )
     }
 
     return this.decode(Buffer.from(info.data))
@@ -105,7 +107,9 @@ export class UserMetadata {
         return null
       }
       if (info.programAddress !== programId) {
-        throw new Error("account doesn't belong to this program")
+        throw new Error(
+          `UserMetadataFields account ${info.address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+        )
       }
 
       return this.decode(Buffer.from(info.data))

package/src/@codegen/klend/accounts/UserState.ts

@@ -204,7 +204,9 @@ export class UserState {
       return null
     }
     if (info.programAddress !== programId) {
-      throw new Error("account doesn't belong to this program")
+      throw new Error(
+        `UserStateFields account ${address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+      )
     }
 
     return this.decode(Buffer.from(info.data))
@@ -222,7 +224,9 @@ export class UserState {
         return null
       }
       if (info.programAddress !== programId) {
-        throw new Error("account doesn't belong to this program")
+        throw new Error(
+          `UserStateFields account ${info.address} belongs to wrong program ${info.programAddress}, expected ${programId}`
+        )
       }
 
       return this.decode(Buffer.from(info.data))

package/src/@codegen/klend/instructions/borrowObligationLiquidity.ts

@@ -2,9 +2,9 @@
 import {
   Address,
   isSome,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
+  AccountMeta,
+  AccountSignerMeta,
+  Instruction,
   Option,
   TransactionSigner,
 } from "@solana/kit"
@@ -15,6 +15,8 @@ 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([121, 127, 18, 204, 73, 245, 225, 65])
+
 export interface BorrowObligationLiquidityArgs {
   liquidityAmount: BN
 }
@@ -34,14 +36,17 @@ export interface BorrowObligationLiquidityAccounts {
   instructionSysvarAccount: Address
 }
 
-export const layout = borsh.struct([borsh.u64("liquidityAmount")])
+export const layout = borsh.struct<BorrowObligationLiquidityArgs>([
+  borsh.u64("liquidityAmount"),
+])
 
 export function borrowObligationLiquidity(
   args: BorrowObligationLiquidityArgs,
   accounts: BorrowObligationLiquidityAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.owner.address, role: 2, signer: accounts.owner },
     { address: accounts.obligation, role: 1 },
     { address: accounts.lendingMarket, role: 0 },
@@ -56,8 +61,8 @@ export function borrowObligationLiquidity(
       : { address: programAddress, role: 0 },
     { address: accounts.tokenProgram, role: 0 },
     { address: accounts.instructionSysvarAccount, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([121, 127, 18, 204, 73, 245, 225, 65])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -65,7 +70,7 @@ export function borrowObligationLiquidity(
     },
     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/@codegen/klend/instructions/borrowObligationLiquidityV2.ts

@@ -2,9 +2,9 @@
 import {
   Address,
   isSome,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
+  AccountMeta,
+  AccountSignerMeta,
+  Instruction,
   Option,
   TransactionSigner,
 } from "@solana/kit"
@@ -15,6 +15,8 @@ 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([161, 128, 143, 245, 171, 199, 194, 6])
+
 export interface BorrowObligationLiquidityV2Args {
   liquidityAmount: BN
 }
@@ -41,14 +43,17 @@ export interface BorrowObligationLiquidityV2Accounts {
   farmsProgram: Address
 }
 
-export const layout = borsh.struct([borsh.u64("liquidityAmount")])
+export const layout = borsh.struct<BorrowObligationLiquidityV2Args>([
+  borsh.u64("liquidityAmount"),
+])
 
 export function borrowObligationLiquidityV2(
   args: BorrowObligationLiquidityV2Args,
   accounts: BorrowObligationLiquidityV2Accounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     {
       address: accounts.borrowAccounts.owner.address,
       role: 2,
@@ -80,8 +85,8 @@ export function borrowObligationLiquidityV2(
       ? { address: accounts.farmsAccounts.reserveFarmState.value, role: 1 }
       : { address: programAddress, role: 0 },
     { address: accounts.farmsProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([161, 128, 143, 245, 171, 199, 194, 6])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -89,7 +94,7 @@ export function borrowObligationLiquidityV2(
     },
     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/@codegen/klend/instructions/deleteReferrerStateAndShortUrl.ts

@@ -2,9 +2,9 @@
 import {
   Address,
   isSome,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
+  AccountMeta,
+  AccountSignerMeta,
+  Instruction,
   Option,
   TransactionSigner,
 } from "@solana/kit"
@@ -15,6 +15,8 @@ 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([153, 185, 99, 28, 228, 179, 187, 150])
+
 export interface DeleteReferrerStateAndShortUrlAccounts {
   referrer: TransactionSigner
   referrerState: Address
@@ -25,17 +27,18 @@ export interface DeleteReferrerStateAndShortUrlAccounts {
 
 export function deleteReferrerStateAndShortUrl(
   accounts: DeleteReferrerStateAndShortUrlAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.referrer.address, role: 3, signer: accounts.referrer },
     { address: accounts.referrerState, role: 1 },
     { address: accounts.shortUrl, role: 1 },
     { address: accounts.rent, role: 0 },
     { address: accounts.systemProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([153, 185, 99, 28, 228, 179, 187, 150])
-  const data = identifier
-  const ix: IInstruction = { accounts: keys, programAddress, data }
+  const data = DISCRIMINATOR
+  const ix: Instruction = { accounts: keys, programAddress, data }
   return ix
 }

package/src/@codegen/klend/instructions/depositAndWithdraw.ts

@@ -2,9 +2,9 @@
 import {
   Address,
   isSome,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
+  AccountMeta,
+  AccountSignerMeta,
+  Instruction,
   Option,
   TransactionSigner,
 } from "@solana/kit"
@@ -15,6 +15,8 @@ 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([141, 153, 39, 15, 64, 61, 88, 84])
+
 export interface DepositAndWithdrawArgs {
   liquidityAmount: BN
   withdrawCollateralAmount: BN
@@ -64,7 +66,7 @@ export interface DepositAndWithdrawAccounts {
   farmsProgram: Address
 }
 
-export const layout = borsh.struct([
+export const layout = borsh.struct<DepositAndWithdrawArgs>([
   borsh.u64("liquidityAmount"),
   borsh.u64("withdrawCollateralAmount"),
 ])
@@ -72,9 +74,10 @@ export const layout = borsh.struct([
 export function depositAndWithdraw(
   args: DepositAndWithdrawArgs,
   accounts: DepositAndWithdrawAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     {
       address: accounts.depositAccounts.owner.address,
       role: 3,
@@ -152,8 +155,8 @@ export function depositAndWithdraw(
         }
       : { address: programAddress, role: 0 },
     { address: accounts.farmsProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([141, 153, 39, 15, 64, 61, 88, 84])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -162,7 +165,7 @@ export function depositAndWithdraw(
     },
     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/@codegen/klend/instructions/depositObligationCollateral.ts

@@ -2,9 +2,9 @@
 import {
   Address,
   isSome,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
+  AccountMeta,
+  AccountSignerMeta,
+  Instruction,
   Option,
   TransactionSigner,
 } from "@solana/kit"
@@ -15,6 +15,8 @@ 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([108, 209, 4, 72, 21, 22, 118, 133])
+
 export interface DepositObligationCollateralArgs {
   collateralAmount: BN
 }
@@ -30,14 +32,17 @@ export interface DepositObligationCollateralAccounts {
   instructionSysvarAccount: Address
 }
 
-export const layout = borsh.struct([borsh.u64("collateralAmount")])
+export const layout = borsh.struct<DepositObligationCollateralArgs>([
+  borsh.u64("collateralAmount"),
+])
 
 export function depositObligationCollateral(
   args: DepositObligationCollateralArgs,
   accounts: DepositObligationCollateralAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.owner.address, role: 2, signer: accounts.owner },
     { address: accounts.obligation, role: 1 },
     { address: accounts.lendingMarket, role: 0 },
@@ -46,8 +51,8 @@ export function depositObligationCollateral(
     { address: accounts.userSourceCollateral, role: 1 },
     { address: accounts.tokenProgram, role: 0 },
     { address: accounts.instructionSysvarAccount, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([108, 209, 4, 72, 21, 22, 118, 133])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -55,7 +60,7 @@ export function depositObligationCollateral(
     },
     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/@codegen/klend/instructions/depositObligationCollateralV2.ts

@@ -2,9 +2,9 @@
 import {
   Address,
   isSome,
-  IAccountMeta,
-  IAccountSignerMeta,
-  IInstruction,
+  AccountMeta,
+  AccountSignerMeta,
+  Instruction,
   Option,
   TransactionSigner,
 } from "@solana/kit"
@@ -15,6 +15,8 @@ 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([137, 145, 151, 94, 167, 113, 4, 145])
+
 export interface DepositObligationCollateralV2Args {
   collateralAmount: BN
 }
@@ -38,14 +40,17 @@ export interface DepositObligationCollateralV2Accounts {
   farmsProgram: Address
 }
 
-export const layout = borsh.struct([borsh.u64("collateralAmount")])
+export const layout = borsh.struct<DepositObligationCollateralV2Args>([
+  borsh.u64("collateralAmount"),
+])
 
 export function depositObligationCollateralV2(
   args: DepositObligationCollateralV2Args,
   accounts: DepositObligationCollateralV2Accounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     {
       address: accounts.depositAccounts.owner.address,
       role: 2,
@@ -69,8 +74,8 @@ export function depositObligationCollateralV2(
       ? { address: accounts.farmsAccounts.reserveFarmState.value, role: 1 }
       : { address: programAddress, role: 0 },
     { address: accounts.farmsProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([137, 145, 151, 94, 167, 113, 4, 145])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -78,7 +83,7 @@ export function depositObligationCollateralV2(
     },
     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
 }