@picon-finance/dlmm-sdk 2.0.2 → 2.0.4

package/src/generated/instructions/claimProtocolFee.ts

@@ -33,12 +33,15 @@ import {
   type ReadonlyAccount,
   type ReadonlySignerAccount,
   type ReadonlyUint8Array,
-  type TransactionSigner,
   type WritableAccount,
 } from "@solana/kit";
 import {
   getAccountMetaFactory,
+  type InstructionAccountInput,
+  type InstructionAccountInputAddress,
+  type InstructionSignerInput,
   type ResolvedInstructionAccount,
+  type ResolvedInstructionAccountMeta,
 } from "@solana/program-client-core";
 import { findAdminConfigPda } from "../pdas/index.js";
 import { PICON_DLMM_PROGRAM_ADDRESS } from "../programs/index.js";
@@ -157,44 +160,48 @@ export function getClaimProtocolFeeInstructionDataCodec(): Codec<
 }
 
 export type ClaimProtocolFeeAsyncInput<
-  TAccountAuthority extends string = string,
-  TAccountAdminConfig extends string = string,
-  TAccountPool extends string = string,
-  TAccountTokenMintX extends string = string,
-  TAccountTokenMintY extends string = string,
-  TAccountTokenVaultX extends string = string,
-  TAccountTokenVaultY extends string = string,
-  TAccountTokenAdminAccountX extends string = string,
-  TAccountTokenAdminAccountY extends string = string,
-  TAccountTokenProgramX extends string = string,
-  TAccountTokenProgramY extends string = string,
+  TAccountAuthority extends InstructionSignerInput = InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput = InstructionAccountInput,
+  TAccountPool extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenAdminAccountX extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenAdminAccountY extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  authority: TransactionSigner<TAccountAuthority>;
-  adminConfig?: Address<TAccountAdminConfig>;
-  pool: Address<TAccountPool>;
-  tokenMintX: Address<TAccountTokenMintX>;
-  tokenMintY: Address<TAccountTokenMintY>;
-  tokenVaultX: Address<TAccountTokenVaultX>;
-  tokenVaultY: Address<TAccountTokenVaultY>;
-  tokenAdminAccountX: Address<TAccountTokenAdminAccountX>;
-  tokenAdminAccountY: Address<TAccountTokenAdminAccountY>;
-  tokenProgramX: Address<TAccountTokenProgramX>;
-  tokenProgramY: Address<TAccountTokenProgramY>;
+  authority: TAccountAuthority;
+  adminConfig?: TAccountAdminConfig;
+  pool: TAccountPool;
+  tokenMintX: TAccountTokenMintX;
+  tokenMintY: TAccountTokenMintY;
+  tokenVaultX: TAccountTokenVaultX;
+  tokenVaultY: TAccountTokenVaultY;
+  tokenAdminAccountX: TAccountTokenAdminAccountX;
+  tokenAdminAccountY: TAccountTokenAdminAccountY;
+  tokenProgramX: TAccountTokenProgramX;
+  tokenProgramY: TAccountTokenProgramY;
   remainingAccountsScheme: ClaimProtocolFeeInstructionDataArgs["remainingAccountsScheme"];
 };
 
 export async function getClaimProtocolFeeInstructionAsync<
-  TAccountAuthority extends string,
-  TAccountAdminConfig extends string,
-  TAccountPool extends string,
-  TAccountTokenMintX extends string,
-  TAccountTokenMintY extends string,
-  TAccountTokenVaultX extends string,
-  TAccountTokenVaultY extends string,
-  TAccountTokenAdminAccountX extends string,
-  TAccountTokenAdminAccountY extends string,
-  TAccountTokenProgramX extends string,
-  TAccountTokenProgramY extends string,
+  TAccountAuthority extends InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput,
+  TAccountPool extends InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput,
+  TAccountTokenAdminAccountX extends InstructionAccountInput,
+  TAccountTokenAdminAccountY extends InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: ClaimProtocolFeeAsyncInput<
@@ -214,41 +221,111 @@ export async function getClaimProtocolFeeInstructionAsync<
 ): Promise<
   ClaimProtocolFeeInstruction<
     TProgramAddress,
