@shogun-sdk/intents-sdk 1.2.1 → 1.2.2

package/src/core/solana/generated/cross-chain/instructions/setAuctioneerPubKey.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,25 +21,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 SET_AUCTIONEER_PUB_KEY_DISCRIMINATOR = new Uint8Array([153, 39, 10, 108, 220, 0, 84, 47]);
+export const SET_AUCTIONEER_PUB_KEY_DISCRIMINATOR = new Uint8Array([
+  153, 39, 10, 108, 220, 0, 84, 47,
+]);
 
 export function getSetAuctioneerPubKeyDiscriminatorBytes() {
   return fixEncoderSize(getBytesEncoder(), 8).encode(SET_AUCTIONEER_PUB_KEY_DISCRIMINATOR);
@@ -42,18 +49,20 @@ export function getSetAuctioneerPubKeyDiscriminatorBytes() {
 
 export type SetAuctioneerPubKeyInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountAdmin extends string | IAccountMeta<string> = string,
-  TAccountAdminSingleton extends string | IAccountMeta<string> = string,
-  TAccountGuard 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,
+  TAccountGuard 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 ? ReadonlyAccount<TAccountAdminSingleton> : TAccountAdminSingleton,
+      TAccountAdminSingleton extends string
+        ? ReadonlyAccount<TAccountAdminSingleton>
+        : TAccountAdminSingleton,
       TAccountGuard extends string ? WritableAccount<TAccountGuard> : TAccountGuard,
       ...TRemainingAccounts,
     ]
@@ -66,28 +75,31 @@ export type SetAuctioneerPubKeyInstructionData = {
 
 export type SetAuctioneerPubKeyInstructionDataArgs = { auctioneerPubKey: Address };
 
-export function getSetAuctioneerPubKeyInstructionDataEncoder(): Encoder<SetAuctioneerPubKeyInstructionDataArgs> {
+export function getSetAuctioneerPubKeyInstructionDataEncoder(): FixedSizeEncoder<SetAuctioneerPubKeyInstructionDataArgs> {
   return transformEncoder(
     getStructEncoder([
       ['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
       ['auctioneerPubKey', getAddressEncoder()],
     ]),
-    (value) => ({ ...value, discriminator: SET_AUCTIONEER_PUB_KEY_DISCRIMINATOR }),
+    (value) => ({ ...value, discriminator: SET_AUCTIONEER_PUB_KEY_DISCRIMINATOR })
   );
 }
 
-export function getSetAuctioneerPubKeyInstructionDataDecoder(): Decoder<SetAuctioneerPubKeyInstructionData> {
+export function getSetAuctioneerPubKeyInstructionDataDecoder(): FixedSizeDecoder<SetAuctioneerPubKeyInstructionData> {
   return getStructDecoder([
     ['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
     ['auctioneerPubKey', getAddressDecoder()],
   ]);
 }
 
-export function getSetAuctioneerPubKeyInstructionDataCodec(): Codec<
+export function getSetAuctioneerPubKeyInstructionDataCodec(): FixedSizeCodec<
   SetAuctioneerPubKeyInstructionDataArgs,
   SetAuctioneerPubKeyInstructionData
 > {
-  return combineCodec(getSetAuctioneerPubKeyInstructionDataEncoder(), getSetAuctioneerPubKeyInstructionDataDecoder());
+  return combineCodec(
+    getSetAuctioneerPubKeyInstructionDataEncoder(),
+    getSetAuctioneerPubKeyInstructionDataDecoder()
+  );
 }
 
 export type SetAuctioneerPubKeyAsyncInput<
@@ -111,8 +123,15 @@ export async function getSetAuctioneerPubKeyInstructionAsync<
   TProgramAddress extends Address = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: SetAuctioneerPubKeyAsyncInput<TAccountAdmin, TAccountAdminSingleton, TAccountGuard>,
-  config?: { programAddress?: TProgramAddress },
-): Promise<SetAuctioneerPubKeyInstruction<TProgramAddress, TAccountAdmin, TAccountAdminSingleton, TAccountGuard>> {
+  config?: { programAddress?: TProgramAddress }
+): Promise<
+  SetAuctioneerPubKeyInstruction<
+    TProgramAddress,
+    TAccountAdmin,
+    TAccountAdminSingleton,
+    TAccountGuard
+  >
+> {
   // Program address.
   const programAddress = config?.programAddress ?? SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS;
 
@@ -137,10 +156,21 @@ export async function getSetAuctioneerPubKeyInstructionAsync<
 
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
   const instruction = {
-    accounts: [getAccountMeta(accounts.admin), getAccountMeta(accounts.adminSingleton), getAccountMeta(accounts.guard)],
+    accounts: [
+      getAccountMeta(accounts.admin),
+      getAccountMeta(accounts.adminSingleton),
+      getAccountMeta(accounts.guard),
+    ],
     programAddress,
-    data: getSetAuctioneerPubKeyInstructionDataEncoder().encode(args as SetAuctioneerPubKeyInstructionDataArgs),
-  } as SetAuctioneerPubKeyInstruction<TProgramAddress, TAccountAdmin, TAccountAdminSingleton, TAccountGuard>;
+    data: getSetAuctioneerPubKeyInstructionDataEncoder().encode(
+      args as SetAuctioneerPubKeyInstructionDataArgs
+    ),
+  } as SetAuctioneerPubKeyInstruction<
+    TProgramAddress,
+    TAccountAdmin,
+    TAccountAdminSingleton,
+    TAccountGuard
+  >;
 
   return instruction;
 }
@@ -166,8 +196,13 @@ export function getSetAuctioneerPubKeyInstruction<
   TProgramAddress extends Address = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: SetAuctioneerPubKeyInput<TAccountAdmin, TAccountAdminSingleton, TAccountGuard>,
-  config?: { programAddress?: TProgramAddress },
-): SetAuctioneerPubKeyInstruction<TProgramAddress, TAccountAdmin, TAccountAdminSingleton, TAccountGuard> {
+  config?: { programAddress?: TProgramAddress }
+): SetAuctioneerPubKeyInstruction<
+  TProgramAddress,
+  TAccountAdmin,
+  TAccountAdminSingleton,
+  TAccountGuard
+> {
   // Program address.
   const programAddress = config?.programAddress ?? SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS;
 
@@ -184,17 +219,28 @@ export function getSetAuctioneerPubKeyInstruction<
 
   const getAccountMeta = getAccountMetaFactory(programAddress, 'programId');
   const instruction = {
-    accounts: [getAccountMeta(accounts.admin), getAccountMeta(accounts.adminSingleton), getAccountMeta(accounts.guard)],
+    accounts: [
+      getAccountMeta(accounts.admin),
+      getAccountMeta(accounts.adminSingleton),
+      getAccountMeta(accounts.guard),
+    ],
     programAddress,
-    data: getSetAuctioneerPubKeyInstructionDataEncoder().encode(args as SetAuctioneerPubKeyInstructionDataArgs),
-  } as SetAuctioneerPubKeyInstruction<TProgramAddress, TAccountAdmin, TAccountAdminSingleton, TAccountGuard>;
+    data: getSetAuctioneerPubKeyInstructionDataEncoder().encode(
+      args as SetAuctioneerPubKeyInstructionDataArgs
+    ),
+  } as SetAuctioneerPubKeyInstruction<
+    TProgramAddress,
+    TAccountAdmin,
+    TAccountAdminSingleton,
+    TAccountGuard
+  >;
 
   return instruction;
 }
 
 export type ParsedSetAuctioneerPubKeyInstruction<
   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: {
@@ -210,9 +256,11 @@ export type ParsedSetAuctioneerPubKeyInstruction<
 
 export function parseSetAuctioneerPubKeyInstruction<
   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>
 ): ParsedSetAuctioneerPubKeyInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 3) {
     // TODO: Coded error.
@@ -220,7 +268,7 @@ export function parseSetAuctioneerPubKeyInstruction<
   }
   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/startOrderExecution.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 START_ORDER_EXECUTION_DISCRIMINATOR = new Uint8Array([38, 237, 19, 225, 182, 31, 246, 143]);
+export const START_ORDER_EXECUTION_DISCRIMINATOR = new Uint8Array([
+  38, 237, 19, 225, 182, 31, 246, 143,
+]);
 
 export function getStartOrderExecutionDiscriminatorBytes() {
   return fixEncoderSize(getBytesEncoder(), 8).encode(START_ORDER_EXECUTION_DISCRIMINATOR);
@@ -42,21 +44,23 @@ export function getStartOrderExecutionDiscriminatorBytes() {
 
 export type StartOrderExecutionInstruction<
   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,
-  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,
+  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,
@@ -79,24 +83,27 @@ export type StartOrderExecutionInstruction<
 
 export type StartOrderExecutionInstructionData = { discriminator: ReadonlyUint8Array };
 
-export type StartOrderExecutionInstructionDataArgs = object;
+export type StartOrderExecutionInstructionDataArgs = Object;
 
-export function getStartOrderExecutionInstructionDataEncoder(): Encoder<StartOrderExecutionInstructionDataArgs> {
-  return transformEncoder(getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]), (value) => ({
-    ...value,
-    discriminator: START_ORDER_EXECUTION_DISCRIMINATOR,
-  }));
+export function getStartOrderExecutionInstructionDataEncoder(): FixedSizeEncoder<StartOrderExecutionInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]),
+    (value) => ({ ...value, discriminator: START_ORDER_EXECUTION_DISCRIMINATOR })
+  );
 }
 
