@shogun-sdk/intents-sdk 1.2.0 → 1.2.2

package/src/core/solana/generated/cross-chain/instructions/claimTokens.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,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,27 +42,29 @@ export function getClaimTokensDiscriminatorBytes() {
 
 export type ClaimTokensInstruction<
   TProgram extends string = typeof SOURCE_CHAIN_GUARD_PROGRAM_ADDRESS,
-  TAccountSolver extends string | IAccountMeta<string> = string,
-  TAccountOrder extends string | IAccountMeta<string> = string,
-  TAccountUser extends string | IAccountMeta<string> = string,
-  TAccountGuard extends string | IAccountMeta<string> = string,
-  TAccountIxSysvar extends string | IAccountMeta<string> = 'Sysvar1nstructions1111111111111111111111111',
-  TAccountRecoveredTokenMint extends string | IAccountMeta<string> = string,
-  TAccountSolverRecoveredTokenAccount extends string | IAccountMeta<string> = string,
-  TAccountGuardRecoveredTokenAccount extends string | IAccountMeta<string> = string,
-  TAccountRecoveredTokenProgram extends string | IAccountMeta<string> = string,
-  TAccountCollateralTokenMint extends string | IAccountMeta<string> = string,
-  TAccountSolverCollateralTokenAccount extends string | IAccountMeta<string> = string,
-  TAccountUserCollateralTokenAccount 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,
+  TAccountUser extends string | AccountMeta<string> = string,
+  TAccountGuard extends string | AccountMeta<string> = string,
+  TAccountIxSysvar extends
+    | string
+    | AccountMeta<string> = 'Sysvar1nstructions1111111111111111111111111',
+  TAccountRecoveredTokenMint extends string | AccountMeta<string> = string,
+  TAccountSolverRecoveredTokenAccount extends string | AccountMeta<string> = string,
+  TAccountGuardRecoveredTokenAccount extends string | AccountMeta<string> = string,
+  TAccountRecoveredTokenProgram extends string | AccountMeta<string> = string,
+  TAccountCollateralTokenMint extends string | AccountMeta<string> = string,
+  TAccountSolverCollateralTokenAccount extends string | AccountMeta<string> = string,
+  TAccountUserCollateralTokenAccount 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,
       TAccountUser extends string ? WritableAccount<TAccountUser> : TAccountUser,
@@ -101,24 +103,27 @@ export type ClaimTokensInstruction<
 
 export type ClaimTokensInstructionData = { discriminator: ReadonlyUint8Array };
 
-export type ClaimTokensInstructionDataArgs = {};
+export type ClaimTokensInstructionDataArgs = Object;
 
-export function getClaimTokensInstructionDataEncoder(): Encoder<ClaimTokensInstructionDataArgs> {
-  return transformEncoder(getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]), (value) => ({
-    ...value,
-    discriminator: CLAIM_TOKENS_DISCRIMINATOR,
-  }));
+export function getClaimTokensInstructionDataEncoder(): FixedSizeEncoder<ClaimTokensInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]),
+    (value) => ({ ...value, discriminator: CLAIM_TOKENS_DISCRIMINATOR })
+  );
 }
 
-export function getClaimTokensInstructionDataDecoder(): Decoder<ClaimTokensInstructionData> {
+export function getClaimTokensInstructionDataDecoder(): FixedSizeDecoder<ClaimTokensInstructionData> {
   return getStructDecoder([['discriminator', fixDecoderSize(getBytesDecoder(), 8)]]);
 }
 
-export function getClaimTokensInstructionDataCodec(): Codec<
+export function getClaimTokensInstructionDataCodec(): FixedSizeCodec<
   ClaimTokensInstructionDataArgs,
   ClaimTokensInstructionData
 > {
-  return combineCodec(getClaimTokensInstructionDataEncoder(), getClaimTokensInstructionDataDecoder());
+  return combineCodec(
+    getClaimTokensInstructionDataEncoder(),
+    getClaimTokensInstructionDataDecoder()
+  );
 }
 
 export type ClaimTokensInput<
@@ -212,7 +217,7 @@ export function getClaimTokensInstruction<
     TAccountGuardCollateralTokenAccount,
     TAccountCollateralTokenProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): ClaimTokensInstruction<
   TProgramAddress,
   TAccountSolver,
