@kamino-finance/klend-sdk 7.0.13 → 7.1.1

package/src/@codegen/klend/instructions/updateReserveConfig.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([61, 148, 100, 70, 143, 107, 17, 13])
+
 export interface UpdateReserveConfigArgs {
   mode: types.UpdateConfigModeKind
   value: Uint8Array
@@ -37,15 +39,16 @@ export const layout = borsh.struct([
 export function updateReserveConfig(
   args: UpdateReserveConfigArgs,
   accounts: UpdateReserveConfigAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.signer.address, role: 2, signer: accounts.signer },
     { address: accounts.globalConfig, role: 0 },
     { address: accounts.lendingMarket, role: 0 },
     { address: accounts.reserve, role: 1 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([61, 148, 100, 70, 143, 107, 17, 13])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -59,7 +62,7 @@ export function updateReserveConfig(
     },
     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/withdrawObligationCollateral.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([37, 116, 205, 103, 243, 192, 92, 198])
+
 export interface WithdrawObligationCollateralArgs {
   collateralAmount: BN
 }
@@ -31,14 +33,17 @@ export interface WithdrawObligationCollateralAccounts {
   instructionSysvarAccount: Address
 }
 
-export const layout = borsh.struct([borsh.u64("collateralAmount")])
+export const layout = borsh.struct<WithdrawObligationCollateralArgs>([
+  borsh.u64("collateralAmount"),
+])
 
 export function withdrawObligationCollateral(
   args: WithdrawObligationCollateralArgs,
   accounts: WithdrawObligationCollateralAccounts,
+  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 },
@@ -48,8 +53,8 @@ export function withdrawObligationCollateral(
     { address: accounts.userDestinationCollateral, role: 1 },
     { address: accounts.tokenProgram, role: 0 },
     { address: accounts.instructionSysvarAccount, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([37, 116, 205, 103, 243, 192, 92, 198])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -57,7 +62,7 @@ export function withdrawObligationCollateral(
     },
     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/withdrawObligationCollateralAndRedeemReserveCollateral.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([75, 93, 93, 220, 34, 150, 218, 196])
+
 export interface WithdrawObligationCollateralAndRedeemReserveCollateralArgs {
   collateralAmount: BN
 }
@@ -36,14 +38,18 @@ export interface WithdrawObligationCollateralAndRedeemReserveCollateralAccounts
   instructionSysvarAccount: Address
 }
 
-export const layout = borsh.struct([borsh.u64("collateralAmount")])
+export const layout =
+  borsh.struct<WithdrawObligationCollateralAndRedeemReserveCollateralArgs>([
+    borsh.u64("collateralAmount"),
+  ])
 
 export function withdrawObligationCollateralAndRedeemReserveCollateral(
   args: WithdrawObligationCollateralAndRedeemReserveCollateralArgs,
   accounts: WithdrawObligationCollateralAndRedeemReserveCollateralAccounts,
+  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.obligation, role: 1 },
     { address: accounts.lendingMarket, role: 0 },
@@ -63,8 +69,8 @@ export function withdrawObligationCollateralAndRedeemReserveCollateral(
     { address: accounts.collateralTokenProgram, role: 0 },
     { address: accounts.liquidityTokenProgram, role: 0 },
     { address: accounts.instructionSysvarAccount, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([75, 93, 93, 220, 34, 150, 218, 196])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -72,7 +78,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateral(
     },
     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/withdrawObligationCollateralAndRedeemReserveCollateralV2.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([235, 52, 119, 152, 149, 197, 20, 7])
+
 export interface WithdrawObligationCollateralAndRedeemReserveCollateralV2Args {
   collateralAmount: BN
 }
@@ -43,14 +45,18 @@ export interface WithdrawObligationCollateralAndRedeemReserveCollateralV2Account
   farmsProgram: Address
 }
 
-export const layout = borsh.struct([borsh.u64("collateralAmount")])
+export const layout =
+  borsh.struct<WithdrawObligationCollateralAndRedeemReserveCollateralV2Args>([
+    borsh.u64("collateralAmount"),
+  ])
 
 export function withdrawObligationCollateralAndRedeemReserveCollateralV2(
   args: WithdrawObligationCollateralAndRedeemReserveCollateralV2Args,
   accounts: WithdrawObligationCollateralAndRedeemReserveCollateralV2Accounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     {
       address: accounts.withdrawAccounts.owner.address,
       role: 3,
@@ -86,8 +92,8 @@ export function withdrawObligationCollateralAndRedeemReserveCollateralV2(
       ? { address: accounts.farmsAccounts.reserveFarmState.value, role: 1 }
       : { address: programAddress, role: 0 },
     { address: accounts.farmsProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([235, 52, 119, 152, 149, 197, 20, 7])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -95,7 +101,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateralV2(
     },
     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/withdrawObligationCollateralV2.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([
+  202, 249, 117, 114, 231, 192, 47, 138,
+])
+
 export interface WithdrawObligationCollateralV2Args {
   collateralAmount: BN
 }
@@ -38,14 +42,17 @@ export interface WithdrawObligationCollateralV2Accounts {
   farmsProgram: Address
 }
 
-export const layout = borsh.struct([borsh.u64("collateralAmount")])
+export const layout = borsh.struct<WithdrawObligationCollateralV2Args>([
+  borsh.u64("collateralAmount"),
+])
 
 export function withdrawObligationCollateralV2(
   args: WithdrawObligationCollateralV2Args,
   accounts: WithdrawObligationCollateralV2Accounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     {
       address: accounts.withdrawAccounts.owner.address,
       role: 2,
@@ -69,8 +76,8 @@ export function withdrawObligationCollateralV2(
       ? { address: accounts.farmsAccounts.reserveFarmState.value, role: 1 }
       : { address: programAddress, role: 0 },
     { address: accounts.farmsProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([202, 249, 117, 114, 231, 192, 47, 138])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -78,7 +85,7 @@ export function withdrawObligationCollateralV2(
     },
     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/withdrawProtocolFee.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([158, 201, 158, 189, 33, 93, 162, 103])
+
 export interface WithdrawProtocolFeeArgs {
   amount: BN
 }
@@ -30,14 +32,17 @@ export interface WithdrawProtocolFeeAccounts {
   tokenProgram: Address
 }
 
-export const layout = borsh.struct([borsh.u64("amount")])
+export const layout = borsh.struct<WithdrawProtocolFeeArgs>([
+  borsh.u64("amount"),
+])
 
 export function withdrawProtocolFee(
   args: WithdrawProtocolFeeArgs,
   accounts: WithdrawProtocolFeeAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.globalConfig, role: 0 },
     { address: accounts.lendingMarket, role: 0 },
     { address: accounts.reserve, role: 0 },
@@ -46,8 +51,8 @@ export function withdrawProtocolFee(
     { address: accounts.feeVault, role: 1 },
     { address: accounts.feeCollectorAta, role: 1 },
     { address: accounts.tokenProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([158, 201, 158, 189, 33, 93, 162, 103])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -55,7 +60,7 @@ export function withdrawProtocolFee(
     },
     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/withdrawReferrerFees.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([
+  171, 118, 121, 201, 233, 140, 23, 228,
+])
+
 export interface WithdrawReferrerFeesAccounts {
   referrer: TransactionSigner
   referrerTokenState: Address
@@ -29,9 +33,10 @@ export interface WithdrawReferrerFeesAccounts {
 
 export function withdrawReferrerFees(
   accounts: WithdrawReferrerFeesAccounts,
+  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.referrerTokenState, role: 1 },
     { address: accounts.reserve, role: 1 },
@@ -41,9 +46,9 @@ export function withdrawReferrerFees(
     { address: accounts.lendingMarket, role: 0 },
     { address: accounts.lendingMarketAuthority, role: 0 },
     { address: accounts.tokenProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([171, 118, 121, 201, 233, 140, 23, 228])
-  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/kvault/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/kvault/accounts/VaultState.ts

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

package/src/@codegen/kvault/instructions/deposit.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([242, 35, 198, 137, 82, 225, 242, 182])
+
 export interface DepositArgs {
   maxAmount: BN
 }
@@ -35,14 +37,15 @@ export interface DepositAccounts {
   program: Address
 }
 
-export const layout = borsh.struct([borsh.u64("maxAmount")])
+export const layout = borsh.struct<DepositArgs>([borsh.u64("maxAmount")])
 
 export function deposit(
   args: DepositArgs,
   accounts: DepositAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.user.address, role: 3, signer: accounts.user },
     { address: accounts.vaultState, role: 1 },
     { address: accounts.tokenVault, role: 1 },
@@ -56,8 +59,8 @@ export function deposit(
     { address: accounts.sharesTokenProgram, role: 0 },
     { address: accounts.eventAuthority, role: 0 },
     { address: accounts.program, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([242, 35, 198, 137, 82, 225, 242, 182])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -65,7 +68,7 @@ export function deposit(
     },
     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/kvault/instructions/giveUpPendingFees.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([
+  177, 200, 120, 134, 110, 217, 147, 81,
+])
+
 export interface GiveUpPendingFeesArgs {
   maxAmountToGiveUp: BN
 }
@@ -25,14 +29,17 @@ export interface GiveUpPendingFeesAccounts {
   klendProgram: Address
 }
 
-export const layout = borsh.struct([borsh.u64("maxAmountToGiveUp")])
+export const layout = borsh.struct<GiveUpPendingFeesArgs>([
+  borsh.u64("maxAmountToGiveUp"),
+])
 
 export function giveUpPendingFees(
   args: GiveUpPendingFeesArgs,
   accounts: GiveUpPendingFeesAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     {
       address: accounts.vaultAdminAuthority.address,
       role: 3,
@@ -40,8 +47,8 @@ export function giveUpPendingFees(
     },
     { address: accounts.vaultState, role: 1 },
     { address: accounts.klendProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([177, 200, 120, 134, 110, 217, 147, 81])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -49,7 +56,7 @@ export function giveUpPendingFees(
     },
     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/kvault/instructions/initVault.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([77, 79, 85, 150, 33, 217, 52, 106])
+
 export interface InitVaultAccounts {
   adminAuthority: TransactionSigner
   vaultState: Address
@@ -31,9 +33,10 @@ export interface InitVaultAccounts {
 
 export function initVault(
   accounts: InitVaultAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     {
       address: accounts.adminAuthority.address,
       role: 3,
@@ -49,9 +52,9 @@ export function initVault(
     { address: accounts.rent, role: 0 },
     { address: accounts.tokenProgram, role: 0 },
     { address: accounts.sharesTokenProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([77, 79, 85, 150, 33, 217, 52, 106])
-  const data = identifier
-  const ix: IInstruction = { accounts: keys, programAddress, data }
+  const data = DISCRIMINATOR
+  const ix: Instruction = { accounts: keys, programAddress, data }
   return ix
 }