@picon-finance/dlmm-sdk 2.0.2 → 2.0.4

package/src/generated/instructions/createPool.ts

@@ -36,7 +36,6 @@ import {
   type InstructionWithData,
   type ReadonlyAccount,
   type ReadonlyUint8Array,
-  type TransactionSigner,
   type WritableAccount,
   type WritableSignerAccount,
 } from "@solana/kit";
@@ -44,7 +43,11 @@ import {
   getAccountMetaFactory,
   getAddressFromResolvedInstructionAccount,
   getNonNullResolvedInstructionInput,
+  type InstructionAccountInput,
+  type InstructionAccountInputAddress,
+  type InstructionSignerInput,
   type ResolvedInstructionAccount,
+  type ResolvedInstructionAccountMeta,
 } from "@solana/program-client-core";
 import { findAdminConfigPda, findPoolPda } from "../pdas/index.js";
 import { PICON_DLMM_PROGRAM_ADDRESS } from "../programs/index.js";
@@ -164,29 +167,33 @@ export function getCreatePoolInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type CreatePoolAsyncInput<
-  TAccountAuthority extends string = string,
-  TAccountAdminConfig extends string = string,
-  TAccountTokenMintX extends string = string,
-  TAccountTokenMintY extends string = string,
-  TAccountTokenVaultX extends string = string,
-  TAccountTokenVaultY extends string = string,
-  TAccountPool extends string = string,
-  TAccountTokenProgramX extends string = string,
-  TAccountTokenProgramY extends string = string,
-  TAccountAssociatedTokenProgram extends string = string,
-  TAccountSystemProgram extends string = string,
+  TAccountAuthority extends InstructionSignerInput = InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountPool extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountAssociatedTokenProgram extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  authority: TransactionSigner<TAccountAuthority>;
-  adminConfig?: Address<TAccountAdminConfig>;
-  tokenMintX: Address<TAccountTokenMintX>;
-  tokenMintY: Address<TAccountTokenMintY>;
-  tokenVaultX?: Address<TAccountTokenVaultX>;
-  tokenVaultY?: Address<TAccountTokenVaultY>;
-  pool?: Address<TAccountPool>;
-  tokenProgramX: Address<TAccountTokenProgramX>;
-  tokenProgramY: Address<TAccountTokenProgramY>;
-  associatedTokenProgram?: Address<TAccountAssociatedTokenProgram>;
-  systemProgram?: Address<TAccountSystemProgram>;
+  authority: TAccountAuthority;
+  adminConfig?: TAccountAdminConfig;
+  tokenMintX: TAccountTokenMintX;
+  tokenMintY: TAccountTokenMintY;
+  tokenVaultX?: TAccountTokenVaultX;
+  tokenVaultY?: TAccountTokenVaultY;
+  pool?: TAccountPool;
+  tokenProgramX: TAccountTokenProgramX;
+  tokenProgramY: TAccountTokenProgramY;
+  associatedTokenProgram?: TAccountAssociatedTokenProgram;
+  systemProgram?: TAccountSystemProgram;
   binStep: CreatePoolInstructionDataArgs["binStep"];
   feeRate: CreatePoolInstructionDataArgs["feeRate"];
   protocolShare: CreatePoolInstructionDataArgs["protocolShare"];
@@ -194,17 +201,17 @@ export type CreatePoolAsyncInput<
 };
 
 export async function getCreatePoolInstructionAsync<
-  TAccountAuthority extends string,
-  TAccountAdminConfig extends string,
-  TAccountTokenMintX extends string,
-  TAccountTokenMintY extends string,
-  TAccountTokenVaultX extends string,
-  TAccountTokenVaultY extends string,
-  TAccountPool extends string,
-  TAccountTokenProgramX extends string,
-  TAccountTokenProgramY extends string,
-  TAccountAssociatedTokenProgram extends string,
-  TAccountSystemProgram extends string,
+  TAccountAuthority extends InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput,
+  TAccountPool extends InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput,
+  TAccountAssociatedTokenProgram extends InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: CreatePoolAsyncInput<
@@ -224,38 +231,111 @@ export async function getCreatePoolInstructionAsync<
 ): Promise<
   CreatePoolInstruction<
     TProgramAddress,
