@shogun-sdk/intents-sdk 1.2.1 → 1.2.3

package/src/core/solana/generated/cross-chain/instructions/initialize.ts

@@ -6,7 +6,7 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { getProgramDerivedAddress, type Address } from '@solana/kit';
+import { getProgramDerivedAddress, type Address } from '@solana/addresses';
 import {
   combineCodec,
   fixDecoderSize,
@@ -16,21 +16,21 @@ import {
   getStructDecoder,
   getStructEncoder,
   transformEncoder,
-  type Codec,
-  type Decoder,
-  type Encoder,
+  type FixedSizeCodec,
+  type FixedSizeDecoder,
+  type FixedSizeEncoder,
   type ReadonlyUint8Array,
-} from '@solana/kit';
+} from '@solana/codecs';
 import {
-  type IAccountMeta,
-  type IInstruction,
-  type IInstructionWithAccounts,
-  type IInstructionWithData,
+  type AccountMeta,
+  type Instruction,
+  type InstructionWithAccounts,
+  type InstructionWithData,
   type ReadonlyAccount,
   type WritableAccount,
   type WritableSignerAccount,
-} from '@solana/kit';
-import { type IAccountSignerMeta, type TransactionSigner } from '@solana/kit';
+} from '@solana/instructions';
+import { type AccountSignerMeta, type TransactionSigner } from '@solana/signers';
 import { SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
 
@@ -42,43 +42,54 @@ export function getInitializeDiscriminatorBytes() {
 
 export type InitializeInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountInitialAdmin extends string | IAccountMeta<string> = string,
-  TAccountAdminSingleton extends string | IAccountMeta<string> = string,
-  TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111',
-  TAccountProgram extends string | IAccountMeta<string> = '43cctGU9QJ4WEPzLoNEvo3TPiv6nMUG9puN2pXQSnB6V',
-  TAccountProgramData extends string | IAccountMeta<string> = string,
-  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
-> = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
-  IInstructionWithAccounts<
+  TAccountInitialAdmin extends string | AccountMeta<string> = string,
+  TAccountAdminSingleton extends string | AccountMeta<string> = string,
+  TAccountSystemProgram extends string | AccountMeta<string> = '11111111111111111111111111111111',
+  TAccountProgram extends
+    | string
+    | AccountMeta<string> = 'DQZQGiVa1PBXesdbCRzmJpZ7AyntLXfAwP5Qty1hgFqQ',
+  TAccountProgramData extends string | AccountMeta<string> = string,
+  TRemainingAccounts extends readonly AccountMeta<string>[] = [],
+> = Instruction<TProgram> &
+  InstructionWithData<ReadonlyUint8Array> &
+  InstructionWithAccounts<
     [
       TAccountInitialAdmin extends string
-        ? WritableSignerAccount<TAccountInitialAdmin> & IAccountSignerMeta<TAccountInitialAdmin>
+        ? WritableSignerAccount<TAccountInitialAdmin> & AccountSignerMeta<TAccountInitialAdmin>
         : TAccountInitialAdmin,
-      TAccountAdminSingleton extends string ? WritableAccount<TAccountAdminSingleton> : TAccountAdminSingleton,
-      TAccountSystemProgram extends string ? ReadonlyAccount<TAccountSystemProgram> : TAccountSystemProgram,
+      TAccountAdminSingleton extends string
+        ? WritableAccount<TAccountAdminSingleton>
+        : TAccountAdminSingleton,
+      TAccountSystemProgram extends string
+        ? ReadonlyAccount<TAccountSystemProgram>
+        : TAccountSystemProgram,
       TAccountProgram extends string ? ReadonlyAccount<TAccountProgram> : TAccountProgram,
-      TAccountProgramData extends string ? ReadonlyAccount<TAccountProgramData> : TAccountProgramData,
+      TAccountProgramData extends string
+        ? ReadonlyAccount<TAccountProgramData>
+        : TAccountProgramData,
       ...TRemainingAccounts,
     ]
   >;
 
 export type InitializeInstructionData = { discriminator: ReadonlyUint8Array };
 
-export type InitializeInstructionDataArgs = object;
+export type InitializeInstructionDataArgs = Object;
 
-export function getInitializeInstructionDataEncoder(): Encoder<InitializeInstructionDataArgs> {
-  return transformEncoder(getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]), (value) => ({
-    ...value,
-    discriminator: INITIALIZE_DISCRIMINATOR,
-  }));
+export function getInitializeInstructionDataEncoder(): FixedSizeEncoder<InitializeInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]),
+    (value) => ({ ...value, discriminator: INITIALIZE_DISCRIMINATOR })
+  );
 }
 