@@ -240,10 +245,7 @@ export function getClaimTokensInstruction<
     user: { value: input.user ?? null, isWritable: true },
     guard: { value: input.guard ?? null, isWritable: false },
     ixSysvar: { value: input.ixSysvar ?? null, isWritable: false },
-    recoveredTokenMint: {
-      value: input.recoveredTokenMint ?? null,
-      isWritable: false,
-    },
+    recoveredTokenMint: { value: input.recoveredTokenMint ?? null, isWritable: false },
     solverRecoveredTokenAccount: {
       value: input.solverRecoveredTokenAccount ?? null,
       isWritable: true,
@@ -252,14 +254,8 @@ export function getClaimTokensInstruction<
       value: input.guardRecoveredTokenAccount ?? null,
       isWritable: true,
     },
-    recoveredTokenProgram: {
-      value: input.recoveredTokenProgram ?? null,
-      isWritable: false,
-    },
-    collateralTokenMint: {
-      value: input.collateralTokenMint ?? null,
-      isWritable: false,
-    },
+    recoveredTokenProgram: { value: input.recoveredTokenProgram ?? null, isWritable: false },
+    collateralTokenMint: { value: input.collateralTokenMint ?? null, isWritable: false },
     solverCollateralTokenAccount: {
       value: input.solverCollateralTokenAccount ?? null,
       isWritable: true,
@@ -272,10 +268,7 @@ export function getClaimTokensInstruction<
       value: input.guardCollateralTokenAccount ?? null,
       isWritable: true,
     },