-    TAccountAuthority,
-    TAccountAdminConfig,
-    TAccountTokenMintX,
-    TAccountTokenMintY,
-    TAccountTokenVaultX,
-    TAccountTokenVaultY,
-    TAccountPool,
-    TAccountTokenProgramX,
-    TAccountTokenProgramY,
-    TAccountAssociatedTokenProgram,
-    TAccountSystemProgram
+    ResolvedInstructionAccountMeta<
+      TAccountAuthority,
+      InstructionAccountInputAddress<TAccountAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintX,
+      InstructionAccountInputAddress<TAccountTokenMintX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintY,
+      InstructionAccountInputAddress<TAccountTokenMintY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultX,
+      InstructionAccountInputAddress<TAccountTokenVaultX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultY,
+      InstructionAccountInputAddress<TAccountTokenVaultY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramX,
+      InstructionAccountInputAddress<TAccountTokenProgramX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramY,
+      InstructionAccountInputAddress<TAccountTokenProgramY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAssociatedTokenProgram,
+      InstructionAccountInputAddress<TAccountAssociatedTokenProgram>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountSystemProgram,
+      InstructionAccountInputAddress<TAccountSystemProgram>
+    >
   >
 > {
   // 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: true },
-    adminConfig: { value: input.adminConfig ?? null, isWritable: false },
-    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 },
-    pool: { value: input.pool ?? null, isWritable: true },
-    tokenProgramX: { value: input.tokenProgramX ?? null, isWritable: false },
-    tokenProgramY: { value: input.tokenProgramY ?? null, isWritable: false },
+    authority: {
+      value: input.authority ?? null,
+      isSigner: true,
+      isWritable: true,
+    },
+    adminConfig: {
+      value: input.adminConfig ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    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,
+    },
+    pool: { value: input.pool ?? null, isSigner: false, isWritable: true },
+    tokenProgramX: {
+      value: input.tokenProgramX ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenProgramY: {
+      value: input.tokenProgramY ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
     associatedTokenProgram: {
       value: input.associatedTokenProgram ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    systemProgram: {
+      value: input.systemProgram ?? null,
+      isSigner: false,
       isWritable: false,
     },
-    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -341,7 +421,6 @@ export async function getCreatePoolInstructionAsync<
       "11111111111111111111111111111111" as Address<"11111111111111111111111111111111">;
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("authority", accounts.authority),
@@ -362,44 +441,81 @@ export async function getCreatePoolInstructionAsync<
     programAddress,
   } as CreatePoolInstruction<
     TProgramAddress,
-    TAccountAuthority,
-    TAccountAdminConfig,
-    TAccountTokenMintX,
-    TAccountTokenMintY,
-    TAccountTokenVaultX,
-    TAccountTokenVaultY,
-    TAccountPool,
-    TAccountTokenProgramX,
-    TAccountTokenProgramY,
-    TAccountAssociatedTokenProgram,
-    TAccountSystemProgram
+    ResolvedInstructionAccountMeta<
+      TAccountAuthority,
+      InstructionAccountInputAddress<TAccountAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintX,
+      InstructionAccountInputAddress<TAccountTokenMintX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintY,
+      InstructionAccountInputAddress<TAccountTokenMintY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultX,
+      InstructionAccountInputAddress<TAccountTokenVaultX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultY,
+      InstructionAccountInputAddress<TAccountTokenVaultY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramX,
+      InstructionAccountInputAddress<TAccountTokenProgramX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramY,
+      InstructionAccountInputAddress<TAccountTokenProgramY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAssociatedTokenProgram,
+      InstructionAccountInputAddress<TAccountAssociatedTokenProgram>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountSystemProgram,
+      InstructionAccountInputAddress<TAccountSystemProgram>
+    >
   >);
 }
 
 export type CreatePoolInput<
-  TAccountAuthority extends string = string,
-  TAccountAdminConfig extends string = string,
-  TAccountTokenMintX extends string = string,
-  TAccountTokenMintY extends string = string,
-  TAccountTokenVaultX extends string = string,
-  TAccountTokenVaultY extends string = string,
-  TAccountPool extends string = string,
-  TAccountTokenProgramX extends string = string,
-  TAccountTokenProgramY extends string = string,
-  TAccountAssociatedTokenProgram extends string = string,
-  TAccountSystemProgram extends string = string,
+  TAccountAuthority extends InstructionSignerInput = InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountPool extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountAssociatedTokenProgram extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  authority: TransactionSigner<TAccountAuthority>;
-  adminConfig: Address<TAccountAdminConfig>;
-  tokenMintX: Address<TAccountTokenMintX>;
-  tokenMintY: Address<TAccountTokenMintY>;
-  tokenVaultX: Address<TAccountTokenVaultX>;
-  tokenVaultY: Address<TAccountTokenVaultY>;
-  pool: Address<TAccountPool>;
-  tokenProgramX: Address<TAccountTokenProgramX>;
-  tokenProgramY: Address<TAccountTokenProgramY>;
-  associatedTokenProgram?: Address<TAccountAssociatedTokenProgram>;
-  systemProgram?: Address<TAccountSystemProgram>;
+  authority: TAccountAuthority;
+  adminConfig: TAccountAdminConfig;
+  tokenMintX: TAccountTokenMintX;
+  tokenMintY: TAccountTokenMintY;
+  tokenVaultX: TAccountTokenVaultX;
+  tokenVaultY: TAccountTokenVaultY;
+  pool: TAccountPool;
+  tokenProgramX: TAccountTokenProgramX;
+  tokenProgramY: TAccountTokenProgramY;
+  associatedTokenProgram?: TAccountAssociatedTokenProgram;
+  systemProgram?: TAccountSystemProgram;
   binStep: CreatePoolInstructionDataArgs["binStep"];
   feeRate: CreatePoolInstructionDataArgs["feeRate"];
   protocolShare: CreatePoolInstructionDataArgs["protocolShare"];