-export function getInitializeInstructionDataDecoder(): Decoder<InitializeInstructionData> {
+export function getInitializeInstructionDataDecoder(): FixedSizeDecoder<InitializeInstructionData> {
   return getStructDecoder([['discriminator', fixDecoderSize(getBytesDecoder(), 8)]]);
 }
 
-export function getInitializeInstructionDataCodec(): Codec<InitializeInstructionDataArgs, InitializeInstructionData> {
+export function getInitializeInstructionDataCodec(): FixedSizeCodec<
+  InitializeInstructionDataArgs,
+  InitializeInstructionData
+> {
   return combineCodec(getInitializeInstructionDataEncoder(), getInitializeInstructionDataDecoder());
 }
 
@@ -119,7 +130,7 @@ export async function getInitializeInstructionAsync<
     TAccountProgram,
     TAccountProgramData
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): Promise<
   InitializeInstruction<
     TProgramAddress,
@@ -151,11 +162,12 @@ export async function getInitializeInstructionAsync<
     });
   }
   if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
   if (!accounts.program.value) {
     accounts.program.value =
-      '43cctGU9QJ4WEPzLoNEvo3TPiv6nMUG9puN2pXQSnB6V' as Address<'43cctGU9QJ4WEPzLoNEvo3TPiv6nMUG9puN2pXQSnB6V'>;
+      'DQZQGiVa1PBXesdbCRzmJpZ7AyntLXfAwP5Qty1hgFqQ' as Address<'DQZQGiVa1PBXesdbCRzmJpZ7AyntLXfAwP5Qty1hgFqQ'>;
   }
 
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
@@ -218,7 +230,7 @@ export function getInitializeInstruction<
     TAccountProgram,
     TAccountProgramData
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): InitializeInstruction<
   TProgramAddress,
   TAccountInitialAdmin,
@@ -242,11 +254,12 @@ export function getInitializeInstruction<
 
   // Resolve default values.
   if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
   if (!accounts.program.value) {
     accounts.program.value =
-      '43cctGU9QJ4WEPzLoNEvo3TPiv6nMUG9puN2pXQSnB6V' as Address<'43cctGU9QJ4WEPzLoNEvo3TPiv6nMUG9puN2pXQSnB6V'>;
+      'DQZQGiVa1PBXesdbCRzmJpZ7AyntLXfAwP5Qty1hgFqQ' as Address<'DQZQGiVa1PBXesdbCRzmJpZ7AyntLXfAwP5Qty1hgFqQ'>;
   }
 
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
@@ -274,7 +287,7 @@ export function getInitializeInstruction<
 
 export type ParsedInitializeInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
 > = {
   programAddress: Address<TProgram>;
   accounts: {
@@ -296,8 +309,13 @@ export type ParsedInitializeInstruction<
   data: InitializeInstructionData;
 };
 
-export function parseInitializeInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
-  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+export function parseInitializeInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedInitializeInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 5) {
     // TODO: Coded error.
@@ -305,7 +323,7 @@ export function parseInitializeInstruction<TProgram extends string, TAccountMeta
   }
   let accountIndex = 0;
   const getNextAccount = () => {
-    const accountMeta = instruction.accounts![accountIndex]!;
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
     accountIndex += 1;
     return accountMeta;
   };

package/src/core/solana/generated/cross-chain/instructions/preStartOrderExecution.ts

