@picon-finance/dlmm-sdk 2.0.2 → 2.0.4

package/src/generated/instructions/swapExactOut.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 { PICON_DLMM_PROGRAM_ADDRESS } from "../programs/index.js";
 import {
@@ -158,27 +161,31 @@ export function getSwapExactOutInstructionDataCodec(): Codec<
 }
 
 export type SwapExactOutInput<
-  TAccountUser extends string = string,
-  TAccountPool extends string = string,
-  TAccountTokenMintX extends string = string,
-  TAccountTokenMintY extends string = string,
-  TAccountTokenUserAccountX extends string = string,
-  TAccountTokenUserAccountY extends string = string,
-  TAccountTokenVaultX extends string = string,
-  TAccountTokenVaultY extends string = string,
-  TAccountTokenProgramX extends string = string,
-  TAccountTokenProgramY extends string = string,
+  TAccountUser extends InstructionSignerInput = InstructionSignerInput,
+  TAccountPool extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenUserAccountX extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenUserAccountY extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  user: TransactionSigner<TAccountUser>;
-  pool: Address<TAccountPool>;
-  tokenMintX: Address<TAccountTokenMintX>;
-  tokenMintY: Address<TAccountTokenMintY>;
-  tokenUserAccountX: Address<TAccountTokenUserAccountX>;
-  tokenUserAccountY: Address<TAccountTokenUserAccountY>;
-  tokenVaultX: Address<TAccountTokenVaultX>;
-  tokenVaultY: Address<TAccountTokenVaultY>;
-  tokenProgramX: Address<TAccountTokenProgramX>;
-  tokenProgramY: Address<TAccountTokenProgramY>;
+  user: TAccountUser;
+  pool: TAccountPool;
+  tokenMintX: TAccountTokenMintX;
+  tokenMintY: TAccountTokenMintY;
+  tokenUserAccountX: TAccountTokenUserAccountX;
+  tokenUserAccountY: TAccountTokenUserAccountY;
+  tokenVaultX: TAccountTokenVaultX;
+  tokenVaultY: TAccountTokenVaultY;
+  tokenProgramX: TAccountTokenProgramX;
+  tokenProgramY: TAccountTokenProgramY;
   amountOut: SwapExactOutInstructionDataArgs["amountOut"];
   maxAmountIn: SwapExactOutInstructionDataArgs["maxAmountIn"];
   xToY: SwapExactOutInstructionDataArgs["xToY"];
@@ -186,16 +193,16 @@ export type SwapExactOutInput<
 };
 
 export function getSwapExactOutInstruction<
-  TAccountUser extends string,
-  TAccountPool extends string,
-  TAccountTokenMintX extends string,
-  TAccountTokenMintY extends string,
-  TAccountTokenUserAccountX extends string,
-  TAccountTokenUserAccountY extends string,
-  TAccountTokenVaultX extends string,
-  TAccountTokenVaultY extends string,
-  TAccountTokenProgramX extends string,
-  TAccountTokenProgramY extends string,
+  TAccountUser extends InstructionSignerInput,
+  TAccountPool extends InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput,
+  TAccountTokenUserAccountX extends InstructionAccountInput,
+  TAccountTokenUserAccountY extends InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: SwapExactOutInput<
@@ -213,38 +220,97 @@ export function getSwapExactOutInstruction<
   config?: { programAddress?: TProgramAddress },
 ): SwapExactOutInstruction<
   TProgramAddress,