-export function getStartOrderExecutionInstructionDataDecoder(): Decoder<StartOrderExecutionInstructionData> {
+export function getStartOrderExecutionInstructionDataDecoder(): FixedSizeDecoder<StartOrderExecutionInstructionData> {
   return getStructDecoder([['discriminator', fixDecoderSize(getBytesDecoder(), 8)]]);
 }
 
-export function getStartOrderExecutionInstructionDataCodec(): Codec<
+export function getStartOrderExecutionInstructionDataCodec(): FixedSizeCodec<
   StartOrderExecutionInstructionDataArgs,
   StartOrderExecutionInstructionData
 > {
-  return combineCodec(getStartOrderExecutionInstructionDataEncoder(), getStartOrderExecutionInstructionDataDecoder());
+  return combineCodec(
+    getStartOrderExecutionInstructionDataEncoder(),
+    getStartOrderExecutionInstructionDataDecoder()
+  );
 }
 
 export type StartOrderExecutionInput<
@@ -152,7 +159,7 @@ export function getStartOrderExecutionInstruction<
     TAccountGuardCollateralTokenAccount,
     TAccountCollateralTokenProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): StartOrderExecutionInstruction<
   TProgramAddress,
   TAccountSolver,
@@ -223,7 +230,7 @@ export function getStartOrderExecutionInstruction<
 
 export type ParsedStartOrderExecutionInstruction<
   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: {
@@ -254,9 +261,11 @@ export type ParsedStartOrderExecutionInstruction<
 
 export function parseStartOrderExecutionInstruction<
   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>
 ): ParsedStartOrderExecutionInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 8) {
     // TODO: Coded error.
@@ -264,7 +273,7 @@ export function parseStartOrderExecutionInstruction<
   }
   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/startOrderExecutionAfterSwap.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,
