@kamino-finance/klend-sdk 7.0.13 → 7.1.0

package/src/@codegen/jupiter_perps/instructions/setCustodyGlobalLimit.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([94, 82, 154, 177, 193, 205, 141, 76])
+
 export interface SetCustodyGlobalLimitArgs {
   params: types.SetCustodyGlobalLimitParamsFields
 }
@@ -24,20 +26,21 @@ export interface SetCustodyGlobalLimitAccounts {
   custody: Address
 }
 
-export const layout = borsh.struct([
+export const layout = borsh.struct<SetCustodyGlobalLimitArgs>([
   types.SetCustodyGlobalLimitParams.layout("params"),
 ])
 
 export function setCustodyGlobalLimit(
   args: SetCustodyGlobalLimitArgs,
   accounts: SetCustodyGlobalLimitAccounts,
+  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.custody, role: 1 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([94, 82, 154, 177, 193, 205, 141, 76])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -45,7 +48,7 @@ export function setCustodyGlobalLimit(
     },
     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/setPerpetualsConfig.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([80, 72, 21, 191, 29, 121, 45, 111])
+
 export interface SetPerpetualsConfigArgs {
   params: types.SetPerpetualsConfigParamsFields
 }
@@ -24,20 +26,21 @@ export interface SetPerpetualsConfigAccounts {
   perpetuals: Address
 }
 
-export const layout = borsh.struct([
+export const layout = borsh.struct<SetPerpetualsConfigArgs>([
   types.SetPerpetualsConfigParams.layout("params"),
 ])
 
 export function setPerpetualsConfig(
   args: SetPerpetualsConfigArgs,
   accounts: SetPerpetualsConfigAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.admin.address, role: 2, signer: accounts.admin },
     { address: accounts.perpetuals, role: 1 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([80, 72, 21, 191, 29, 121, 45, 111])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -45,7 +48,7 @@ export function setPerpetualsConfig(
     },
     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/setPoolConfig.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([216, 87, 65, 125, 113, 110, 185, 120])
+
 export interface SetPoolConfigArgs {
   params: types.SetPoolConfigParamsFields
 }
@@ -25,19 +27,22 @@ export interface SetPoolConfigAccounts {
   pool: Address
 }
 
-export const layout = borsh.struct([types.SetPoolConfigParams.layout("params")])
+export const layout = borsh.struct<SetPoolConfigArgs>([
+  types.SetPoolConfigParams.layout("params"),
+])
 
 export function setPoolConfig(
   args: SetPoolConfigArgs,
   accounts: SetPoolConfigAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.admin.address, role: 2, signer: accounts.admin },
     { address: accounts.perpetuals, role: 0 },
     { address: accounts.pool, role: 1 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([216, 87, 65, 125, 113, 110, 185, 120])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -45,7 +50,7 @@ export function setPoolConfig(
     },
     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/setTestOraclePrice.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([44, 111, 165, 185, 58, 14, 249, 249])
+
 export interface SetTestOraclePriceArgs {
   params: types.SetTestOraclePriceParamsFields
 }
@@ -28,24 +30,25 @@ export interface SetTestOraclePriceAccounts {
   systemProgram: Address
 }
 
-export const layout = borsh.struct([
+export const layout = borsh.struct<SetTestOraclePriceArgs>([
   types.SetTestOraclePriceParams.layout("params"),
 ])
 
 export function setTestOraclePrice(
   args: SetTestOraclePriceArgs,
   accounts: SetTestOraclePriceAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.admin.address, role: 3, signer: accounts.admin },
     { address: accounts.perpetuals, role: 0 },
     { address: accounts.pool, role: 0 },
     { address: accounts.custody, role: 0 },
     { address: accounts.oracleAccount, role: 1 },
     { address: accounts.systemProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([44, 111, 165, 185, 58, 14, 249, 249])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -53,7 +56,7 @@ export function setTestOraclePrice(
     },
     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/setTestTime.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([
+  242, 231, 177, 251, 126, 145, 159, 104,
+])
+
 export interface SetTestTimeArgs {
   params: types.SetTestTimeParamsFields
 }
@@ -24,18 +28,21 @@ export interface SetTestTimeAccounts {
   perpetuals: Address
 }
 
-export const layout = borsh.struct([types.SetTestTimeParams.layout("params")])
+export const layout = borsh.struct<SetTestTimeArgs>([
+  types.SetTestTimeParams.layout("params"),
+])
 
 export function setTestTime(
   args: SetTestTimeArgs,
   accounts: SetTestTimeAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.admin.address, role: 2, signer: accounts.admin },
     { address: accounts.perpetuals, role: 1 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([242, 231, 177, 251, 126, 145, 159, 104])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -43,7 +50,7 @@ export function setTestTime(
     },
     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/swap.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([
+  248, 198, 158, 145, 225, 117, 135, 200,
+])
+
 export interface SwapArgs {
   params: types.SwapParamsFields
 }
@@ -37,14 +41,17 @@ export interface SwapAccounts {
   program: Address
 }
 
-export const layout = borsh.struct([types.SwapParams.layout("params")])
+export const layout = borsh.struct<SwapArgs>([
+  types.SwapParams.layout("params"),
+])
 
 export function swap(
   args: SwapArgs,
   accounts: SwapAccounts,
+  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.fundingAccount, role: 1 },
     { address: accounts.receivingAccount, role: 1 },
@@ -60,8 +67,8 @@ export function swap(
     { address: accounts.tokenProgram, role: 0 },
     { address: accounts.eventAuthority, role: 0 },
     { address: accounts.program, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([248, 198, 158, 145, 225, 117, 135, 200])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -69,7 +76,7 @@ export function swap(
     },
     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/swapExactOut.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([250, 73, 101, 33, 38, 207, 75, 184])
+
 export interface SwapExactOutArgs {
   params: types.SwapExactOutParamsFields
 }
@@ -37,14 +39,17 @@ export interface SwapExactOutAccounts {
   program: Address
 }
 
-export const layout = borsh.struct([types.SwapExactOutParams.layout("params")])
+export const layout = borsh.struct<SwapExactOutArgs>([
+  types.SwapExactOutParams.layout("params"),
+])
 
 export function swapExactOut(
   args: SwapExactOutArgs,
   accounts: SwapExactOutAccounts,
+  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.fundingAccount, role: 1 },
     { address: accounts.receivingAccount, role: 1 },
@@ -60,8 +65,8 @@ export function swapExactOut(
     { address: accounts.tokenProgram, role: 0 },
     { address: accounts.eventAuthority, role: 0 },
     { address: accounts.program, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([250, 73, 101, 33, 38, 207, 75, 184])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -69,7 +74,7 @@ export function swapExactOut(
     },
     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/testInit.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([48, 51, 92, 122, 81, 19, 112, 41])
+
 export interface TestInitArgs {
   params: types.TestInitParamsFields
 }
@@ -28,14 +30,17 @@ export interface TestInitAccounts {
   tokenProgram: Address
 }
 
-export const layout = borsh.struct([types.TestInitParams.layout("params")])
+export const layout = borsh.struct<TestInitArgs>([
+  types.TestInitParams.layout("params"),
+])
 
 export function testInit(
   args: TestInitArgs,
   accounts: TestInitAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     {
       address: accounts.upgradeAuthority.address,
       role: 3,
@@ -46,8 +51,8 @@ export function testInit(
     { address: accounts.perpetuals, role: 1 },
     { address: accounts.systemProgram, role: 0 },
     { address: accounts.tokenProgram, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([48, 51, 92, 122, 81, 19, 112, 41])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -55,7 +60,7 @@ export function testInit(
     },
     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/transferAdmin.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([42, 242, 66, 106, 228, 10, 111, 156])
+
 export interface TransferAdminArgs {
   params: types.TransferAdminParamsFields
 }
@@ -25,19 +27,22 @@ export interface TransferAdminAccounts {
   perpetuals: Address
 }
 
-export const layout = borsh.struct([types.TransferAdminParams.layout("params")])
+export const layout = borsh.struct<TransferAdminArgs>([
+  types.TransferAdminParams.layout("params"),
+])
 
 export function transferAdmin(
   args: TransferAdminArgs,
   accounts: TransferAdminAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.admin.address, role: 3, signer: accounts.admin },
     { address: accounts.newAdmin, role: 0 },
     { address: accounts.perpetuals, role: 1 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([42, 242, 66, 106, 228, 10, 111, 156])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -45,7 +50,7 @@ export function transferAdmin(
     },
     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/updateDecreasePositionRequest.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([69, 44, 72, 173, 62, 20, 177, 146])
+
 export interface UpdateDecreasePositionRequestArgs {
   params: types.UpdateDecreasePositionRequestParamsFields
 }
@@ -29,16 +31,17 @@ export interface UpdateDecreasePositionRequestAccounts {
   custodyOracleAccount: Address
 }
 
-export const layout = borsh.struct([
+export const layout = borsh.struct<UpdateDecreasePositionRequestArgs>([
   types.UpdateDecreasePositionRequestParams.layout("params"),
 ])
 
 export function updateDecreasePositionRequest(
   args: UpdateDecreasePositionRequestArgs,
   accounts: UpdateDecreasePositionRequestAccounts,
+  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 updateDecreasePositionRequest(
     { address: accounts.positionRequest, role: 1 },
     { address: accounts.custody, role: 0 },
     { address: accounts.custodyOracleAccount, role: 0 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([69, 44, 72, 173, 62, 20, 177, 146])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -57,7 +60,7 @@ export function updateDecreasePositionRequest(
     },
     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/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
 }