@@ -407,17 +523,17 @@ export type CreatePoolInput<
 };
 
 export function getCreatePoolInstruction<
-  TAccountAuthority extends string,
-  TAccountAdminConfig extends string,
-  TAccountTokenMintX extends string,
-  TAccountTokenMintY extends string,
-  TAccountTokenVaultX extends string,
-  TAccountTokenVaultY extends string,
-  TAccountPool extends string,
-  TAccountTokenProgramX extends string,
-  TAccountTokenProgramY extends string,
-  TAccountAssociatedTokenProgram extends string,
-  TAccountSystemProgram extends string,
+  TAccountAuthority extends InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput,
+  TAccountPool extends InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput,
+  TAccountAssociatedTokenProgram extends InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: CreatePoolInput<
@@ -436,37 +552,110 @@ export function getCreatePoolInstruction<
   config?: { programAddress?: TProgramAddress },
 ): CreatePoolInstruction<
   TProgramAddress,
-  TAccountAuthority,
-  TAccountAdminConfig,
-  TAccountTokenMintX,
-  TAccountTokenMintY,
-  TAccountTokenVaultX,
-  TAccountTokenVaultY,
-  TAccountPool,
-  TAccountTokenProgramX,
-  TAccountTokenProgramY,
-  TAccountAssociatedTokenProgram,
-  TAccountSystemProgram
+  ResolvedInstructionAccountMeta<
+    TAccountAuthority,
+    InstructionAccountInputAddress<TAccountAuthority>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountAdminConfig,
+    InstructionAccountInputAddress<TAccountAdminConfig>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenMintX,
+    InstructionAccountInputAddress<TAccountTokenMintX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenMintY,
+    InstructionAccountInputAddress<TAccountTokenMintY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenVaultX,
+    InstructionAccountInputAddress<TAccountTokenVaultX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenVaultY,
+    InstructionAccountInputAddress<TAccountTokenVaultY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPool,
+    InstructionAccountInputAddress<TAccountPool>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenProgramX,
+    InstructionAccountInputAddress<TAccountTokenProgramX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenProgramY,
+    InstructionAccountInputAddress<TAccountTokenProgramY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountAssociatedTokenProgram,
+    InstructionAccountInputAddress<TAccountAssociatedTokenProgram>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountSystemProgram,
+    InstructionAccountInputAddress<TAccountSystemProgram>
+  >
 > {
   // 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: true },
-    adminConfig: { value: input.adminConfig ?? null, isWritable: false },
-    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 },
-    pool: { value: input.pool ?? null, isWritable: true },
-    tokenProgramX: { value: input.tokenProgramX ?? null, isWritable: false },
-    tokenProgramY: { value: input.tokenProgramY ?? null, isWritable: false },
+    authority: {
+      value: input.authority ?? null,
+      isSigner: true,
+      isWritable: true,
+    },
+    adminConfig: {
+      value: input.adminConfig ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    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,
+    },
+    pool: { value: input.pool ?? null, isSigner: false, isWritable: true },
+    tokenProgramX: {
+      value: input.tokenProgramX ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenProgramY: {
+      value: input.tokenProgramY ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
     associatedTokenProgram: {
       value: input.associatedTokenProgram ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    systemProgram: {
+      value: input.systemProgram ?? null,
+      isSigner: false,
       isWritable: false,
     },
-    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -486,7 +675,6 @@ export function getCreatePoolInstruction<
       "11111111111111111111111111111111" as Address<"11111111111111111111111111111111">;
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("authority", accounts.authority),
@@ -507,17 +695,50 @@ export function getCreatePoolInstruction<
     programAddress,
   } as CreatePoolInstruction<
     TProgramAddress,
-    TAccountAuthority,
-    TAccountAdminConfig,
-    TAccountTokenMintX,
-    TAccountTokenMintY,
-    TAccountTokenVaultX,
-    TAccountTokenVaultY,
-    TAccountPool,
-    TAccountTokenProgramX,
-    TAccountTokenProgramY,
-    TAccountAssociatedTokenProgram,
-    TAccountSystemProgram
+    ResolvedInstructionAccountMeta<
+      TAccountAuthority,
+      InstructionAccountInputAddress<TAccountAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintX,
+      InstructionAccountInputAddress<TAccountTokenMintX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintY,
+      InstructionAccountInputAddress<TAccountTokenMintY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultX,
+      InstructionAccountInputAddress<TAccountTokenVaultX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultY,
+      InstructionAccountInputAddress<TAccountTokenVaultY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramX,
+      InstructionAccountInputAddress<TAccountTokenProgramX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramY,
+      InstructionAccountInputAddress<TAccountTokenProgramY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAssociatedTokenProgram,
+      InstructionAccountInputAddress<TAccountAssociatedTokenProgram>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountSystemProgram,
+      InstructionAccountInputAddress<TAccountSystemProgram>
+    >
   >);
 }