@picon-finance/dlmm-sdk 2.0.2 → 2.0.4

package/src/generated/instructions/closePosition.ts

@@ -28,14 +28,17 @@ import {
   type InstructionWithData,
   type ReadonlyAccount,
   type ReadonlyUint8Array,
-  type TransactionSigner,
   type WritableAccount,
   type WritableSignerAccount,
 } from "@solana/kit";
 import {
   getAccountMetaFactory,
   getAddressFromResolvedInstructionAccount,
+  type InstructionAccountInput,
+  type InstructionAccountInputAddress,
+  type InstructionSignerInput,
   type ResolvedInstructionAccount,
+  type ResolvedInstructionAccountMeta,
 } from "@solana/program-client-core";
 import { findPositionPda } from "../pdas/index.js";
 import { PICON_DLMM_PROGRAM_ADDRESS } from "../programs/index.js";
@@ -113,25 +116,28 @@ export function getClosePositionInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type ClosePositionAsyncInput<
-  TAccountOwner extends string = string,
-  TAccountPosition extends string = string,
-  TAccountPositionMint extends string = string,
-  TAccountPositionTokenAccount extends string = string,
-  TAccountTokenProgram extends string = string,
+  TAccountOwner extends InstructionSignerInput = InstructionSignerInput,
+  TAccountPosition extends InstructionAccountInput = InstructionAccountInput,
+  TAccountPositionMint extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountPositionTokenAccount extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenProgram extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  owner: TransactionSigner<TAccountOwner>;
-  position?: Address<TAccountPosition>;
-  positionMint: Address<TAccountPositionMint>;
-  positionTokenAccount: Address<TAccountPositionTokenAccount>;
-  tokenProgram?: Address<TAccountTokenProgram>;
+  owner: TAccountOwner;
+  position?: TAccountPosition;
+  positionMint: TAccountPositionMint;
+  positionTokenAccount: TAccountPositionTokenAccount;
+  tokenProgram?: TAccountTokenProgram;
 };
 
 export async function getClosePositionInstructionAsync<
-  TAccountOwner extends string,
-  TAccountPosition extends string,
-  TAccountPositionMint extends string,
-  TAccountPositionTokenAccount extends string,
-  TAccountTokenProgram extends string,
+  TAccountOwner extends InstructionSignerInput,
+  TAccountPosition extends InstructionAccountInput,
+  TAccountPositionMint extends InstructionAccountInput,
+  TAccountPositionTokenAccount extends InstructionAccountInput,
+  TAccountTokenProgram extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: ClosePositionAsyncInput<
@@ -145,26 +151,57 @@ export async function getClosePositionInstructionAsync<
 ): Promise<
   ClosePositionInstruction<
     TProgramAddress,