@@ -6,7 +6,7 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { type Address } from '@solana/kit';
+import { type Address } from '@solana/addresses';
 import {
   combineCodec,
   fixDecoderSize,
@@ -16,25 +16,27 @@ import {
   getStructDecoder,
   getStructEncoder,
   transformEncoder,
-  type Codec,
-  type Decoder,
-  type Encoder,
+  type FixedSizeCodec,
+  type FixedSizeDecoder,
+  type FixedSizeEncoder,
   type ReadonlyUint8Array,
-} from '@solana/kit';
+} from '@solana/codecs';
 import {
-  type IAccountMeta,
-  type IInstruction,
-  type IInstructionWithAccounts,
-  type IInstructionWithData,
+  type AccountMeta,
+  type Instruction,
+  type InstructionWithAccounts,
+  type InstructionWithData,
   type ReadonlyAccount,
   type WritableAccount,
   type WritableSignerAccount,
-} from '@solana/kit';
-import { type IAccountSignerMeta, type TransactionSigner } from '@solana/kit';
+} from '@solana/instructions';
+import { type AccountSignerMeta, type TransactionSigner } from '@solana/signers';
 import { SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
 
-export const PRE_START_ORDER_EXECUTION_DISCRIMINATOR = new Uint8Array([69, 230, 54, 217, 254, 93, 181, 32]);
+export const PRE_START_ORDER_EXECUTION_DISCRIMINATOR = new Uint8Array([
+  69, 230, 54, 217, 254, 93, 181, 32,
+]);
 
 export function getPreStartOrderExecutionDiscriminatorBytes() {
   return fixEncoderSize(getBytesEncoder(), 8).encode(PRE_START_ORDER_EXECUTION_DISCRIMINATOR);
@@ -42,25 +44,27 @@ export function getPreStartOrderExecutionDiscriminatorBytes() {
 
 export type PreStartOrderExecutionInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountSolver extends string | IAccountMeta<string> = string,
-  TAccountOrder extends string | IAccountMeta<string> = string,
-  TAccountGuard extends string | IAccountMeta<string> = string,
-  TAccountIxSysvar extends string | IAccountMeta<string> = 'Sysvar1nstructions1111111111111111111111111',
-  TAccountCollateralTokenMint extends string | IAccountMeta<string> = string,
-  TAccountSolverCollateralTokenAccount extends string | IAccountMeta<string> = string,
-  TAccountGuardCollateralTokenAccount extends string | IAccountMeta<string> = string,
-  TAccountCollateralTokenProgram extends string | IAccountMeta<string> = string,
-  TAccountTokenInMint extends string | IAccountMeta<string> = string,
-  TAccountSolverTokenInAccount extends string | IAccountMeta<string> = string,
-  TAccountGuardTokenInAccount extends string | IAccountMeta<string> = string,
-  TAccountTokenInProgram extends string | IAccountMeta<string> = string,
-  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
-> = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
-  IInstructionWithAccounts<
+  TAccountSolver extends string | AccountMeta<string> = string,
+  TAccountOrder extends string | AccountMeta<string> = string,
+  TAccountGuard extends string | AccountMeta<string> = string,
+  TAccountIxSysvar extends
+    | string
+    | AccountMeta<string> = 'Sysvar1nstructions1111111111111111111111111',
+  TAccountCollateralTokenMint extends string | AccountMeta<string> = string,
+  TAccountSolverCollateralTokenAccount extends string | AccountMeta<string> = string,
+  TAccountGuardCollateralTokenAccount extends string | AccountMeta<string> = string,
+  TAccountCollateralTokenProgram extends string | AccountMeta<string> = string,
+  TAccountTokenInMint extends string | AccountMeta<string> = string,
+  TAccountSolverTokenInAccount extends string | AccountMeta<string> = string,
+  TAccountGuardTokenInAccount extends string | AccountMeta<string> = string,
+  TAccountTokenInProgram extends string | AccountMeta<string> = string,
+  TRemainingAccounts extends readonly AccountMeta<string>[] = [],
+> = Instruction<TProgram> &
+  InstructionWithData<ReadonlyUint8Array> &
+  InstructionWithAccounts<
     [
       TAccountSolver extends string
-        ? WritableSignerAccount<TAccountSolver> & IAccountSignerMeta<TAccountSolver>
+        ? WritableSignerAccount<TAccountSolver> & AccountSignerMeta<TAccountSolver>
         : TAccountSolver,
       TAccountOrder extends string ? WritableAccount<TAccountOrder> : TAccountOrder,
       TAccountGuard extends string ? WritableAccount<TAccountGuard> : TAccountGuard,
@@ -77,40 +81,44 @@ export type PreStartOrderExecutionInstruction<
       TAccountCollateralTokenProgram extends string
         ? ReadonlyAccount<TAccountCollateralTokenProgram>
         : TAccountCollateralTokenProgram,
-      TAccountTokenInMint extends string ? ReadonlyAccount<TAccountTokenInMint> : TAccountTokenInMint,
+      TAccountTokenInMint extends string
+        ? ReadonlyAccount<TAccountTokenInMint>
+        : TAccountTokenInMint,
       TAccountSolverTokenInAccount extends string
         ? WritableAccount<TAccountSolverTokenInAccount>
         : TAccountSolverTokenInAccount,
       TAccountGuardTokenInAccount extends string
         ? WritableAccount<TAccountGuardTokenInAccount>
         : TAccountGuardTokenInAccount,
-      TAccountTokenInProgram extends string ? ReadonlyAccount<TAccountTokenInProgram> : TAccountTokenInProgram,
+      TAccountTokenInProgram extends string
+        ? ReadonlyAccount<TAccountTokenInProgram>
+        : TAccountTokenInProgram,
       ...TRemainingAccounts,
     ]
   >;
 
 export type PreStartOrderExecutionInstructionData = { discriminator: ReadonlyUint8Array };
 
-export type PreStartOrderExecutionInstructionDataArgs = object;
+export type PreStartOrderExecutionInstructionDataArgs = Object;
 
-export function getPreStartOrderExecutionInstructionDataEncoder(): Encoder<PreStartOrderExecutionInstructionDataArgs> {
-  return transformEncoder(getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]), (value) => ({
-    ...value,
-    discriminator: PRE_START_ORDER_EXECUTION_DISCRIMINATOR,
-  }));
+export function getPreStartOrderExecutionInstructionDataEncoder(): FixedSizeEncoder<PreStartOrderExecutionInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]),
+    (value) => ({ ...value, discriminator: PRE_START_ORDER_EXECUTION_DISCRIMINATOR })
+  );
 }
 