-    collateralTokenProgram: {
-      value: input.collateralTokenProgram ?? null,
-      isWritable: false,
-    },
+    collateralTokenProgram: { value: input.collateralTokenProgram ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
 
@@ -328,7 +321,7 @@ export function getClaimTokensInstruction<
 
 export type ParsedClaimTokensInstruction<
   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: {
@@ -379,8 +372,13 @@ export type ParsedClaimTokensInstruction<
   data: ClaimTokensInstructionData;
 };
 
-export function parseClaimTokensInstruction<TProgram extends string, TAccountMetas extends readonly IAccountMeta[]>(
-  instruction: IInstruction<TProgram> & IInstructionWithAccounts<TAccountMetas> & IInstructionWithData<Uint8Array>,
+export function parseClaimTokensInstruction<
+  TProgram extends string,
+  TAccountMetas extends readonly AccountMeta[],
+>(
+  instruction: Instruction<TProgram> &
+    InstructionWithAccounts<TAccountMetas> &
+    InstructionWithData<ReadonlyUint8Array>
 ): ParsedClaimTokensInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 14) {
     // TODO: Coded error.
@@ -388,7 +386,7 @@ export function parseClaimTokensInstruction<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/cross-chain/instructions/collectProtocolFees.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,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 COLLECT_PROTOCOL_FEES_DISCRIMINATOR = new Uint8Array([22, 67, 23, 98, 150, 178, 70, 220]);
+export const COLLECT_PROTOCOL_FEES_DISCRIMINATOR = new Uint8Array([
+  22, 67, 23, 98, 150, 178, 70, 220,
+]);
 
 export function getCollectProtocolFeesDiscriminatorBytes() {
   return fixEncoderSize(getBytesEncoder(), 8).encode(COLLECT_PROTOCOL_FEES_DISCRIMINATOR);
@@ -42,22 +44,24 @@ export function getCollectProtocolFeesDiscriminatorBytes() {
 
 export type CollectProtocolFeesInstruction<
   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,
-  TAccountCollateralTokenMint extends string | IAccountMeta<string> = string,
-  TAccountAdminCollateralTokenAccount 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<
+  TAccountAdmin extends string | AccountMeta<string> = string,
+  TAccountAdminSingleton extends string | AccountMeta<string> = string,
+  TAccountGuard extends string | AccountMeta<string> = string,
+  TAccountCollateralTokenMint extends string | AccountMeta<string> = string,
+  TAccountAdminCollateralTokenAccount 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<
     [
       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,
       TAccountCollateralTokenMint extends string
         ? ReadonlyAccount<TAccountCollateralTokenMint>
@@ -75,28 +79,29 @@ export type CollectProtocolFeesInstruction<
     ]
   >;
 
-export type CollectProtocolFeesInstructionData = {
-  discriminator: ReadonlyUint8Array;
-};
+export type CollectProtocolFeesInstructionData = { discriminator: ReadonlyUint8Array };
 
-export type CollectProtocolFeesInstructionDataArgs = {};
+export type CollectProtocolFeesInstructionDataArgs = Object;
 
-export function getCollectProtocolFeesInstructionDataEncoder(): Encoder<CollectProtocolFeesInstructionDataArgs> {
-  return transformEncoder(getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]), (value) => ({
-    ...value,
-    discriminator: COLLECT_PROTOCOL_FEES_DISCRIMINATOR,
-  }));
+export function getCollectProtocolFeesInstructionDataEncoder(): FixedSizeEncoder<CollectProtocolFeesInstructionDataArgs> {
+  return transformEncoder(
+    getStructEncoder([['discriminator', fixEncoderSize(getBytesEncoder(), 8)]]),
+    (value) => ({ ...value, discriminator: COLLECT_PROTOCOL_FEES_DISCRIMINATOR })
+  );
 }
 
-export function getCollectProtocolFeesInstructionDataDecoder(): Decoder<CollectProtocolFeesInstructionData> {
+export function getCollectProtocolFeesInstructionDataDecoder(): FixedSizeDecoder<CollectProtocolFeesInstructionData> {
   return getStructDecoder([['discriminator', fixDecoderSize(getBytesDecoder(), 8)]]);
 }
 
-export function getCollectProtocolFeesInstructionDataCodec(): Codec<
+export function getCollectProtocolFeesInstructionDataCodec(): FixedSizeCodec<
   CollectProtocolFeesInstructionDataArgs,
   CollectProtocolFeesInstructionData
 > {
-  return combineCodec(getCollectProtocolFeesInstructionDataEncoder(), getCollectProtocolFeesInstructionDataDecoder());
+  return combineCodec(
+    getCollectProtocolFeesInstructionDataEncoder(),
+    getCollectProtocolFeesInstructionDataDecoder()
+  );
 }
 
 export type CollectProtocolFeesAsyncInput<
@@ -116,7 +121,7 @@ export type CollectProtocolFeesAsyncInput<
   guard: Address<TAccountGuard>;
   /** Collateral token mint */
   collateralTokenMint: Address<TAccountCollateralTokenMint>;
-  /** Solver collateral account, from which solver is paying collateral tokens and fees */
+  /** Admin collateral account, to which fees will be sent */
   adminCollateralTokenAccount: Address<TAccountAdminCollateralTokenAccount>;
   /** Guard collateral account, where Guard is collecting collateral tokens */
   guardCollateralTokenAccount: Address<TAccountGuardCollateralTokenAccount>;
@@ -143,7 +148,7 @@ export async function getCollectProtocolFeesInstructionAsync<
     TAccountGuardCollateralTokenAccount,
     TAccountCollateralTokenProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): Promise<
   CollectProtocolFeesInstruction<
     TProgramAddress,
@@ -164,10 +169,7 @@ export async function getCollectProtocolFeesInstructionAsync<
     admin: { value: input.admin ?? null, isWritable: true },
     adminSingleton: { value: input.adminSingleton ?? null, isWritable: false },
     guard: { value: input.guard ?? null, isWritable: true },
-    collateralTokenMint: {
-      value: input.collateralTokenMint ?? null,
-      isWritable: false,
-    },
+    collateralTokenMint: { value: input.collateralTokenMint ?? null, isWritable: false },
     adminCollateralTokenAccount: {
       value: input.adminCollateralTokenAccount ?? null,
       isWritable: true,
@@ -176,10 +178,7 @@ export async function getCollectProtocolFeesInstructionAsync<
       value: input.guardCollateralTokenAccount ?? null,
       isWritable: true,
     },
-    collateralTokenProgram: {
-      value: input.collateralTokenProgram ?? null,
-      isWritable: false,
-    },
+    collateralTokenProgram: { value: input.collateralTokenProgram ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
 
@@ -235,7 +234,7 @@ export type CollectProtocolFeesInput<
   guard: Address<TAccountGuard>;
   /** Collateral token mint */
   collateralTokenMint: Address<TAccountCollateralTokenMint>;
-  /** Solver collateral account, from which solver is paying collateral tokens and fees */
+  /** Admin collateral account, to which fees will be sent */
   adminCollateralTokenAccount: Address<TAccountAdminCollateralTokenAccount>;
   /** Guard collateral account, where Guard is collecting collateral tokens */
   guardCollateralTokenAccount: Address<TAccountGuardCollateralTokenAccount>;
@@ -262,7 +261,7 @@ export function getCollectProtocolFeesInstruction<
     TAccountGuardCollateralTokenAccount,
     TAccountCollateralTokenProgram
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: { programAddress?: TProgramAddress }
 ): CollectProtocolFeesInstruction<
   TProgramAddress,
   TAccountAdmin,
@@ -281,10 +280,7 @@ export function getCollectProtocolFeesInstruction<
     admin: { value: input.admin ?? null, isWritable: true },
     adminSingleton: { value: input.adminSingleton ?? null, isWritable: false },
     guard: { value: input.guard ?? null, isWritable: true },
-    collateralTokenMint: {
-      value: input.collateralTokenMint ?? null,
-      isWritable: false,
-    },
+    collateralTokenMint: { value: input.collateralTokenMint ?? null, isWritable: false },
     adminCollateralTokenAccount: {
       value: input.adminCollateralTokenAccount ?? null,
       isWritable: true,
@@ -293,10 +289,7 @@ export function getCollectProtocolFeesInstruction<
       value: input.guardCollateralTokenAccount ?? null,
       isWritable: true,
     },
-    collateralTokenProgram: {
-      value: input.collateralTokenProgram ?? null,
-      isWritable: false,
-    },
+    collateralTokenProgram: { value: input.collateralTokenProgram ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<keyof typeof originalAccounts, ResolvedAccount>;
 
@@ -329,7 +322,7 @@ export function getCollectProtocolFeesInstruction<
 
 export type ParsedCollectProtocolFeesInstruction<
   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: {
@@ -341,7 +334,7 @@ export type ParsedCollectProtocolFeesInstruction<
     guard: TAccountMetas[2];
     /** Collateral token mint */
     collateralTokenMint: TAccountMetas[3];
-    /** Solver collateral account, from which solver is paying collateral tokens and fees */
+    /** Admin collateral account, to which fees will be sent */
     adminCollateralTokenAccount: TAccountMetas[4];
     /** Guard collateral account, where Guard is collecting collateral tokens */
     guardCollateralTokenAccount: TAccountMetas[5];
@@ -353,9 +346,11 @@ export type ParsedCollectProtocolFeesInstruction<
 
 export function parseCollectProtocolFeesInstruction<
   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>
 ): ParsedCollectProtocolFeesInstruction<TProgram, TAccountMetas> {
   if (instruction.accounts.length < 7) {
     // TODO: Coded error.
@@ -363,7 +358,7 @@ export function parseCollectProtocolFeesInstruction<
   }
   let accountIndex = 0;
   const getNextAccount = () => {
-    const accountMeta = instruction.accounts![accountIndex]!;
+    const accountMeta = (instruction.accounts as TAccountMetas)[accountIndex]!;
     accountIndex += 1;
     return accountMeta;
   };