-    TAccountOwner,
-    TAccountPosition,
-    TAccountPositionMint,
-    TAccountPositionTokenAccount,
-    TAccountTokenProgram
+    ResolvedInstructionAccountMeta<
+      TAccountOwner,
+      InstructionAccountInputAddress<TAccountOwner>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPosition,
+      InstructionAccountInputAddress<TAccountPosition>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPositionMint,
+      InstructionAccountInputAddress<TAccountPositionMint>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPositionTokenAccount,
+      InstructionAccountInputAddress<TAccountPositionTokenAccount>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgram,
+      InstructionAccountInputAddress<TAccountTokenProgram>
+    >
   >
 > {
   // Program address.
   const programAddress = config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
 
+  // Account meta helper.
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+
   // Original accounts.
   const originalAccounts = {
-    owner: { value: input.owner ?? null, isWritable: true },
-    position: { value: input.position ?? null, isWritable: true },
-    positionMint: { value: input.positionMint ?? null, isWritable: true },
+    owner: { value: input.owner ?? null, isSigner: true, isWritable: true },
+    position: {
+      value: input.position ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    positionMint: {
+      value: input.positionMint ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
     positionTokenAccount: {
       value: input.positionTokenAccount ?? null,
+      isSigner: false,
       isWritable: true,
     },
-    tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
+    tokenProgram: {
+      value: input.tokenProgram ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -188,7 +225,6 @@ export async function getClosePositionInstructionAsync<
       "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb" as Address<"TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb">;
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("owner", accounts.owner),
@@ -201,34 +237,52 @@ export async function getClosePositionInstructionAsync<
     programAddress,
   } as ClosePositionInstruction<
     TProgramAddress,
-    TAccountOwner,
-    TAccountPosition,
-    TAccountPositionMint,
-    TAccountPositionTokenAccount,
-    TAccountTokenProgram
+    ResolvedInstructionAccountMeta<
+      TAccountOwner,
+      InstructionAccountInputAddress<TAccountOwner>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPosition,
+      InstructionAccountInputAddress<TAccountPosition>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPositionMint,
+      InstructionAccountInputAddress<TAccountPositionMint>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPositionTokenAccount,
+      InstructionAccountInputAddress<TAccountPositionTokenAccount>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgram,
+      InstructionAccountInputAddress<TAccountTokenProgram>
+    >
   >);
 }
 
 export type ClosePositionInput<
-  TAccountOwner extends string = string,
-  TAccountPosition extends string = string,
-  TAccountPositionMint extends string = string,
-  TAccountPositionTokenAccount extends string = string,
-  TAccountTokenProgram extends string = string,
+  TAccountOwner extends InstructionSignerInput = InstructionSignerInput,
+  TAccountPosition extends InstructionAccountInput = InstructionAccountInput,
+  TAccountPositionMint extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountPositionTokenAccount extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenProgram extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  owner: TransactionSigner<TAccountOwner>;
-  position: Address<TAccountPosition>;
-  positionMint: Address<TAccountPositionMint>;
-  positionTokenAccount: Address<TAccountPositionTokenAccount>;
-  tokenProgram?: Address<TAccountTokenProgram>;
+  owner: TAccountOwner;
+  position: TAccountPosition;
+  positionMint: TAccountPositionMint;
+  positionTokenAccount: TAccountPositionTokenAccount;
+  tokenProgram?: TAccountTokenProgram;
 };
 
 export function getClosePositionInstruction<
-  TAccountOwner extends string,
-  TAccountPosition extends string,
-  TAccountPositionMint extends string,
-  TAccountPositionTokenAccount extends string,
-  TAccountTokenProgram extends string,
+  TAccountOwner extends InstructionSignerInput,
+  TAccountPosition extends InstructionAccountInput,
+  TAccountPositionMint extends InstructionAccountInput,
+  TAccountPositionTokenAccount extends InstructionAccountInput,
+  TAccountTokenProgram extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: ClosePositionInput<
@@ -241,25 +295,56 @@ export function getClosePositionInstruction<
   config?: { programAddress?: TProgramAddress },
 ): ClosePositionInstruction<
   TProgramAddress,