-export function getPreStartOrderExecutionInstructionDataDecoder(): Decoder<PreStartOrderExecutionInstructionData> {
+export function getPreStartOrderExecutionInstructionDataDecoder(): FixedSizeDecoder<PreStartOrderExecutionInstructionData> {
   return getStructDecoder([['discriminator', fixDecoderSize(getBytesDecoder(), 8)]]);
 }
 
-export function getPreStartOrderExecutionInstructionDataCodec(): Codec<
+export function getPreStartOrderExecutionInstructionDataCodec(): FixedSizeCodec<
   PreStartOrderExecutionInstructionDataArgs,
   PreStartOrderExecutionInstructionData
 > {
   return combineCodec(
     getPreStartOrderExecutionInstructionDataEncoder(),
-    getPreStartOrderExecutionInstructionDataDecoder(),
+    getPreStartOrderExecutionInstructionDataDecoder()
   );
 }
 
@@ -187,7 +195,7 @@ export function getPreStartOrderExecutionInstruction<
     TAccountGuardTokenInAccount,
     TAccountTokenInProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): PreStartOrderExecutionInstruction<
   TProgramAddress,
   TAccountSolver,
@@ -274,7 +282,7 @@ export function getPreStartOrderExecutionInstruction<
 
 export type ParsedPreStartOrderExecutionInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
 > = {
   programAddress: Address<TProgram>;
   accounts: {
@@ -313,9 +321,11 @@ export type ParsedPreStartOrderExecutionInstruction<
 
 export function parsePreStartOrderExecutionInstruction<
   TProgram extends string,
-  TAccountMetas extends readonly IAccountMeta[],
+  TAccountMetas extends readonly AccountMeta[],
 >(
-  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedPreStartOrderExecutionInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 12) {
     // TODO: Coded error.
@@ -323,7 +333,7 @@ export function parsePreStartOrderExecutionInstruction<
   }
   let accountIndex = 0;
   const getNextAccount = () => {
-    const accountMeta = instruction.accounts![accountIndex]!;
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
     accountIndex += 1;
     return accountMeta;
   };

package/src/core/solana/generated/cross-chain/instructions/setAdmin.ts

@@ -6,7 +6,12 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { getAddressDecoder, getAddressEncoder, getProgramDerivedAddress, type Address } from '@solana/kit';
+import {
+  getAddressDecoder,
+  getAddressEncoder,
+  getProgramDerivedAddress,
+  type Address,
+} from '@solana/addresses';
 import {
   combineCodec,
   fixDecoderSize,
@@ -16,20 +21,20 @@ import {
   getStructDecoder,
   getStructEncoder,
   transformEncoder,
-  type Codec,
-  type Decoder,
-  type Encoder,
+  type FixedSizeCodec,
+  type FixedSizeDecoder,
+  type FixedSizeEncoder,
   type ReadonlyUint8Array,
-} from '@solana/kit';
+} from '@solana/codecs';
 import {
-  type IAccountMeta,
-  type IInstruction,
-  type IInstructionWithAccounts,
-  type IInstructionWithData,
+  type AccountMeta,
+  type Instruction,
+  type InstructionWithAccounts,
+  type InstructionWithData,
   type WritableAccount,
   type WritableSignerAccount,
-} from '@solana/kit';
-import { type IAccountSignerMeta, type TransactionSigner } from '@solana/kit';
+} from '@solana/instructions';
+import { type AccountSignerMeta, type TransactionSigner } from '@solana/signers';
 import { SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
 
@@ -41,17 +46,19 @@ export function getSetAdminDiscriminatorBytes() {
 
 export type SetAdminInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountAdmin extends string | IAccountMeta<string> = string,
-  TAccountAdminSingleton extends string | IAccountMeta<string> = string,
-  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
-> = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
-  IInstructionWithAccounts<
+  TAccountAdmin extends string | AccountMeta<string> = string,
+  TAccountAdminSingleton extends string | AccountMeta<string> = string,
+  TRemainingAccounts extends readonly AccountMeta<string>[] = [],
+> = Instruction<TProgram> &
+  InstructionWithData<ReadonlyUint8Array> &
+  InstructionWithAccounts<
     [
       TAccountAdmin extends string
-        ? WritableSignerAccount<TAccountAdmin> & IAccountSignerMeta<TAccountAdmin>
+        ? WritableSignerAccount<TAccountAdmin> & AccountSignerMeta<TAccountAdmin>
         : TAccountAdmin,
-      TAccountAdminSingleton extends string ? WritableAccount<TAccountAdminSingleton> : TAccountAdminSingleton,
+      TAccountAdminSingleton extends string
+        ? WritableAccount<TAccountAdminSingleton>
+        : TAccountAdminSingleton,
       ...TRemainingAccounts,
     ]
   >;
@@ -60,24 +67,27 @@ export type SetAdminInstructionData = { discriminator: ReadonlyUint8Array; newAd
 
 export type SetAdminInstructionDataArgs = { newAdmin: Address };
 
-export function getSetAdminInstructionDataEncoder(): Encoder<SetAdminInstructionDataArgs> {
+export function getSetAdminInstructionDataEncoder(): FixedSizeEncoder<SetAdminInstructionDataArgs> {
   return transformEncoder(
     getStructEncoder([
       ['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
       ['newAdmin', getAddressEncoder()],
     ]),
-    (value) => ({ ...value, discriminator: SET_ADMIN_DISCRIMINATOR }),
+    (value) => ({ ...value, discriminator: SET_ADMIN_DISCRIMINATOR })
   );
 }
 
-export function getSetAdminInstructionDataDecoder(): Decoder<SetAdminInstructionData> {
+export function getSetAdminInstructionDataDecoder(): FixedSizeDecoder<SetAdminInstructionData> {
   return getStructDecoder([
     ['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
     ['newAdmin', getAddressDecoder()],
   ]);
 }
 
-export function getSetAdminInstructionDataCodec(): Codec<SetAdminInstructionDataArgs, SetAdminInstructionData> {
+export function getSetAdminInstructionDataCodec(): FixedSizeCodec<
+  SetAdminInstructionDataArgs,
+  SetAdminInstructionData
+> {
   return combineCodec(getSetAdminInstructionDataEncoder(), getSetAdminInstructionDataDecoder());
 }
 
@@ -98,7 +108,7 @@ export async function getSetAdminInstructionAsync<
   TProgramAddress extends Address = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: SetAdminAsyncInput<TAccountAdmin, TAccountAdminSingleton>,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): Promise<SetAdminInstruction<TProgramAddress, TAccountAdmin, TAccountAdminSingleton>> {
   // Program address.
   const programAddress = config?.programAddress ?? SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS;
@@ -131,7 +141,10 @@ export async function getSetAdminInstructionAsync<
   return instruction;
 }
 
-export type SetAdminInput<TAccountAdmin extends string = string, TAccountAdminSingleton extends string = string> = {
+export type SetAdminInput<
+  TAccountAdmin extends string = string,
+  TAccountAdminSingleton extends string = string,
+> = {
   /** Admin signer */
   admin: TransactionSigner<TAccountAdmin>;
   /** Admin singleton account that grants access to admin functions */
@@ -145,7 +158,7 @@ export function getSetAdminInstruction<
   TProgramAddress extends Address = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: SetAdminInput<TAccountAdmin, TAccountAdminSingleton>,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): SetAdminInstruction<TProgramAddress, TAccountAdmin, TAccountAdminSingleton> {
   // Program address.
   const programAddress = config?.programAddress ?? SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS;
@@ -172,7 +185,7 @@ export function getSetAdminInstruction<
 
 export type ParsedSetAdminInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
 > = {
   programAddress: Address<TProgram>;
   accounts: {
@@ -184,8 +197,13 @@ export type ParsedSetAdminInstruction<
   data: SetAdminInstructionData;
 };
 
-export function parseSetAdminInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
-  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+export function parseSetAdminInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedSetAdminInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 2) {
     // TODO: Coded error.
@@ -193,7 +211,7 @@ export function parseSetAdminInstruction<TProgram extends string, TAccountMetas
   }
   let accountIndex = 0;
   const getNextAccount = () => {
-    const accountMeta = instruction.accounts![accountIndex]!;
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
     accountIndex += 1;
     return accountMeta;
   };