-  TAccountUser,
-  TAccountPool,
-  TAccountTokenMintX,
-  TAccountTokenMintY,
-  TAccountTokenUserAccountX,
-  TAccountTokenUserAccountY,
-  TAccountTokenVaultX,
-  TAccountTokenVaultY,
-  TAccountTokenProgramX,
-  TAccountTokenProgramY
+  ResolvedInstructionAccountMeta<
+    TAccountUser,
+    InstructionAccountInputAddress<TAccountUser>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPool,
+    InstructionAccountInputAddress<TAccountPool>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenMintX,
+    InstructionAccountInputAddress<TAccountTokenMintX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenMintY,
+    InstructionAccountInputAddress<TAccountTokenMintY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenUserAccountX,
+    InstructionAccountInputAddress<TAccountTokenUserAccountX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenUserAccountY,
+    InstructionAccountInputAddress<TAccountTokenUserAccountY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenVaultX,
+    InstructionAccountInputAddress<TAccountTokenVaultX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenVaultY,
+    InstructionAccountInputAddress<TAccountTokenVaultY>
+  >,
+  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 = {
-    user: { value: input.user ?? null, isWritable: false },
-    pool: { value: input.pool ?? null, isWritable: true },
-    tokenMintX: { value: input.tokenMintX ?? null, isWritable: false },
-    tokenMintY: { value: input.tokenMintY ?? null, isWritable: false },
+    user: { value: input.user ?? null, isSigner: true, 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,
+    },
     tokenUserAccountX: {
       value: input.tokenUserAccountX ?? null,
+      isSigner: false,
       isWritable: true,
     },
     tokenUserAccountY: {
       value: input.tokenUserAccountY ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    tokenVaultX: {
+      value: input.tokenVaultX ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    tokenVaultY: {
+      value: input.tokenVaultY ?? null,
+      isSigner: false,
       isWritable: true,
     },
-    tokenVaultX: { value: input.tokenVaultX ?? null, isWritable: true },
-    tokenVaultY: { value: input.tokenVaultY ?? null, 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,
@@ -254,7 +320,6 @@ export function getSwapExactOutInstruction<
   // Original args.
   const args = { ...input };
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("user", accounts.user),
@@ -274,16 +339,46 @@ export function getSwapExactOutInstruction<
     programAddress,
   } as SwapExactOutInstruction<
     TProgramAddress,
-    TAccountUser,
-    TAccountPool,
-    TAccountTokenMintX,
-    TAccountTokenMintY,
-    TAccountTokenUserAccountX,
-    TAccountTokenUserAccountY,
-    TAccountTokenVaultX,
-    TAccountTokenVaultY,
-    TAccountTokenProgramX,
-    TAccountTokenProgramY
+    ResolvedInstructionAccountMeta<
+      TAccountUser,
+      InstructionAccountInputAddress<TAccountUser>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintX,
+      InstructionAccountInputAddress<TAccountTokenMintX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintY,
+      InstructionAccountInputAddress<TAccountTokenMintY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenUserAccountX,
+      InstructionAccountInputAddress<TAccountTokenUserAccountX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenUserAccountY,
+      InstructionAccountInputAddress<TAccountTokenUserAccountY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultX,
+      InstructionAccountInputAddress<TAccountTokenVaultX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultY,
+      InstructionAccountInputAddress<TAccountTokenVaultY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramX,
+      InstructionAccountInputAddress<TAccountTokenProgramX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramY,
+      InstructionAccountInputAddress<TAccountTokenProgramY>
+    >
   >);
 }
 

package/src/generated/instructions/syncPool.ts

@@ -30,12 +30,15 @@ import {
   type InstructionWithData,
   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 { PICON_DLMM_PROGRAM_ADDRESS } from "../programs/index.js";
 import {
@@ -113,30 +116,43 @@ export function getSyncPoolInstructionDataCodec(): Codec<
 }
 
 export type SyncPoolInput<
-  TAccountUser extends string = string,
-  TAccountPool extends string = string,
+  TAccountUser extends InstructionSignerInput = InstructionSignerInput,
+  TAccountPool extends InstructionAccountInput = InstructionAccountInput,
 > = {
-  user: TransactionSigner<TAccountUser>;
-  pool: Address<TAccountPool>;
+  user: TAccountUser;
+  pool: TAccountPool;
   desiredBinId: SyncPoolInstructionDataArgs["desiredBinId"];
   remainingAccountsScheme: SyncPoolInstructionDataArgs["remainingAccountsScheme"];
 };
 
 export function getSyncPoolInstruction<
-  TAccountUser extends string,
-  TAccountPool extends string,
+  TAccountUser extends InstructionSignerInput,
+  TAccountPool extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: SyncPoolInput<TAccountUser, TAccountPool>,
   config?: { programAddress?: TProgramAddress },
-): SyncPoolInstruction<TProgramAddress, TAccountUser, TAccountPool> {
+): SyncPoolInstruction<
+  TProgramAddress,
+  ResolvedInstructionAccountMeta<
+    TAccountUser,
+    InstructionAccountInputAddress<TAccountUser>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPool,
+    InstructionAccountInputAddress<TAccountPool>
+  >
+> {
   // Program address.
   const programAddress = config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
 
+  // Account meta helper.
+  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
+
   // Original accounts.
   const originalAccounts = {
-    user: { value: input.user ?? null, isWritable: false },
-    pool: { value: input.pool ?? null, isWritable: true },
+    user: { value: input.user ?? null, isSigner: true, isWritable: false },
+    pool: { value: input.pool ?? null, isSigner: false, isWritable: true },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -146,7 +162,6 @@ export function getSyncPoolInstruction<
   // Original args.
   const args = { ...input };
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("user", accounts.user),
@@ -156,7 +171,17 @@ export function getSyncPoolInstruction<
       args as SyncPoolInstructionDataArgs,
     ),
     programAddress,
-  } as SyncPoolInstruction<TProgramAddress, TAccountUser, TAccountPool>);
+  } as SyncPoolInstruction<
+    TProgramAddress,
+    ResolvedInstructionAccountMeta<
+      TAccountUser,
+      InstructionAccountInputAddress<TAccountUser>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >
+  >);
 }
 
 export type ParsedSyncPoolInstruction<