-  TAccountOwner,
-  TAccountPosition,
-  TAccountPositionMint,
-  TAccountPositionTokenAccount,
-  TAccountTokenProgram
+  ResolvedInstructionAccountMeta<
+    TAccountOwner,
+    InstructionAccountInputAddress<TAccountOwner>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPosition,
+    InstructionAccountInputAddress<TAccountPosition>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPositionMint,
+    InstructionAccountInputAddress<TAccountPositionMint>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPositionTokenAccount,
+    InstructionAccountInputAddress<TAccountPositionTokenAccount>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenProgram,
+    InstructionAccountInputAddress<TAccountTokenProgram>
+  >
 > {
   // Program address.
   const programAddress = config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
 
+  // Account meta helper.
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+
   // Original accounts.
   const originalAccounts = {
-    owner: { value: input.owner ?? null, isWritable: true },
-    position: { value: input.position ?? null, isWritable: true },
-    positionMint: { value: input.positionMint ?? null, isWritable: true },
+    owner: { value: input.owner ?? null, isSigner: true, isWritable: true },
+    position: {
+      value: input.position ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    positionMint: {
+      value: input.positionMint ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
     positionTokenAccount: {
       value: input.positionTokenAccount ?? null,
+      isSigner: false,
       isWritable: true,
     },
-    tokenProgram: { value: input.tokenProgram ?? null, isWritable: false },
+    tokenProgram: {
+      value: input.tokenProgram ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -272,7 +357,6 @@ export function getClosePositionInstruction<
       "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb" as Address<"TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb">;
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("owner", accounts.owner),
@@ -285,11 +369,26 @@ export function getClosePositionInstruction<
     programAddress,
   } as ClosePositionInstruction<
     TProgramAddress,
-    TAccountOwner,
-    TAccountPosition,
-    TAccountPositionMint,
-    TAccountPositionTokenAccount,
-    TAccountTokenProgram
+    ResolvedInstructionAccountMeta<
+      TAccountOwner,
+      InstructionAccountInputAddress<TAccountOwner>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPosition,
+      InstructionAccountInputAddress<TAccountPosition>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPositionMint,
+      InstructionAccountInputAddress<TAccountPositionMint>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPositionTokenAccount,
+      InstructionAccountInputAddress<TAccountPositionTokenAccount>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgram,
+      InstructionAccountInputAddress<TAccountTokenProgram>
+    >
   >);
 }
 

package/src/generated/instructions/createAdminConfig.ts

@@ -28,13 +28,16 @@ import {
   type InstructionWithData,
   type ReadonlyAccount,
   type ReadonlyUint8Array,
-  type TransactionSigner,
   type WritableAccount,
   type WritableSignerAccount,
 } 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";
@@ -112,25 +115,26 @@ export function getCreateAdminConfigInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type CreateAdminConfigAsyncInput<
-  TAccountDeployer extends string = string,
-  TAccountAdminConfig extends string = string,
-  TAccountProgram extends string = string,
-  TAccountProgramData extends string = string,
-  TAccountSystemProgram extends string = string,
+  TAccountDeployer extends InstructionSignerInput = InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput = InstructionAccountInput,
+  TAccountProgram extends InstructionAccountInput = InstructionAccountInput,
+  TAccountProgramData extends InstructionAccountInput = InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  deployer: TransactionSigner<TAccountDeployer>;
-  adminConfig?: Address<TAccountAdminConfig>;
-  program?: Address<TAccountProgram>;
-  programData: Address<TAccountProgramData>;
-  systemProgram?: Address<TAccountSystemProgram>;
+  deployer: TAccountDeployer;
+  adminConfig?: TAccountAdminConfig;
+  program?: TAccountProgram;
+  programData: TAccountProgramData;
+  systemProgram?: TAccountSystemProgram;
 };
 
 export async function getCreateAdminConfigInstructionAsync<
-  TAccountDeployer extends string,
-  TAccountAdminConfig extends string,
-  TAccountProgram extends string,
-  TAccountProgramData extends string,
-  TAccountSystemProgram extends string,
+  TAccountDeployer extends InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput,
+  TAccountProgram extends InstructionAccountInput,
+  TAccountProgramData extends InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: CreateAdminConfigAsyncInput<
@@ -144,23 +148,61 @@ export async function getCreateAdminConfigInstructionAsync<
 ): Promise<
   CreateAdminConfigInstruction<
     TProgramAddress,
