@shogun-sdk/intents-sdk 1.2.0 → 1.2.2

package/src/core/solana/generated/single-chain/instructions/createDcaOrder.ts

@@ -6,7 +6,7 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { getAddressEncoder, getProgramDerivedAddress, type Address } from '@solana/kit';
+import { getAddressEncoder, getProgramDerivedAddress, type Address } from '@solana/addresses';
 import {
   combineCodec,
   fixDecoderSize,
@@ -26,17 +26,17 @@ import {
   type Decoder,
   type Encoder,
   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 { SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
 import { expectAddress, getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
 
@@ -48,39 +48,47 @@ export function getCreateDcaOrderDiscriminatorBytes() {
 
 export type CreateDcaOrderInstruction<
   TProgram extends string = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountUser extends string | IAccountMeta<string> = string,
-  TAccountOrder extends string | IAccountMeta<string> = string,
-  TAccountGuard extends string | IAccountMeta<string> = string,
-  TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111',
-  TAccountAssociatedTokenProgram extends string | IAccountMeta<string> = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
-  TAccountTokenInMint extends string | IAccountMeta<string> = string,
-  TAccountUserTokenInAccount 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<
+  TAccountUser extends string | AccountMeta<string> = string,
+  TAccountOrder extends string | AccountMeta<string> = string,
+  TAccountGuard extends string | AccountMeta<string> = string,
+  TAccountSystemProgram extends string | AccountMeta<string> = '11111111111111111111111111111111',
+  TAccountAssociatedTokenProgram extends
+    | string
+    | AccountMeta<string> = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
+  TAccountTokenInMint extends string | AccountMeta<string> = string,
+  TAccountUserTokenInAccount 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<
     [
       TAccountUser extends string
-        ? WritableSignerAccount<TAccountUser> & IAccountSignerMeta<TAccountUser>
+        ? WritableSignerAccount<TAccountUser> & AccountSignerMeta<TAccountUser>
         : TAccountUser,
       TAccountOrder extends string
-        ? WritableSignerAccount<TAccountOrder> & IAccountSignerMeta<TAccountOrder>
+        ? WritableSignerAccount<TAccountOrder> & AccountSignerMeta<TAccountOrder>
         : TAccountOrder,
       TAccountGuard extends string ? ReadonlyAccount<TAccountGuard> : TAccountGuard,
-      TAccountSystemProgram extends string ? ReadonlyAccount<TAccountSystemProgram> : TAccountSystemProgram,
+      TAccountSystemProgram extends string
+        ? ReadonlyAccount<TAccountSystemProgram>
+        : TAccountSystemProgram,
       TAccountAssociatedTokenProgram extends string
         ? ReadonlyAccount<TAccountAssociatedTokenProgram>
         : TAccountAssociatedTokenProgram,
-      TAccountTokenInMint extends string ? ReadonlyAccount<TAccountTokenInMint> : TAccountTokenInMint,
+      TAccountTokenInMint extends string
+        ? ReadonlyAccount<TAccountTokenInMint>
+        : TAccountTokenInMint,
       TAccountUserTokenInAccount extends string
         ? WritableAccount<TAccountUserTokenInAccount>
         : TAccountUserTokenInAccount,
       TAccountGuardTokenInAccount extends string
         ? WritableAccount<TAccountGuardTokenInAccount>
         : TAccountGuardTokenInAccount,
-      TAccountTokenInProgram extends string ? ReadonlyAccount<TAccountTokenInProgram> : TAccountTokenInProgram,
+      TAccountTokenInProgram extends string
+        ? ReadonlyAccount<TAccountTokenInProgram>
+        : TAccountTokenInProgram,
       ...TRemainingAccounts,
     ]
   >;
@@ -118,7 +126,7 @@ export function getCreateDcaOrderInstructionDataEncoder(): Encoder<CreateDcaOrde
       ['extraTransfersAmounts', getArrayEncoder(getU64Encoder())],
       ['deadline', getU32Encoder()],
     ]),
-    (value) => ({ ...value, discriminator: CREATE_DCA_ORDER_DISCRIMINATOR }),
+    (value) => ({ ...value, discriminator: CREATE_DCA_ORDER_DISCRIMINATOR })
   );
 }
 
@@ -139,7 +147,10 @@ export function getCreateDcaOrderInstructionDataCodec(): Codec<
   CreateDcaOrderInstructionDataArgs,
   CreateDcaOrderInstructionData
 > {
-  return combineCodec(getCreateDcaOrderInstructionDataEncoder(), getCreateDcaOrderInstructionDataDecoder());
+  return combineCodec(
+    getCreateDcaOrderInstructionDataEncoder(),
+    getCreateDcaOrderInstructionDataDecoder()
+  );
 }
 
 export type CreateDcaOrderAsyncInput<
@@ -203,7 +214,7 @@ export async function getCreateDcaOrderInstructionAsync<
     TAccountGuardTokenInAccount,
     TAccountTokenInProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): Promise<
   CreateDcaOrderInstruction<
     TProgramAddress,