@@ -18,47 +18,53 @@ import {
   getU64Decoder,
   getU64Encoder,
   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 START_ORDER_EXECUTION_AFTER_SWAP_DISCRIMINATOR = new Uint8Array([142, 117, 45, 141, 169, 107, 117, 209]);
+export const START_ORDER_EXECUTION_AFTER_SWAP_DISCRIMINATOR = new Uint8Array([
+  142, 117, 45, 141, 169, 107, 117, 209,
+]);
 
 export function getStartOrderExecutionAfterSwapDiscriminatorBytes() {
-  return fixEncoderSize(getBytesEncoder(), 8).encode(START_ORDER_EXECUTION_AFTER_SWAP_DISCRIMINATOR);
+  return fixEncoderSize(getBytesEncoder(), 8).encode(
+    START_ORDER_EXECUTION_AFTER_SWAP_DISCRIMINATOR
+  );
 }
 
 export type StartOrderExecutionAfterSwapInstruction<
   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',
-  TAccountStablecoinTokenMint extends string | IAccountMeta<string> = string,
-  TAccountSolverStablecoinTokenAccount extends string | IAccountMeta<string> = string,
-  TAccountGuardStablecoinTokenAccount extends string | IAccountMeta<string> = string,
-  TAccountStablecoinTokenProgram 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',
+  TAccountStablecoinTokenMint extends string | AccountMeta<string> = string,
+  TAccountSolverStablecoinTokenAccount extends string | AccountMeta<string> = string,
+  TAccountGuardStablecoinTokenAccount extends string | AccountMeta<string> = string,
+  TAccountStablecoinTokenProgram 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 ? ReadonlyAccount<TAccountGuard> : TAccountGuard,
@@ -88,30 +94,30 @@ export type StartOrderExecutionAfterSwapInstructionDataArgs = {
   stablecoinsAmount: number | bigint;
 };
 
-export function getStartOrderExecutionAfterSwapInstructionDataEncoder(): Encoder<StartOrderExecutionAfterSwapInstructionDataArgs> {
+export function getStartOrderExecutionAfterSwapInstructionDataEncoder(): FixedSizeEncoder<StartOrderExecutionAfterSwapInstructionDataArgs> {
   return transformEncoder(
     getStructEncoder([
       ['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
       ['stablecoinsAmount', getU64Encoder()],
     ]),
-    (value) => ({ ...value, discriminator: START_ORDER_EXECUTION_AFTER_SWAP_DISCRIMINATOR }),
+    (value) => ({ ...value, discriminator: START_ORDER_EXECUTION_AFTER_SWAP_DISCRIMINATOR })
   );
 }
 
-export function getStartOrderExecutionAfterSwapInstructionDataDecoder(): Decoder<StartOrderExecutionAfterSwapInstructionData> {
+export function getStartOrderExecutionAfterSwapInstructionDataDecoder(): FixedSizeDecoder<StartOrderExecutionAfterSwapInstructionData> {
   return getStructDecoder([
     ['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
     ['stablecoinsAmount', getU64Decoder()],
   ]);
 }
 
-export function getStartOrderExecutionAfterSwapInstructionDataCodec(): Codec<
+export function getStartOrderExecutionAfterSwapInstructionDataCodec(): FixedSizeCodec<
   StartOrderExecutionAfterSwapInstructionDataArgs,
   StartOrderExecutionAfterSwapInstructionData
 > {
   return combineCodec(
     getStartOrderExecutionAfterSwapInstructionDataEncoder(),
-    getStartOrderExecutionAfterSwapInstructionDataDecoder(),
+    getStartOrderExecutionAfterSwapInstructionDataDecoder()
   );
 }
 
@@ -172,7 +178,7 @@ export function getStartOrderExecutionAfterSwapInstruction<
     TAccountGuardStablecoinTokenAccount,
     TAccountStablecoinTokenProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): StartOrderExecutionAfterSwapInstruction<
   TProgramAddress,
   TAccountSolver,
@@ -229,7 +235,7 @@ export function getStartOrderExecutionAfterSwapInstruction<
     ],
     programAddress,
     data: getStartOrderExecutionAfterSwapInstructionDataEncoder().encode(
-      args as StartOrderExecutionAfterSwapInstructionDataArgs,
+      args as StartOrderExecutionAfterSwapInstructionDataArgs
     ),
   } as StartOrderExecutionAfterSwapInstruction<
     TProgramAddress,
@@ -248,7 +254,7 @@ export function getStartOrderExecutionAfterSwapInstruction<
 
 export type ParsedStartOrderExecutionAfterSwapInstruction<
   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: {
@@ -283,9 +289,11 @@ export type ParsedStartOrderExecutionAfterSwapInstruction<
 
 export function parseStartOrderExecutionAfterSwapInstruction<
   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>
 ): ParsedStartOrderExecutionAfterSwapInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 8) {
     // TODO: Coded error.
@@ -293,7 +301,7 @@ export function parseStartOrderExecutionAfterSwapInstruction<
   }
   let accountIndex = 0;
   const getNextAccount = () => {
-    const accountMeta = instruction.accounts![accountIndex]!;
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
     accountIndex += 1;
     return accountMeta;
   };