@shogun-sdk/intents-sdk 1.2.1 → 1.2.3

package/src/core/solana/generated/single-chain/accounts/guard.ts

@@ -18,8 +18,8 @@ import {
   type FetchAccountsConfig,
   type MaybeAccount,
   type MaybeEncodedAccount,
-} from '@solana/kit';
-import { getAddressDecoder, getAddressEncoder, type Address } from '@solana/kit';
+} from '@solana/accounts';
+import { getAddressDecoder, getAddressEncoder, type Address } from '@solana/addresses';
 import {
   combineCodec,
   fixDecoderSize,
@@ -33,11 +33,11 @@ import {
   getU8Decoder,
   getU8Encoder,
   transformEncoder,
-  type Codec,
-  type Decoder,
-  type Encoder,
+  type FixedSizeCodec,
+  type FixedSizeDecoder,
+  type FixedSizeEncoder,
   type ReadonlyUint8Array,
-} from '@solana/kit';
+} from '@solana/codecs';
 
 export const GUARD_DISCRIMINATOR = new Uint8Array([54, 187, 84, 137, 192, 15, 74, 248]);
 
@@ -72,7 +72,7 @@ export type GuardArgs = {
   collectedFees: number | bigint;
 };
 
-export function getGuardEncoder(): Encoder<GuardArgs> {
+export function getGuardEncoder(): FixedSizeEncoder<GuardArgs> {
   return transformEncoder(
     getStructEncoder([
       ['discriminator', fixEncoderSize(getBytesEncoder(), 8)],
@@ -82,11 +82,11 @@ export function getGuardEncoder(): Encoder<GuardArgs> {
       ['auctioneerPubKey', getAddressEncoder()],
       ['collectedFees', getU64Encoder()],
     ]),
-    (value) => ({ ...value, discriminator: GUARD_DISCRIMINATOR }),
+    (value) => ({ ...value, discriminator: GUARD_DISCRIMINATOR })
   );
 }
 
-export function getGuardDecoder(): Decoder<Guard> {
+export function getGuardDecoder(): FixedSizeDecoder<Guard> {
   return getStructDecoder([
     ['discriminator', fixDecoderSize(getBytesDecoder(), 8)],
     ['feeToken', getAddressDecoder()],
@@ -97,18 +97,18 @@ export function getGuardDecoder(): Decoder<Guard> {
   ]);
 }
 
-export function getGuardCodec(): Codec<GuardArgs, Guard> {
+export function getGuardCodec(): FixedSizeCodec<GuardArgs, Guard> {
   return combineCodec(getGuardEncoder(), getGuardDecoder());
 }
 
 export function decodeGuard<TAddress extends string = string>(
-  encodedAccount: EncodedAccount<TAddress>,
+  encodedAccount: EncodedAccount<TAddress>
 ): Account<Guard, TAddress>;
 export function decodeGuard<TAddress extends string = string>(
-  encodedAccount: MaybeEncodedAccount<TAddress>,
+  encodedAccount: MaybeEncodedAccount<TAddress>
 ): MaybeAccount<Guard, TAddress>;
 export function decodeGuard<TAddress extends string = string>(
-  encodedAccount: EncodedAccount<TAddress> | MaybeEncodedAccount<TAddress>,
+  encodedAccount: EncodedAccount<TAddress> | MaybeEncodedAccount<TAddress>
 ): Account<Guard, TAddress> | MaybeAccount<Guard, TAddress> {
   return decodeAccount(encodedAccount as MaybeEncodedAccount<TAddress>, getGuardDecoder());
 }
@@ -116,7 +116,7 @@ export function decodeGuard<TAddress extends string = string>(
 export async function fetchGuard<TAddress extends string = string>(
   rpc: Parameters<typeof fetchEncodedAccount>[0],
   address: Address<TAddress>,
-  config?: FetchAccountConfig,
+  config?: FetchAccountConfig
 ): Promise<Account<Guard, TAddress>> {
   const maybeAccount = await fetchMaybeGuard(rpc, address, config);
   assertAccountExists(maybeAccount);
@@ -126,7 +126,7 @@ export async function fetchGuard<TAddress extends string = string>(
 export async function fetchMaybeGuard<TAddress extends string = string>(
   rpc: Parameters<typeof fetchEncodedAccount>[0],
   address: Address<TAddress>,
-  config?: FetchAccountConfig,
+  config?: FetchAccountConfig
 ): Promise<MaybeAccount<Guard, TAddress>> {
   const maybeAccount = await fetchEncodedAccount(rpc, address, config);
   return decodeGuard(maybeAccount);
@@ -135,7 +135,7 @@ export async function fetchMaybeGuard<TAddress extends string = string>(
 export async function fetchAllGuard(
   rpc: Parameters<typeof fetchEncodedAccounts>[0],
   addresses: Array<Address>,
-  config?: FetchAccountsConfig,
+  config?: FetchAccountsConfig
 ): Promise<Account<Guard>[]> {
   const maybeAccounts = await fetchAllMaybeGuard(rpc, addresses, config);
   assertAccountsExist(maybeAccounts);
@@ -145,7 +145,7 @@ export async function fetchAllGuard(
 export async function fetchAllMaybeGuard(
   rpc: Parameters<typeof fetchEncodedAccounts>[0],
   addresses: Array<Address>,
-  config?: FetchAccountsConfig,
+  config?: FetchAccountsConfig
 ): Promise<MaybeAccount<Guard>[]> {
   const maybeAccounts = await fetchEncodedAccounts(rpc, addresses, config);
   return maybeAccounts.map((maybeAccount) => decodeGuard(maybeAccount));

package/src/core/solana/generated/single-chain/accounts/limitOrder.ts

@@ -18,8 +18,8 @@ import {
   type FetchAccountsConfig,
   type MaybeAccount,
   type MaybeEncodedAccount,
-} from '@solana/kit';
-import { getAddressDecoder, getAddressEncoder, type Address } from '@solana/kit';
+} from '@solana/accounts';
+import { getAddressDecoder, getAddressEncoder, type Address } from '@solana/addresses';
 import {
   combineCodec,
   fixDecoderSize,
@@ -39,7 +39,7 @@ import {
   type Decoder,
   type Encoder,
   type ReadonlyUint8Array,
-} from '@solana/kit';
+} from '@solana/codecs';
 
 export const LIMIT_ORDER_DISCRIMINATOR = new Uint8Array([137, 183, 212, 91, 115, 29, 141, 227]);
 
@@ -119,7 +119,7 @@ export function getLimitOrderEncoder(): Encoder<LimitOrderArgs> {
       ['extraTransfersAmounts', getArrayEncoder(getU64Encoder())],
       ['deadline', getU32Encoder()],
     ]),
-    (value) => ({ ...value, discriminator: LIMIT_ORDER_DISCRIMINATOR }),
+    (value) => ({ ...value, discriminator: LIMIT_ORDER_DISCRIMINATOR })
   );
 }
 
@@ -142,13 +142,13 @@ export function getLimitOrderCodec(): Codec<LimitOrderArgs, LimitOrder> {
 }
 
 export function decodeLimitOrder<TAddress extends string = string>(
-  encodedAccount: EncodedAccount<TAddress>,
+  encodedAccount: EncodedAccount<TAddress>
 ): Account<LimitOrder, TAddress>;
 export function decodeLimitOrder<TAddress extends string = string>(
-  encodedAccount: MaybeEncodedAccount<TAddress>,
+  encodedAccount: MaybeEncodedAccount<TAddress>
 ): MaybeAccount<LimitOrder, TAddress>;
 export function decodeLimitOrder<TAddress extends string = string>(
-  encodedAccount: EncodedAccount<TAddress> | MaybeEncodedAccount<TAddress>,
+  encodedAccount: EncodedAccount<TAddress> | MaybeEncodedAccount<TAddress>
 ): Account<LimitOrder, TAddress> | MaybeAccount<LimitOrder, TAddress> {
   return decodeAccount(encodedAccount as MaybeEncodedAccount<TAddress>, getLimitOrderDecoder());
 }
@@ -156,7 +156,7 @@ export function decodeLimitOrder<TAddress extends string = string>(
 export async function fetchLimitOrder<TAddress extends string = string>(
   rpc: Parameters<typeof fetchEncodedAccount>[0],
   address: Address<TAddress>,
-  config?: FetchAccountConfig,
+  config?: FetchAccountConfig
 ): Promise<Account<LimitOrder, TAddress>> {
   const maybeAccount = await fetchMaybeLimitOrder(rpc, address, config);
   assertAccountExists(maybeAccount);
@@ -166,7 +166,7 @@ export async function fetchLimitOrder<TAddress extends string = string>(
 export async function fetchMaybeLimitOrder<TAddress extends string = string>(
   rpc: Parameters<typeof fetchEncodedAccount>[0],
   address: Address<TAddress>,
-  config?: FetchAccountConfig,
+  config?: FetchAccountConfig
 ): Promise<MaybeAccount<LimitOrder, TAddress>> {
   const maybeAccount = await fetchEncodedAccount(rpc, address, config);
   return decodeLimitOrder(maybeAccount);
@@ -175,7 +175,7 @@ export async function fetchMaybeLimitOrder<TAddress extends string = string>(
 export async function fetchAllLimitOrder(
   rpc: Parameters<typeof fetchEncodedAccounts>[0],
   addresses: Array<Address>,
-  config?: FetchAccountsConfig,
+  config?: FetchAccountsConfig
 ): Promise<Account<LimitOrder>[]> {
   const maybeAccounts = await fetchAllMaybeLimitOrder(rpc, addresses, config);
   assertAccountsExist(maybeAccounts);
@@ -185,7 +185,7 @@ export async function fetchAllLimitOrder(
 export async function fetchAllMaybeLimitOrder(
   rpc: Parameters<typeof fetchEncodedAccounts>[0],
   addresses: Array<Address>,
-  config?: FetchAccountsConfig,
+  config?: FetchAccountsConfig
 ): Promise<MaybeAccount<LimitOrder>[]> {
   const maybeAccounts = await fetchEncodedAccounts(rpc, addresses, config);
   return maybeAccounts.map((maybeAccount) => decodeLimitOrder(maybeAccount));

package/src/core/solana/generated/single-chain/errors/singleChainGuard.ts

@@ -6,9 +6,9 @@
  * @see https://github.com/codama-idl/codama
  */
 
-import { type Address } from '@solana/kit';
-import { type SOLANA_ERROR__INSTRUCTION_ERROR__CUSTOM, type SolanaError } from '@solana/kit';
-import { isProgramError } from '@solana/kit';
+import { type Address } from '@solana/addresses';
+import { type SOLANA_ERROR__INSTRUCTION_ERROR__CUSTOM, type SolanaError } from '@solana/errors';
+import { isProgramError } from '@solana/programs';
 import { SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
 
 /** NotUpgradeAuthority: Account is not upgrade authority */
@@ -131,8 +131,13 @@ export function getSingleChainGuardErrorMessage(code: SingleChainGuardError): st
 export function isSingleChainGuardError<TProgramErrorCode extends SingleChainGuardError>(
   error: unknown,
   transactionMessage: { instructions: Record<number, { programAddress: Address }> },
-  code?: TProgramErrorCode,
+  code?: TProgramErrorCode
 ): error is SolanaError<typeof SOLANA_ERROR__INSTRUCTION_ERROR__CUSTOM> &
   Readonly<{ context: Readonly<{ code: TProgramErrorCode }> }> {
-  return isProgramError<TProgramErrorCode>(error, transactionMessage, SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS, code);
+  return isProgramError<TProgramErrorCode>(
+    error,
+    transactionMessage,
+    SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
+    code
+  );
 }

package/src/core/solana/generated/single-chain/instructions/acceptAdmin.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,20 +16,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 { SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
 
@@ -41,41 +41,46 @@ export function getAcceptAdminDiscriminatorBytes() {
 
 export type AcceptAdminInstruction<
   TProgram extends string = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountPendingAdmin extends string | IAccountMeta<string> = string,
-  TAccountAdminSingleton extends string | IAccountMeta<string> = string,
-  TRemainingAccounts extends readonly IAccountMeta<string>[] = [],
-> = IInstruction<TProgram> &
-  IInstructionWithData<Uint8Array> &
-  IInstructionWithAccounts<
+  TAccountPendingAdmin extends string | AccountMeta<string> = string,
+  TAccountAdminSingleton extends string | AccountMeta<string> = string,
+  TRemainingAccounts extends readonly AccountMeta<string>[] = [],
+> = Instruction<TProgram> &
+  InstructionWithData<ReadonlyUint8Array> &
+  InstructionWithAccounts<
     [
       TAccountPendingAdmin extends string
-        ? WritableSignerAccount<TAccountPendingAdmin> & IAccountSignerMeta<TAccountPendingAdmin>
+        ? WritableSignerAccount<TAccountPendingAdmin> & AccountSignerMeta<TAccountPendingAdmin>
         : TAccountPendingAdmin,
-      TAccountAdminSingleton extends string ? WritableAccount<TAccountAdminSingleton> : TAccountAdminSingleton,
+      TAccountAdminSingleton extends string
+        ? WritableAccount<TAccountAdminSingleton>
+        : TAccountAdminSingleton,
       ...TRemainingAccounts,
     ]
   >;
 
 export type AcceptAdminInstructionData = { discriminator: ReadonlyUint8Array };
 
-export type AcceptAdminInstructionDataArgs = object;
+export type AcceptAdminInstructionDataArgs = Object;
 
-export function getAcceptAdminInstructionDataEncoder(): Encoder<AcceptAdminInstructionDataArgs> {
-  return transformEncoder(getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]), (value) => ({
-    ...value,
-    discriminator: ACCEPT_ADMIN_DISCRIMINATOR,
-  }));
+export function getAcceptAdminInstructionDataEncoder(): FixedSizeEncoder<AcceptAdminInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]),
+    (value) => ({ ...value, discriminator: ACCEPT_ADMIN_DISCRIMINATOR })
+  );
 }
 
-export function getAcceptAdminInstructionDataDecoder(): Decoder<AcceptAdminInstructionData> {
+export function getAcceptAdminInstructionDataDecoder(): FixedSizeDecoder<AcceptAdminInstructionData> {
   return getStructDecoder([['discriminator', fixDecoderSize(getBytesDecoder(), 8)]]);
 }
 
-export function getAcceptAdminInstructionDataCodec(): Codec<
+export function getAcceptAdminInstructionDataCodec(): FixedSizeCodec<
   AcceptAdminInstructionDataArgs,
   AcceptAdminInstructionData
 > {
-  return combineCodec(getAcceptAdminInstructionDataEncoder(), getAcceptAdminInstructionDataDecoder());
+  return combineCodec(
+    getAcceptAdminInstructionDataEncoder(),
+    getAcceptAdminInstructionDataDecoder()
+  );
 }
 
 export type AcceptAdminAsyncInput<
@@ -94,7 +99,7 @@ export async function getAcceptAdminInstructionAsync<
   TProgramAddress extends Address = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: AcceptAdminAsyncInput<TAccountPendingAdmin, TAccountAdminSingleton>,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): Promise<AcceptAdminInstruction<TProgramAddress, TAccountPendingAdmin, TAccountAdminSingleton>> {
   // Program address.
   const programAddress = config?.programAddress ?? SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS;
@@ -140,7 +145,7 @@ export function getAcceptAdminInstruction<
   TProgramAddress extends Address = typeof SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS,
 >(
   input: AcceptAdminInput<TAccountPendingAdmin, TAccountAdminSingleton>,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): AcceptAdminInstruction<TProgramAddress, TAccountPendingAdmin, TAccountAdminSingleton> {
   // Program address.
   const programAddress = config?.programAddress ?? SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS;
@@ -164,7 +169,7 @@ export function getAcceptAdminInstruction<
 
 export type ParsedAcceptAdminInstruction<
   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: {
@@ -176,8 +181,13 @@ export type ParsedAcceptAdminInstruction<
   data: AcceptAdminInstructionData;
 };
 
-export function parseAcceptAdminInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
-  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+export function parseAcceptAdminInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedAcceptAdminInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 2) {
     // TODO: Coded error.
@@ -185,7 +195,7 @@ export function parseAcceptAdminInstruction<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;
   };

package/src/core/solana/generated/single-chain/instructions/cancelDcaOrder.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 { SINGLE_CHAIN_GUARD_PROGRAM_ADDRESS } from '../programs/index.js';
 import { getAccountMetaFactory, type ResolvedAccount } from '../shared/index.js';
 
-export const CANCEL_DCA_ORDER_DISCRIMINATOR = new Uint8Array([60, 161, 130, 157, 181, 55, 218, 163]);
+export const CANCEL_DCA_ORDER_DISCRIMINATOR = new Uint8Array([
+  60, 161, 130, 157, 181, 55, 218, 163,
+]);
 
 export function getCancelDcaOrderDiscriminatorBytes() {
   return fixEncoderSize(getBytesEncoder(), 8).encode(CANCEL_DCA_ORDER_DISCRIMINATOR);
@@ -42,55 +44,62 @@ export function getCancelDcaOrderDiscriminatorBytes() {
 
 export type CancelDcaOrderInstruction<
   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,
-  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,
+  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 ? WritableAccount<TAccountOrder> : TAccountOrder,
       TAccountGuard extends string ? ReadonlyAccount<TAccountGuard> : TAccountGuard,
-      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,
     ]
   >;
 
 export type CancelDcaOrderInstructionData = { discriminator: ReadonlyUint8Array };
 
-export type CancelDcaOrderInstructionDataArgs = object;
+export type CancelDcaOrderInstructionDataArgs = Object;
 
-export function getCancelDcaOrderInstructionDataEncoder(): Encoder<CancelDcaOrderInstructionDataArgs> {
-  return transformEncoder(getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]), (value) => ({
-    ...value,
-    discriminator: CANCEL_DCA_ORDER_DISCRIMINATOR,
-  }));
+export function getCancelDcaOrderInstructionDataEncoder(): FixedSizeEncoder<CancelDcaOrderInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]),
+    (value) => ({ ...value, discriminator: CANCEL_DCA_ORDER_DISCRIMINATOR })
+  );
 }
 
-export function getCancelDcaOrderInstructionDataDecoder(): Decoder<CancelDcaOrderInstructionData> {
+export function getCancelDcaOrderInstructionDataDecoder(): FixedSizeDecoder<CancelDcaOrderInstructionData> {
   return getStructDecoder([['discriminator', fixDecoderSize(getBytesDecoder(), 8)]]);
 }
 
-export function getCancelDcaOrderInstructionDataCodec(): Codec<
+export function getCancelDcaOrderInstructionDataCodec(): FixedSizeCodec<
   CancelDcaOrderInstructionDataArgs,
   CancelDcaOrderInstructionData
 > {
-  return combineCodec(getCancelDcaOrderInstructionDataEncoder(), getCancelDcaOrderInstructionDataDecoder());
+  return combineCodec(
+    getCancelDcaOrderInstructionDataEncoder(),
+    getCancelDcaOrderInstructionDataDecoder()
+  );
 }
 
 export type CancelDcaOrderInput<
@@ -137,7 +146,7 @@ export function getCancelDcaOrderInstruction<
     TAccountGuardTokenInAccount,
     TAccountTokenInProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): CancelDcaOrderInstruction<
   TProgramAddress,
   TAccountUser,
@@ -192,7 +201,7 @@ export function getCancelDcaOrderInstruction<
 
 export type ParsedCancelDcaOrderInstruction<
   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: {
@@ -214,8 +223,13 @@ export type ParsedCancelDcaOrderInstruction<
   data: CancelDcaOrderInstructionData;
 };
 
-export function parseCancelDcaOrderInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
-  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+export function parseCancelDcaOrderInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedCancelDcaOrderInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 7) {
     // TODO: Coded error.
@@ -223,7 +237,7 @@ export function parseCancelDcaOrderInstruction<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;
   };