package/src/generated/instructions/transferAdminAuthority.ts

@@ -30,12 +30,15 @@ import {
   type InstructionWithData,
   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";
@@ -109,17 +112,17 @@ export function getTransferAdminAuthorityInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type TransferAdminAuthorityAsyncInput<
-  TAccountAuthority extends string = string,
-  TAccountAdminConfig extends string = string,
+  TAccountAuthority extends InstructionSignerInput = InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput = InstructionAccountInput,
 > = {
-  authority: TransactionSigner<TAccountAuthority>;
-  adminConfig?: Address<TAccountAdminConfig>;
+  authority: TAccountAuthority;
+  adminConfig?: TAccountAdminConfig;
   newAuthority: TransferAdminAuthorityInstructionDataArgs["newAuthority"];
 };
 
 export async function getTransferAdminAuthorityInstructionAsync<
-  TAccountAuthority extends string,
-  TAccountAdminConfig extends string,
+  TAccountAuthority extends InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: TransferAdminAuthorityAsyncInput<
@@ -130,17 +133,34 @@ export async function getTransferAdminAuthorityInstructionAsync<
 ): Promise<
   TransferAdminAuthorityInstruction<
     TProgramAddress,
-    TAccountAuthority,
-    TAccountAdminConfig
+    ResolvedInstructionAccountMeta<
+      TAccountAuthority,
+      InstructionAccountInputAddress<TAccountAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >
   >
 > {
   // 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: true },
+    authority: {
+      value: input.authority ?? null,
+      isSigner: true,
+      isWritable: false,
+    },
+    adminConfig: {
+      value: input.adminConfig ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -155,7 +175,6 @@ export async function getTransferAdminAuthorityInstructionAsync<
     accounts.adminConfig.value = await findAdminConfigPda({ programAddress });
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("authority", accounts.authority),
@@ -167,39 +186,62 @@ export async function getTransferAdminAuthorityInstructionAsync<
     programAddress,
   } as TransferAdminAuthorityInstruction<
     TProgramAddress,
-    TAccountAuthority,
-    TAccountAdminConfig
+    ResolvedInstructionAccountMeta<
+      TAccountAuthority,
+      InstructionAccountInputAddress<TAccountAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >
   >);
 }
 
 export type TransferAdminAuthorityInput<
-  TAccountAuthority extends string = string,
-  TAccountAdminConfig extends string = string,
+  TAccountAuthority extends InstructionSignerInput = InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput = InstructionAccountInput,
 > = {
-  authority: TransactionSigner<TAccountAuthority>;
-  adminConfig: Address<TAccountAdminConfig>;
+  authority: TAccountAuthority;
+  adminConfig: TAccountAdminConfig;
   newAuthority: TransferAdminAuthorityInstructionDataArgs["newAuthority"];
 };
 
 export function getTransferAdminAuthorityInstruction<
-  TAccountAuthority extends string,
-  TAccountAdminConfig extends string,
+  TAccountAuthority extends InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: TransferAdminAuthorityInput<TAccountAuthority, TAccountAdminConfig>,
   config?: { programAddress?: TProgramAddress },
 ): TransferAdminAuthorityInstruction<
   TProgramAddress,
-  TAccountAuthority,
-  TAccountAdminConfig
+  ResolvedInstructionAccountMeta<
+    TAccountAuthority,
+    InstructionAccountInputAddress<TAccountAuthority>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountAdminConfig,
+    InstructionAccountInputAddress<TAccountAdminConfig>
+  >
 > {
   // 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: true },
+    authority: {
+      value: input.authority ?? null,
+      isSigner: true,
+      isWritable: false,
+    },
+    adminConfig: {
+      value: input.adminConfig ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -209,7 +251,6 @@ export function getTransferAdminAuthorityInstruction<
   // Original args.
   const args = { ...input };
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("authority", accounts.authority),
@@ -221,8 +262,14 @@ export function getTransferAdminAuthorityInstruction<
     programAddress,
   } as TransferAdminAuthorityInstruction<
     TProgramAddress,
-    TAccountAuthority,
-    TAccountAdminConfig
+    ResolvedInstructionAccountMeta<
+      TAccountAuthority,
+      InstructionAccountInputAddress<TAccountAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >
   >);
 }