-    TAccountAuthority,
-    TAccountAdminConfig,
-    TAccountPool,
-    TAccountTokenMintX,
-    TAccountTokenMintY,
-    TAccountTokenVaultX,
-    TAccountTokenVaultY,
-    TAccountTokenAdminAccountX,
-    TAccountTokenAdminAccountY,
-    TAccountTokenProgramX,
-    TAccountTokenProgramY
+    ResolvedInstructionAccountMeta<
+      TAccountAuthority,
+      InstructionAccountInputAddress<TAccountAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintX,
+      InstructionAccountInputAddress<TAccountTokenMintX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintY,
+      InstructionAccountInputAddress<TAccountTokenMintY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultX,
+      InstructionAccountInputAddress<TAccountTokenVaultX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultY,
+      InstructionAccountInputAddress<TAccountTokenVaultY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenAdminAccountX,
+      InstructionAccountInputAddress<TAccountTokenAdminAccountX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenAdminAccountY,
+      InstructionAccountInputAddress<TAccountTokenAdminAccountY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramX,
+      InstructionAccountInputAddress<TAccountTokenProgramX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramY,
+      InstructionAccountInputAddress<TAccountTokenProgramY>
+    >
   >
 > {
   // Program address.
   const programAddress = config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
 
+  // Account meta helper.
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+
   // Original accounts.
   const originalAccounts = {
-    authority: { value: input.authority ?? null, isWritable: false },
-    adminConfig: { value: input.adminConfig ?? null, isWritable: false },
-    pool: { value: input.pool ?? null, isWritable: true },
-    tokenMintX: { value: input.tokenMintX ?? null, isWritable: false },
-    tokenMintY: { value: input.tokenMintY ?? null, isWritable: false },
-    tokenVaultX: { value: input.tokenVaultX ?? null, isWritable: true },
-    tokenVaultY: { value: input.tokenVaultY ?? null, isWritable: true },
+    authority: {
+      value: input.authority ?? null,
+      isSigner: true,
+      isWritable: false,
+    },
+    adminConfig: {
+      value: input.adminConfig ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    pool: { value: input.pool ?? null, isSigner: false, isWritable: true },
+    tokenMintX: {
+      value: input.tokenMintX ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenMintY: {
+      value: input.tokenMintY ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenVaultX: {
+      value: input.tokenVaultX ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    tokenVaultY: {
+      value: input.tokenVaultY ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
     tokenAdminAccountX: {
       value: input.tokenAdminAccountX ?? null,
+      isSigner: false,
       isWritable: true,
     },
     tokenAdminAccountY: {
       value: input.tokenAdminAccountY ?? null,
+      isSigner: false,
       isWritable: true,
     },
-    tokenProgramX: { value: input.tokenProgramX ?? null, isWritable: false },
-    tokenProgramY: { value: input.tokenProgramY ?? null, isWritable: false },
+    tokenProgramX: {
+      value: input.tokenProgramX ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenProgramY: {
+      value: input.tokenProgramY ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -263,7 +340,6 @@ export async function getClaimProtocolFeeInstructionAsync<
     accounts.adminConfig.value = await findAdminConfigPda({ programAddress });
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("authority", accounts.authority),
@@ -284,59 +360,96 @@ export async function getClaimProtocolFeeInstructionAsync<
     programAddress,
   } as ClaimProtocolFeeInstruction<
     TProgramAddress,
-    TAccountAuthority,
-    TAccountAdminConfig,
-    TAccountPool,
-    TAccountTokenMintX,
-    TAccountTokenMintY,
-    TAccountTokenVaultX,
-    TAccountTokenVaultY,
-    TAccountTokenAdminAccountX,
-    TAccountTokenAdminAccountY,
-    TAccountTokenProgramX,
-    TAccountTokenProgramY
+    ResolvedInstructionAccountMeta<
+      TAccountAuthority,
+      InstructionAccountInputAddress<TAccountAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintX,
+      InstructionAccountInputAddress<TAccountTokenMintX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintY,
+      InstructionAccountInputAddress<TAccountTokenMintY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultX,
+      InstructionAccountInputAddress<TAccountTokenVaultX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultY,
+      InstructionAccountInputAddress<TAccountTokenVaultY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenAdminAccountX,
+      InstructionAccountInputAddress<TAccountTokenAdminAccountX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenAdminAccountY,
+      InstructionAccountInputAddress<TAccountTokenAdminAccountY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramX,
+      InstructionAccountInputAddress<TAccountTokenProgramX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramY,
+      InstructionAccountInputAddress<TAccountTokenProgramY>
+    >
   >);
 }
 
 export type ClaimProtocolFeeInput<
-  TAccountAuthority extends string = string,
-  TAccountAdminConfig extends string = string,
-  TAccountPool extends string = string,
-  TAccountTokenMintX extends string = string,
-  TAccountTokenMintY extends string = string,
-  TAccountTokenVaultX extends string = string,
-  TAccountTokenVaultY extends string = string,
-  TAccountTokenAdminAccountX extends string = string,
-  TAccountTokenAdminAccountY extends string = string,
-  TAccountTokenProgramX extends string = string,
-  TAccountTokenProgramY extends string = string,
+  TAccountAuthority extends InstructionSignerInput = InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput = InstructionAccountInput,
+  TAccountPool extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenAdminAccountX extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenAdminAccountY extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  authority: TransactionSigner<TAccountAuthority>;
-  adminConfig: Address<TAccountAdminConfig>;
-  pool: Address<TAccountPool>;
-  tokenMintX: Address<TAccountTokenMintX>;
-  tokenMintY: Address<TAccountTokenMintY>;
-  tokenVaultX: Address<TAccountTokenVaultX>;
-  tokenVaultY: Address<TAccountTokenVaultY>;
-  tokenAdminAccountX: Address<TAccountTokenAdminAccountX>;
-  tokenAdminAccountY: Address<TAccountTokenAdminAccountY>;
-  tokenProgramX: Address<TAccountTokenProgramX>;
-  tokenProgramY: Address<TAccountTokenProgramY>;
+  authority: TAccountAuthority;
+  adminConfig: TAccountAdminConfig;
+  pool: TAccountPool;
+  tokenMintX: TAccountTokenMintX;
+  tokenMintY: TAccountTokenMintY;
+  tokenVaultX: TAccountTokenVaultX;
+  tokenVaultY: TAccountTokenVaultY;
+  tokenAdminAccountX: TAccountTokenAdminAccountX;
+  tokenAdminAccountY: TAccountTokenAdminAccountY;
+  tokenProgramX: TAccountTokenProgramX;
+  tokenProgramY: TAccountTokenProgramY;
   remainingAccountsScheme: ClaimProtocolFeeInstructionDataArgs["remainingAccountsScheme"];
 };
 
 export function getClaimProtocolFeeInstruction<
-  TAccountAuthority extends string,
-  TAccountAdminConfig extends string,
-  TAccountPool extends string,
-  TAccountTokenMintX extends string,
-  TAccountTokenMintY extends string,
-  TAccountTokenVaultX extends string,
-  TAccountTokenVaultY extends string,
-  TAccountTokenAdminAccountX extends string,
-  TAccountTokenAdminAccountY extends string,
-  TAccountTokenProgramX extends string,
-  TAccountTokenProgramY extends string,
+  TAccountAuthority extends InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput,
+  TAccountPool extends InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput,
+  TAccountTokenAdminAccountX extends InstructionAccountInput,
+  TAccountTokenAdminAccountY extends InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: ClaimProtocolFeeInput<
@@ -355,40 +468,110 @@ export function getClaimProtocolFeeInstruction<
   config?: { programAddress?: TProgramAddress },
 ): ClaimProtocolFeeInstruction<
   TProgramAddress,
-  TAccountAuthority,
-  TAccountAdminConfig,
-  TAccountPool,
-  TAccountTokenMintX,
-  TAccountTokenMintY,
-  TAccountTokenVaultX,
-  TAccountTokenVaultY,
-  TAccountTokenAdminAccountX,
-  TAccountTokenAdminAccountY,
-  TAccountTokenProgramX,
-  TAccountTokenProgramY
+  ResolvedInstructionAccountMeta<
+    TAccountAuthority,
+    InstructionAccountInputAddress<TAccountAuthority>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountAdminConfig,
+    InstructionAccountInputAddress<TAccountAdminConfig>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPool,
+    InstructionAccountInputAddress<TAccountPool>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenMintX,
+    InstructionAccountInputAddress<TAccountTokenMintX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenMintY,
+    InstructionAccountInputAddress<TAccountTokenMintY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenVaultX,
+    InstructionAccountInputAddress<TAccountTokenVaultX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenVaultY,
+    InstructionAccountInputAddress<TAccountTokenVaultY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenAdminAccountX,
+    InstructionAccountInputAddress<TAccountTokenAdminAccountX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenAdminAccountY,
+    InstructionAccountInputAddress<TAccountTokenAdminAccountY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenProgramX,
+    InstructionAccountInputAddress<TAccountTokenProgramX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenProgramY,
+    InstructionAccountInputAddress<TAccountTokenProgramY>
+  >
 > {
   // Program address.
   const programAddress = config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
 
+  // Account meta helper.
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+
   // Original accounts.
   const originalAccounts = {
-    authority: { value: input.authority ?? null, isWritable: false },
-    adminConfig: { value: input.adminConfig ?? null, isWritable: false },
-    pool: { value: input.pool ?? null, isWritable: true },
-    tokenMintX: { value: input.tokenMintX ?? null, isWritable: false },
-    tokenMintY: { value: input.tokenMintY ?? null, isWritable: false },
-    tokenVaultX: { value: input.tokenVaultX ?? null, isWritable: true },
-    tokenVaultY: { value: input.tokenVaultY ?? null, isWritable: true },
+    authority: {
+      value: input.authority ?? null,
+      isSigner: true,
+      isWritable: false,
+    },
+    adminConfig: {
+      value: input.adminConfig ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    pool: { value: input.pool ?? null, isSigner: false, isWritable: true },
+    tokenMintX: {
+      value: input.tokenMintX ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenMintY: {
+      value: input.tokenMintY ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenVaultX: {
+      value: input.tokenVaultX ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    tokenVaultY: {
+      value: input.tokenVaultY ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
     tokenAdminAccountX: {
       value: input.tokenAdminAccountX ?? null,
+      isSigner: false,
       isWritable: true,
     },
     tokenAdminAccountY: {
       value: input.tokenAdminAccountY ?? null,
+      isSigner: false,
       isWritable: true,
     },
-    tokenProgramX: { value: input.tokenProgramX ?? null, isWritable: false },
-    tokenProgramY: { value: input.tokenProgramY ?? null, isWritable: false },
+    tokenProgramX: {
+      value: input.tokenProgramX ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenProgramY: {
+      value: input.tokenProgramY ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -398,7 +581,6 @@ export function getClaimProtocolFeeInstruction<
   // Original args.
   const args = { ...input };
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("authority", accounts.authority),
@@ -419,17 +601,50 @@ export function getClaimProtocolFeeInstruction<
     programAddress,
   } as ClaimProtocolFeeInstruction<
     TProgramAddress,
-    TAccountAuthority,
-    TAccountAdminConfig,
-    TAccountPool,
-    TAccountTokenMintX,
-    TAccountTokenMintY,
-    TAccountTokenVaultX,
-    TAccountTokenVaultY,
-    TAccountTokenAdminAccountX,
-    TAccountTokenAdminAccountY,
-    TAccountTokenProgramX,
-    TAccountTokenProgramY
+    ResolvedInstructionAccountMeta<
+      TAccountAuthority,
+      InstructionAccountInputAddress<TAccountAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintX,
+      InstructionAccountInputAddress<TAccountTokenMintX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintY,
+      InstructionAccountInputAddress<TAccountTokenMintY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultX,
+      InstructionAccountInputAddress<TAccountTokenVaultX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultY,
+      InstructionAccountInputAddress<TAccountTokenVaultY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenAdminAccountX,
+      InstructionAccountInputAddress<TAccountTokenAdminAccountX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenAdminAccountY,
+      InstructionAccountInputAddress<TAccountTokenAdminAccountY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramX,
+      InstructionAccountInputAddress<TAccountTokenProgramX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramY,
+      InstructionAccountInputAddress<TAccountTokenProgramY>
+    >
   >);
 }