@kamino-finance/klend-sdk 7.0.13 → 7.1.1

package/src/@codegen/kvault/types/ReserveConfig.ts

@@ -17,7 +17,7 @@ export interface ReserveConfigFields {
    * - Reward points multiplier per obligation type
    * Can be re-used after making sure all underlying production account data is zeroed.
    */
-  reserved2: Array<number>
+  reserved1: Array<number>
   /** Cut of the order execution bonus that the protocol receives, as a percentage */
   protocolOrderExecutionFeePct: number
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
@@ -76,7 +76,14 @@ export interface ReserveConfigFields {
    * obligations) is NOT affected by this flag.
    */
   autodeleverageEnabled: number
-  reserved1: Array<number>
+  /**
+   * Boolean flag indicating whether the reserve is locked for the proposer authority.
+   *
+   * Once the proposer have finished preparing the reserve, it must be locked to prevent
+   * further changes to the reserve configuration allowing review and voting on the proposal
+   * without alteration during the voting period.
+   */
+  proposerAuthorityLocked: number
   /**
    * Maximum amount liquidity of this reserve borrowed outside all elevation groups
    * - u64::MAX for inf
@@ -95,6 +102,12 @@ export interface ReserveConfigFields {
    * Only relevant when `autodeleverage_enabled == 1`, and must not be 0 in such case.
    */
   deleveragingBonusIncreaseBpsPerDay: BN
+  /**
+   * The timestamp at which all [Obligation::borrows] using this reserve become liquidatable
+   * (on the same terms as reserve-wide deleveraging).
+   * Inactive when zeroed (i.e. debt never matures).
+   */
+  debtMaturityTimestamp: BN
 }
 
 export interface ReserveConfigJSON {
@@ -110,7 +123,7 @@ export interface ReserveConfigJSON {
    * - Reward points multiplier per obligation type
    * Can be re-used after making sure all underlying production account data is zeroed.
    */
-  reserved2: Array<number>
+  reserved1: Array<number>
   /** Cut of the order execution bonus that the protocol receives, as a percentage */
   protocolOrderExecutionFeePct: number
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
@@ -169,7 +182,14 @@ export interface ReserveConfigJSON {
    * obligations) is NOT affected by this flag.
    */
   autodeleverageEnabled: number
-  reserved1: Array<number>
+  /**
+   * Boolean flag indicating whether the reserve is locked for the proposer authority.
+   *
+   * Once the proposer have finished preparing the reserve, it must be locked to prevent
+   * further changes to the reserve configuration allowing review and voting on the proposal
+   * without alteration during the voting period.
+   */
+  proposerAuthorityLocked: number
   /**
    * Maximum amount liquidity of this reserve borrowed outside all elevation groups
    * - u64::MAX for inf
@@ -188,6 +208,12 @@ export interface ReserveConfigJSON {
    * Only relevant when `autodeleverage_enabled == 1`, and must not be 0 in such case.
    */
   deleveragingBonusIncreaseBpsPerDay: string
+  /**
+   * The timestamp at which all [Obligation::borrows] using this reserve become liquidatable
+   * (on the same terms as reserve-wide deleveraging).
+   * Inactive when zeroed (i.e. debt never matures).
+   */
+  debtMaturityTimestamp: string
 }
 
 /** Reserve configuration values */
@@ -204,7 +230,7 @@ export class ReserveConfig {
    * - Reward points multiplier per obligation type
    * Can be re-used after making sure all underlying production account data is zeroed.
    */
-  readonly reserved2: Array<number>
+  readonly reserved1: Array<number>
   /** Cut of the order execution bonus that the protocol receives, as a percentage */
   readonly protocolOrderExecutionFeePct: number
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
@@ -263,7 +289,14 @@ export class ReserveConfig {
    * obligations) is NOT affected by this flag.
    */
   readonly autodeleverageEnabled: number
-  readonly reserved1: Array<number>
+  /**
+   * Boolean flag indicating whether the reserve is locked for the proposer authority.
+   *
+   * Once the proposer have finished preparing the reserve, it must be locked to prevent
+   * further changes to the reserve configuration allowing review and voting on the proposal
+   * without alteration during the voting period.
+   */
+  readonly proposerAuthorityLocked: number
   /**
    * Maximum amount liquidity of this reserve borrowed outside all elevation groups
    * - u64::MAX for inf
@@ -282,12 +315,18 @@ export class ReserveConfig {
    * Only relevant when `autodeleverage_enabled == 1`, and must not be 0 in such case.
    */
   readonly deleveragingBonusIncreaseBpsPerDay: BN
+  /**
+   * The timestamp at which all [Obligation::borrows] using this reserve become liquidatable
+   * (on the same terms as reserve-wide deleveraging).
+   * Inactive when zeroed (i.e. debt never matures).
+   */
+  readonly debtMaturityTimestamp: BN
 
   constructor(fields: ReserveConfigFields) {
     this.status = fields.status
     this.assetTier = fields.assetTier
     this.hostFixedInterestRateBps = fields.hostFixedInterestRateBps
-    this.reserved2 = fields.reserved2
+    this.reserved1 = fields.reserved1
     this.protocolOrderExecutionFeePct = fields.protocolOrderExecutionFeePct
     this.protocolTakeRatePct = fields.protocolTakeRatePct
     this.protocolLiquidationFeePct = fields.protocolLiquidationFeePct
@@ -319,13 +358,14 @@ export class ReserveConfig {
     this.utilizationLimitBlockBorrowingAbovePct =
       fields.utilizationLimitBlockBorrowingAbovePct
     this.autodeleverageEnabled = fields.autodeleverageEnabled
-    this.reserved1 = fields.reserved1
+    this.proposerAuthorityLocked = fields.proposerAuthorityLocked
     this.borrowLimitOutsideElevationGroup =
       fields.borrowLimitOutsideElevationGroup
     this.borrowLimitAgainstThisCollateralInElevationGroup =
       fields.borrowLimitAgainstThisCollateralInElevationGroup
     this.deleveragingBonusIncreaseBpsPerDay =
       fields.deleveragingBonusIncreaseBpsPerDay
+    this.debtMaturityTimestamp = fields.debtMaturityTimestamp
   }
 
   static layout(property?: string) {
@@ -334,7 +374,7 @@ export class ReserveConfig {
         borsh.u8("status"),
         borsh.u8("assetTier"),
         borsh.u16("hostFixedInterestRateBps"),
-        borsh.array(borsh.u8(), 9, "reserved2"),
+        borsh.array(borsh.u8(), 9, "reserved1"),
         borsh.u8("protocolOrderExecutionFeePct"),
         borsh.u8("protocolTakeRatePct"),
         borsh.u8("protocolLiquidationFeePct"),
@@ -357,7 +397,7 @@ export class ReserveConfig {
         borsh.u8("disableUsageAsCollOutsideEmode"),
         borsh.u8("utilizationLimitBlockBorrowingAbovePct"),
         borsh.u8("autodeleverageEnabled"),
-        borsh.array(borsh.u8(), 1, "reserved1"),
+        borsh.u8("proposerAuthorityLocked"),
         borsh.u64("borrowLimitOutsideElevationGroup"),
         borsh.array(
           borsh.u64(),
@@ -365,6 +405,7 @@ export class ReserveConfig {
           "borrowLimitAgainstThisCollateralInElevationGroup"
         ),
         borsh.u64("deleveragingBonusIncreaseBpsPerDay"),
+        borsh.u64("debtMaturityTimestamp"),
       ],
       property
     )
@@ -376,7 +417,7 @@ export class ReserveConfig {
       status: obj.status,
       assetTier: obj.assetTier,
       hostFixedInterestRateBps: obj.hostFixedInterestRateBps,
-      reserved2: obj.reserved2,
+      reserved1: obj.reserved1,
       protocolOrderExecutionFeePct: obj.protocolOrderExecutionFeePct,
       protocolTakeRatePct: obj.protocolTakeRatePct,
       protocolLiquidationFeePct: obj.protocolLiquidationFeePct,
@@ -405,12 +446,13 @@ export class ReserveConfig {
       utilizationLimitBlockBorrowingAbovePct:
         obj.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: obj.autodeleverageEnabled,
-      reserved1: obj.reserved1,
+      proposerAuthorityLocked: obj.proposerAuthorityLocked,
       borrowLimitOutsideElevationGroup: obj.borrowLimitOutsideElevationGroup,
       borrowLimitAgainstThisCollateralInElevationGroup:
         obj.borrowLimitAgainstThisCollateralInElevationGroup,
       deleveragingBonusIncreaseBpsPerDay:
         obj.deleveragingBonusIncreaseBpsPerDay,
+      debtMaturityTimestamp: obj.debtMaturityTimestamp,
     })
   }
 
@@ -419,7 +461,7 @@ export class ReserveConfig {
       status: fields.status,
       assetTier: fields.assetTier,
       hostFixedInterestRateBps: fields.hostFixedInterestRateBps,
-      reserved2: fields.reserved2,
+      reserved1: fields.reserved1,
       protocolOrderExecutionFeePct: fields.protocolOrderExecutionFeePct,
       protocolTakeRatePct: fields.protocolTakeRatePct,
       protocolLiquidationFeePct: fields.protocolLiquidationFeePct,
@@ -450,12 +492,13 @@ export class ReserveConfig {
       utilizationLimitBlockBorrowingAbovePct:
         fields.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: fields.autodeleverageEnabled,
-      reserved1: fields.reserved1,
+      proposerAuthorityLocked: fields.proposerAuthorityLocked,
       borrowLimitOutsideElevationGroup: fields.borrowLimitOutsideElevationGroup,
       borrowLimitAgainstThisCollateralInElevationGroup:
         fields.borrowLimitAgainstThisCollateralInElevationGroup,
       deleveragingBonusIncreaseBpsPerDay:
         fields.deleveragingBonusIncreaseBpsPerDay,
+      debtMaturityTimestamp: fields.debtMaturityTimestamp,
     }
   }
 
@@ -464,7 +507,7 @@ export class ReserveConfig {
       status: this.status,
       assetTier: this.assetTier,
       hostFixedInterestRateBps: this.hostFixedInterestRateBps,
-      reserved2: this.reserved2,
+      reserved1: this.reserved1,
       protocolOrderExecutionFeePct: this.protocolOrderExecutionFeePct,
       protocolTakeRatePct: this.protocolTakeRatePct,
       protocolLiquidationFeePct: this.protocolLiquidationFeePct,
@@ -490,7 +533,7 @@ export class ReserveConfig {
       utilizationLimitBlockBorrowingAbovePct:
         this.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: this.autodeleverageEnabled,
-      reserved1: this.reserved1,
+      proposerAuthorityLocked: this.proposerAuthorityLocked,
       borrowLimitOutsideElevationGroup:
         this.borrowLimitOutsideElevationGroup.toString(),
       borrowLimitAgainstThisCollateralInElevationGroup:
@@ -499,6 +542,7 @@ export class ReserveConfig {
         ),
       deleveragingBonusIncreaseBpsPerDay:
         this.deleveragingBonusIncreaseBpsPerDay.toString(),
+      debtMaturityTimestamp: this.debtMaturityTimestamp.toString(),
     }
   }
 
@@ -507,7 +551,7 @@ export class ReserveConfig {
       status: obj.status,
       assetTier: obj.assetTier,
       hostFixedInterestRateBps: obj.hostFixedInterestRateBps,
-      reserved2: obj.reserved2,
+      reserved1: obj.reserved1,
       protocolOrderExecutionFeePct: obj.protocolOrderExecutionFeePct,
       protocolTakeRatePct: obj.protocolTakeRatePct,
       protocolLiquidationFeePct: obj.protocolLiquidationFeePct,
@@ -537,7 +581,7 @@ export class ReserveConfig {
       utilizationLimitBlockBorrowingAbovePct:
         obj.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: obj.autodeleverageEnabled,
-      reserved1: obj.reserved1,
+      proposerAuthorityLocked: obj.proposerAuthorityLocked,
       borrowLimitOutsideElevationGroup: new BN(
         obj.borrowLimitOutsideElevationGroup
       ),
@@ -548,6 +592,7 @@ export class ReserveConfig {
       deleveragingBonusIncreaseBpsPerDay: new BN(
         obj.deleveragingBonusIncreaseBpsPerDay
       ),
+      debtMaturityTimestamp: new BN(obj.debtMaturityTimestamp),
     })
   }
 

package/src/@codegen/pyth_rec/accounts/Config.ts

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

package/src/@codegen/pyth_rec/accounts/priceUpdateV2.ts

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

package/src/@codegen/pyth_rec/accounts/twapUpdate.ts

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

package/src/@codegen/pyth_rec/instructions/acceptGovernanceAuthorityTransfer.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([254, 39, 222, 79, 64, 217, 205, 127])
+
 export interface AcceptGovernanceAuthorityTransferAccounts {
   payer: TransactionSigner
   config: Address
@@ -22,14 +24,15 @@ export interface AcceptGovernanceAuthorityTransferAccounts {
 
 export function acceptGovernanceAuthorityTransfer(
   accounts: AcceptGovernanceAuthorityTransferAccounts,
+  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([254, 39, 222, 79, 64, 217, 205, 127])
-  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/pyth_rec/instructions/reclaimRent.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([218, 200, 19, 197, 227, 89, 192, 22])
+
 export interface ReclaimRentAccounts {
   payer: TransactionSigner
   priceUpdateAccount: Address
@@ -22,14 +24,15 @@ export interface ReclaimRentAccounts {
 
 export function reclaimRent(
   accounts: ReclaimRentAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.payer.address, role: 3, signer: accounts.payer },
     { address: accounts.priceUpdateAccount, role: 1 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([218, 200, 19, 197, 227, 89, 192, 22])
-  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/pyth_rec/instructions/reclaimTwapRent.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([84, 3, 32, 238, 108, 217, 135, 39])
+
 export interface ReclaimTwapRentAccounts {
   payer: TransactionSigner
   twapUpdateAccount: Address
@@ -22,14 +24,15 @@ export interface ReclaimTwapRentAccounts {
 
 export function reclaimTwapRent(
   accounts: ReclaimTwapRentAccounts,
+  remainingAccounts: Array<AccountMeta | AccountSignerMeta> = [],
   programAddress: Address = PROGRAM_ID
 ) {
-  const keys: Array<IAccountMeta | IAccountSignerMeta> = [
+  const keys: Array<AccountMeta | AccountSignerMeta> = [
     { address: accounts.payer.address, role: 3, signer: accounts.payer },
     { address: accounts.twapUpdateAccount, role: 1 },
+    ...remainingAccounts,
   ]
-  const identifier = Buffer.from([84, 3, 32, 238, 108, 217, 135, 39])
-  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/pyth_rec/instructions/requestGovernanceAuthorityTransfer.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([92, 18, 67, 156, 27, 151, 183, 224])
+
 export interface RequestGovernanceAuthorityTransferArgs {
   targetGovernanceAuthority: Address
 }
@@ -24,18 +26,21 @@ export interface RequestGovernanceAuthorityTransferAccounts {
   config: Address
 }
 
-export const layout = borsh.struct([borshAddress("targetGovernanceAuthority")])
+export const layout = borsh.struct<RequestGovernanceAuthorityTransferArgs>([
+  borshAddress("targetGovernanceAuthority"),
+])
 
 export function requestGovernanceAuthorityTransfer(
   args: RequestGovernanceAuthorityTransferArgs,
   accounts: RequestGovernanceAuthorityTransferAccounts,
+  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([92, 18, 67, 156, 27, 151, 183, 224])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -43,7 +48,7 @@ export function requestGovernanceAuthorityTransfer(
     },
     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/pyth_rec/instructions/setDataSources.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([107, 73, 15, 119, 195, 116, 91, 210])
+
 export interface SetDataSourcesArgs {
   validDataSources: Array<types.DataSourceFields>
 }
@@ -24,20 +26,21 @@ export interface SetDataSourcesAccounts {
   config: Address
 }
 
-export const layout = borsh.struct([
+export const layout = borsh.struct<SetDataSourcesArgs>([
   borsh.vec(types.DataSource.layout(), "validDataSources"),
 ])
 
 export function setDataSources(
   args: SetDataSourcesArgs,
   accounts: SetDataSourcesAccounts,
+  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([107, 73, 15, 119, 195, 116, 91, 210])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -47,7 +50,7 @@ export function setDataSources(
     },
     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/pyth_rec/instructions/setFee.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([18, 154, 24, 18, 237, 214, 19, 80])
+
 export interface SetFeeArgs {
   singleUpdateFeeInLamports: BN
 }
@@ -24,18 +26,21 @@ export interface SetFeeAccounts {
   config: Address
 }
 
-export const layout = borsh.struct([borsh.u64("singleUpdateFeeInLamports")])
+export const layout = borsh.struct<SetFeeArgs>([
+  borsh.u64("singleUpdateFeeInLamports"),
+])
 
 export function setFee(
   args: SetFeeArgs,
   accounts: SetFeeAccounts,
+  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([18, 154, 24, 18, 237, 214, 19, 80])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -43,7 +48,7 @@ export function setFee(
     },
     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/pyth_rec/instructions/setMinimumSignatures.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([5, 210, 206, 124, 43, 68, 104, 149])
+
 export interface SetMinimumSignaturesArgs {
   minimumSignatures: number
 }
@@ -24,18 +26,21 @@ export interface SetMinimumSignaturesAccounts {
   config: Address
 }
 
-export const layout = borsh.struct([borsh.u8("minimumSignatures")])
+export const layout = borsh.struct<SetMinimumSignaturesArgs>([
+  borsh.u8("minimumSignatures"),
+])
 
 export function setMinimumSignatures(
   args: SetMinimumSignaturesArgs,
   accounts: SetMinimumSignaturesAccounts,
+  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([5, 210, 206, 124, 43, 68, 104, 149])
   const buffer = Buffer.alloc(1000)
   const len = layout.encode(
     {
@@ -43,7 +48,7 @@ export function setMinimumSignatures(
     },
     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
 }