@@ -227,19 +238,10 @@ export async function getCreateDcaOrderInstructionAsync<
     order: { value: input.order ?? null, isWritable: true },
     guard: { value: input.guard ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
-    associatedTokenProgram: {
-      value: input.associatedTokenProgram ?? null,
-      isWritable: false,
-    },
+    associatedTokenProgram: { value: input.associatedTokenProgram ?? null, isWritable: false },
     tokenInMint: { value: input.tokenInMint ?? null, isWritable: false },
-    userTokenInAccount: {
-      value: input.userTokenInAccount ?? null,
-      isWritable: true,
-    },
-    guardTokenInAccount: {
-      value: input.guardTokenInAccount ?? null,
-      isWritable: true,
-    },
+    userTokenInAccount: { value: input.userTokenInAccount ?? null, isWritable: true },
+    guardTokenInAccount: { value: input.guardTokenInAccount ?? null, isWritable: true },
     tokenInProgram: { value: input.tokenInProgram ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
@@ -249,7 +251,8 @@ export async function getCreateDcaOrderInstructionAsync<
 
   // Resolve default values.
   if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
   if (!accounts.associatedTokenProgram.value) {
     accounts.associatedTokenProgram.value =
@@ -281,7 +284,9 @@ export async function getCreateDcaOrderInstructionAsync<
       getAccountMeta(accounts.tokenInProgram),
     ],
     programAddress,
-    data: getCreateDcaOrderInstructionDataEncoder().encode(args as CreateDcaOrderInstructionDataArgs),
+    data: getCreateDcaOrderInstructionDataEncoder().encode(
+      args as CreateDcaOrderInstructionDataArgs
+    ),
   } as CreateDcaOrderInstruction<
     TProgramAddress,
     TAccountUser,
@@ -359,7 +364,7 @@ export function getCreateDcaOrderInstruction<
     TAccountGuardTokenInAccount,
     TAccountTokenInProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): CreateDcaOrderInstruction<
   TProgramAddress,
   TAccountUser,