-    TAccountDeployer,
-    TAccountAdminConfig,
-    TAccountProgram,
-    TAccountProgramData,
-    TAccountSystemProgram
+    ResolvedInstructionAccountMeta<
+      TAccountDeployer,
+      InstructionAccountInputAddress<TAccountDeployer>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountProgram,
+      InstructionAccountInputAddress<TAccountProgram>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountProgramData,
+      InstructionAccountInputAddress<TAccountProgramData>
+    >,
+    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 = {
-    deployer: { value: input.deployer ?? null, isWritable: true },
-    adminConfig: { value: input.adminConfig ?? null, isWritable: true },
-    program: { value: input.program ?? null, isWritable: false },
-    programData: { value: input.programData ?? null, isWritable: false },
-    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+    deployer: {
+      value: input.deployer ?? null,
+      isSigner: true,
+      isWritable: true,
+    },
+    adminConfig: {
+      value: input.adminConfig ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    program: {
+      value: input.program ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    programData: {
+      value: input.programData ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    systemProgram: {
+      value: input.systemProgram ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -180,7 +222,6 @@ export async function getCreateAdminConfigInstructionAsync<
       "11111111111111111111111111111111" as Address<"11111111111111111111111111111111">;
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("deployer", accounts.deployer),
@@ -193,34 +234,50 @@ export async function getCreateAdminConfigInstructionAsync<
     programAddress,
   } as CreateAdminConfigInstruction<
     TProgramAddress,
-    TAccountDeployer,
-    TAccountAdminConfig,
-    TAccountProgram,
-    TAccountProgramData,
-    TAccountSystemProgram
+    ResolvedInstructionAccountMeta<
+      TAccountDeployer,
+      InstructionAccountInputAddress<TAccountDeployer>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountProgram,
+      InstructionAccountInputAddress<TAccountProgram>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountProgramData,
+      InstructionAccountInputAddress<TAccountProgramData>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountSystemProgram,
+      InstructionAccountInputAddress<TAccountSystemProgram>
+    >
   >);
 }
 
 export type CreateAdminConfigInput<
-  TAccountDeployer extends string = string,
-  TAccountAdminConfig extends string = string,
-  TAccountProgram extends string = string,
-  TAccountProgramData extends string = string,
-  TAccountSystemProgram extends string = string,
+  TAccountDeployer extends InstructionSignerInput = InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput = InstructionAccountInput,
+  TAccountProgram extends InstructionAccountInput = InstructionAccountInput,
+  TAccountProgramData extends InstructionAccountInput = InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  deployer: TransactionSigner<TAccountDeployer>;
-  adminConfig: Address<TAccountAdminConfig>;
-  program?: Address<TAccountProgram>;
-  programData: Address<TAccountProgramData>;
-  systemProgram?: Address<TAccountSystemProgram>;
+  deployer: TAccountDeployer;
+  adminConfig: TAccountAdminConfig;
+  program?: TAccountProgram;
+  programData: TAccountProgramData;
+  systemProgram?: TAccountSystemProgram;
 };
 
 export function getCreateAdminConfigInstruction<
-  TAccountDeployer extends string,
-  TAccountAdminConfig extends string,
-  TAccountProgram extends string,
-  TAccountProgramData extends string,
-  TAccountSystemProgram extends string,
+  TAccountDeployer extends InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput,
+  TAccountProgram extends InstructionAccountInput,
+  TAccountProgramData extends InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: CreateAdminConfigInput<
@@ -233,22 +290,60 @@ export function getCreateAdminConfigInstruction<
   config?: { programAddress?: TProgramAddress },
 ): CreateAdminConfigInstruction<
   TProgramAddress,
-  TAccountDeployer,
-  TAccountAdminConfig,
-  TAccountProgram,
-  TAccountProgramData,
-  TAccountSystemProgram
+  ResolvedInstructionAccountMeta<
+    TAccountDeployer,
+    InstructionAccountInputAddress<TAccountDeployer>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountAdminConfig,
+    InstructionAccountInputAddress<TAccountAdminConfig>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountProgram,
+    InstructionAccountInputAddress<TAccountProgram>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountProgramData,
+    InstructionAccountInputAddress<TAccountProgramData>
+  >,
+  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 = {
-    deployer: { value: input.deployer ?? null, isWritable: true },
-    adminConfig: { value: input.adminConfig ?? null, isWritable: true },
-    program: { value: input.program ?? null, isWritable: false },
-    programData: { value: input.programData ?? null, isWritable: false },
-    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+    deployer: {
+      value: input.deployer ?? null,
+      isSigner: true,
+      isWritable: true,
+    },
+    adminConfig: {
+      value: input.adminConfig ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    program: {
+      value: input.program ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    programData: {
+      value: input.programData ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    systemProgram: {
+      value: input.systemProgram ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -265,7 +360,6 @@ export function getCreateAdminConfigInstruction<
       "11111111111111111111111111111111" as Address<"11111111111111111111111111111111">;
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("deployer", accounts.deployer),
@@ -278,11 +372,26 @@ export function getCreateAdminConfigInstruction<
     programAddress,
   } as CreateAdminConfigInstruction<
     TProgramAddress,
-    TAccountDeployer,
-    TAccountAdminConfig,
-    TAccountProgram,
-    TAccountProgramData,
-    TAccountSystemProgram
+    ResolvedInstructionAccountMeta<
+      TAccountDeployer,
+      InstructionAccountInputAddress<TAccountDeployer>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountProgram,
+      InstructionAccountInputAddress<TAccountProgram>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountProgramData,
+      InstructionAccountInputAddress<TAccountProgramData>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountSystemProgram,
+      InstructionAccountInputAddress<TAccountSystemProgram>
+    >
   >);
 }