@@ -381,19 +386,10 @@ export function getCreateDcaOrderInstruction<
     order: { value: input.order ?? null, isWritable: true },
     guard: { value: input.guard ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
-    associatedTokenProgram: {
-      value: input.associatedTokenProgram ?? null,
-      isWritable: false,
-    },
+    associatedTokenProgram: { value: input.associatedTokenProgram ?? null, isWritable: false },
     tokenInMint: { value: input.tokenInMint ?? null, isWritable: false },
-    userTokenInAccount: {
-      value: input.userTokenInAccount ?? null,
-      isWritable: true,
-    },
-    guardTokenInAccount: {
-      value: input.guardTokenInAccount ?? null,
-      isWritable: true,
-    },
+    userTokenInAccount: { value: input.userTokenInAccount ?? null, isWritable: true },
+    guardTokenInAccount: { value: input.guardTokenInAccount ?? null, isWritable: true },
     tokenInProgram: { value: input.tokenInProgram ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
@@ -403,7 +399,8 @@ export function getCreateDcaOrderInstruction<
 
   // Resolve default values.
   if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
   if (!accounts.associatedTokenProgram.value) {
     accounts.associatedTokenProgram.value =
@@ -424,7 +421,9 @@ export function getCreateDcaOrderInstruction<
       getAccountMeta(accounts.tokenInProgram),
     ],
     programAddress,
-    data: getCreateDcaOrderInstructionDataEncoder().encode(args as CreateDcaOrderInstructionDataArgs),
+    data: getCreateDcaOrderInstructionDataEncoder().encode(
+      args as CreateDcaOrderInstructionDataArgs
+    ),
   } as CreateDcaOrderInstruction<
     TProgramAddress,
     TAccountUser,
@@ -443,7 +442,7 @@ export function getCreateDcaOrderInstruction<
 
 export type ParsedCreateDcaOrderInstruction<
   TProgram extends string = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
 > = {
   programAddress: Address<TProgram>;
   accounts: {
@@ -469,8 +468,13 @@ export type ParsedCreateDcaOrderInstruction<
   data: CreateDcaOrderInstructionData;
 };
 
-export function parseCreateDcaOrderInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
-  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+export function parseCreateDcaOrderInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedCreateDcaOrderInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 9) {
     // TODO: Coded error.
@@ -478,7 +482,7 @@ export function parseCreateDcaOrderInstruction<TProgram extends string, TAccount
   }
   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/single-chain/instructions/createGuard.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,
@@ -18,21 +23,21 @@ import {
   getU8Decoder,
   getU8Encoder,
   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 { SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
 import { expectAddress, getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
 
@@ -44,31 +49,43 @@ export function getCreateGuardDiscriminatorBytes() {
 
 export type CreateGuardInstruction<
   TProgram extends string = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountAdmin extends string | IAccountMeta<string> = string,
-  TAccountGuard extends string | IAccountMeta<string> = string,
-  TAccountAdminSingleton extends string | IAccountMeta<string> = string,
-  TAccountSystemProgram extends string | IAccountMeta<string> = '11111111111111111111111111111111',
-  TAccountAssociatedTokenProgram extends string | IAccountMeta<string> = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
-  TAccountFeeTokenMint extends string | IAccountMeta<string> = string,
-  TAccountFeeTokenAccount extends string | IAccountMeta<string> = string,
-  TAccountFeeTokenProgram extends string | IAccountMeta<string> = string,
-  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
-> = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
-  IInstructionWithAccounts<
+  TAccountAdmin extends string | AccountMeta<string> = string,
+  TAccountGuard extends string | AccountMeta<string> = string,
+  TAccountAdminSingleton extends string | AccountMeta<string> = string,
+  TAccountSystemProgram extends string | AccountMeta<string> = '11111111111111111111111111111111',
+  TAccountAssociatedTokenProgram extends
+    | string
+    | AccountMeta<string> = 'ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL',
+  TAccountFeeTokenMint extends string | AccountMeta<string> = string,
+  TAccountFeeTokenAccount extends string | AccountMeta<string> = string,
+  TAccountFeeTokenProgram 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,
       TAccountGuard extends string ? WritableAccount<TAccountGuard> : TAccountGuard,
-      TAccountAdminSingleton extends string ? ReadonlyAccount<TAccountAdminSingleton> : TAccountAdminSingleton,
-      TAccountSystemProgram extends string ? ReadonlyAccount<TAccountSystemProgram> : TAccountSystemProgram,
+      TAccountAdminSingleton extends string
+        ? ReadonlyAccount<TAccountAdminSingleton>
+        : TAccountAdminSingleton,
+      TAccountSystemProgram extends string
+        ? ReadonlyAccount<TAccountSystemProgram>
+        : TAccountSystemProgram,
       TAccountAssociatedTokenProgram extends string
         ? ReadonlyAccount<TAccountAssociatedTokenProgram>
         : TAccountAssociatedTokenProgram,
-      TAccountFeeTokenMint extends string ? ReadonlyAccount<TAccountFeeTokenMint> : TAccountFeeTokenMint,
-      TAccountFeeTokenAccount extends string ? WritableAccount<TAccountFeeTokenAccount> : TAccountFeeTokenAccount,
-      TAccountFeeTokenProgram extends string ? ReadonlyAccount<TAccountFeeTokenProgram> : TAccountFeeTokenProgram,
+      TAccountFeeTokenMint extends string
+        ? ReadonlyAccount<TAccountFeeTokenMint>
+        : TAccountFeeTokenMint,
+      TAccountFeeTokenAccount extends string
+        ? WritableAccount<TAccountFeeTokenAccount>
+        : TAccountFeeTokenAccount,
+      TAccountFeeTokenProgram extends string
+        ? ReadonlyAccount<TAccountFeeTokenProgram>
+        : TAccountFeeTokenProgram,
       ...TRemainingAccounts,
     ]
   >;
@@ -79,23 +96,20 @@ export type CreateGuardInstructionData = {
   guardVersion: number;
 };
 
-export type CreateGuardInstructionDataArgs = {
-  auctioneerPubKey: Address;
-  guardVersion: number;
-};
+export type CreateGuardInstructionDataArgs = { auctioneerPubKey: Address; guardVersion: number };
 
-export function getCreateGuardInstructionDataEncoder(): Encoder<CreateGuardInstructionDataArgs> {
+export function getCreateGuardInstructionDataEncoder(): FixedSizeEncoder<CreateGuardInstructionDataArgs> {
   return transformEncoder(
     getStructEncoder([
       ['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
       ['auctioneerPubKey', getAddressEncoder()],
       ['guardVersion', getU8Encoder()],
     ]),
-    (value) => ({ ...value, discriminator: CREATE_GUARD_DISCRIMINATOR }),
+    (value) => ({ ...value, discriminator: CREATE_GUARD_DISCRIMINATOR })
   );
 }
 
-export function getCreateGuardInstructionDataDecoder(): Decoder<CreateGuardInstructionData> {
+export function getCreateGuardInstructionDataDecoder(): FixedSizeDecoder<CreateGuardInstructionData> {
   return getStructDecoder([
     ['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
     ['auctioneerPubKey', getAddressDecoder()],
@@ -103,11 +117,14 @@ export function getCreateGuardInstructionDataDecoder(): Decoder<CreateGuardInstr
   ]);
 }
 
-export function getCreateGuardInstructionDataCodec(): Codec<
+export function getCreateGuardInstructionDataCodec(): FixedSizeCodec<
   CreateGuardInstructionDataArgs,
   CreateGuardInstructionData
 > {
-  return combineCodec(getCreateGuardInstructionDataEncoder(), getCreateGuardInstructionDataDecoder());
+  return combineCodec(
+    getCreateGuardInstructionDataEncoder(),
+    getCreateGuardInstructionDataDecoder()
+  );
 }
 
 export type CreateGuardAsyncInput<
@@ -161,7 +178,7 @@ export async function getCreateGuardInstructionAsync<
     TAccountFeeTokenAccount,
     TAccountFeeTokenProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): Promise<
   CreateGuardInstruction<
     TProgramAddress,
@@ -184,16 +201,10 @@ export async function getCreateGuardInstructionAsync<
     guard: { value: input.guard ?? null, isWritable: true },
     adminSingleton: { value: input.adminSingleton ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
-    associatedTokenProgram: {
-      value: input.associatedTokenProgram ?? null,
-      isWritable: false,
-    },
+    associatedTokenProgram: { value: input.associatedTokenProgram ?? null, isWritable: false },
     feeTokenMint: { value: input.feeTokenMint ?? null, isWritable: false },
     feeTokenAccount: { value: input.feeTokenAccount ?? null, isWritable: true },
-    feeTokenProgram: {
-      value: input.feeTokenProgram ?? null,
-      isWritable: false,
-    },
+    feeTokenProgram: { value: input.feeTokenProgram ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
 
@@ -208,7 +219,8 @@ export async function getCreateGuardInstructionAsync<
     });
   }
   if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
   if (!accounts.associatedTokenProgram.value) {
     accounts.associatedTokenProgram.value =
@@ -306,7 +318,7 @@ export function getCreateGuardInstruction<
     TAccountFeeTokenAccount,
     TAccountFeeTokenProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): CreateGuardInstruction<
   TProgramAddress,
   TAccountAdmin,
@@ -327,16 +339,10 @@ export function getCreateGuardInstruction<
     guard: { value: input.guard ?? null, isWritable: true },
     adminSingleton: { value: input.adminSingleton ?? null, isWritable: false },
     systemProgram: { value: input.systemProgram ?? null, isWritable: false },
-    associatedTokenProgram: {
-      value: input.associatedTokenProgram ?? null,
-      isWritable: false,
-    },
+    associatedTokenProgram: { value: input.associatedTokenProgram ?? null, isWritable: false },
     feeTokenMint: { value: input.feeTokenMint ?? null, isWritable: false },
     feeTokenAccount: { value: input.feeTokenAccount ?? null, isWritable: true },
-    feeTokenProgram: {
-      value: input.feeTokenProgram ?? null,
-      isWritable: false,
-    },
+    feeTokenProgram: { value: input.feeTokenProgram ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
 
@@ -345,7 +351,8 @@ export function getCreateGuardInstruction<
 
   // Resolve default values.
   if (!accounts.systemProgram.value) {
-    accounts.systemProgram.value = '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
+    accounts.systemProgram.value =
+      '11111111111111111111111111111111' as Address<'11111111111111111111111111111111'>;
   }
   if (!accounts.associatedTokenProgram.value) {
     accounts.associatedTokenProgram.value =
@@ -383,7 +390,7 @@ export function getCreateGuardInstruction<
 
 export type ParsedCreateGuardInstruction<
   TProgram extends string = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountMetas extends readonly IAccountMeta[] = readonly IAccountMeta[],
+  TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[],
 > = {
   programAddress: Address<TProgram>;
   accounts: {
@@ -407,8 +414,13 @@ export type ParsedCreateGuardInstruction<
   data: CreateGuardInstructionData;
 };
 
-export function parseCreateGuardInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
-  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+export function parseCreateGuardInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedCreateGuardInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 8) {
     // TODO: Coded error.
@@ -416,7 +428,7 @@ export function parseCreateGuardInstruction<TProgram extends string, TAccountMet
   }
   let accountIndex = 0;
   const getNextAccount = () => {
-    const accountMeta = instruction.accounts![accountIndex]!;
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
     accountIndex += 1;
     return accountMeta;
   };