@picon-finance/dlmm-sdk 2.0.2 → 2.0.4

package/src/generated/instructions/withdraw.ts

@@ -37,12 +37,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 {
@@ -183,35 +186,42 @@ export function getWithdrawInstructionDataCodec(): Codec<
 }
 
 export type WithdrawInput<
-  TAccountOwner extends string = string,
-  TAccountPool extends string = string,
-  TAccountPosition extends string = string,
-  TAccountPositionTokenAccount extends string = string,
-  TAccountTokenMintX extends string = string,
-  TAccountTokenMintY extends string = string,
-  TAccountTokenOwnerAccountX extends string = string,
-  TAccountTokenOwnerAccountY extends string = string,
-  TAccountTokenVaultX extends string = string,
-  TAccountTokenVaultY extends string = string,
-  TAccountTokenProgramX extends string = string,
-  TAccountTokenProgramY extends string = string,
-  TAccountLowerBinArray extends string = string,
-  TAccountUpperBinArray extends string = string,
+  TAccountOwner extends InstructionSignerInput = InstructionSignerInput,
+  TAccountPool extends InstructionAccountInput = InstructionAccountInput,
+  TAccountPosition extends InstructionAccountInput = InstructionAccountInput,
+  TAccountPositionTokenAccount extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenOwnerAccountX extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenOwnerAccountY extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput = InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountLowerBinArray extends InstructionAccountInput =
+    InstructionAccountInput,
+  TAccountUpperBinArray extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  owner: TransactionSigner<TAccountOwner>;
-  pool: Address<TAccountPool>;
-  position: Address<TAccountPosition>;
-  positionTokenAccount: Address<TAccountPositionTokenAccount>;
-  tokenMintX: Address<TAccountTokenMintX>;
-  tokenMintY: Address<TAccountTokenMintY>;
-  tokenOwnerAccountX: Address<TAccountTokenOwnerAccountX>;
-  tokenOwnerAccountY: Address<TAccountTokenOwnerAccountY>;
-  tokenVaultX: Address<TAccountTokenVaultX>;
-  tokenVaultY: Address<TAccountTokenVaultY>;
-  tokenProgramX: Address<TAccountTokenProgramX>;
-  tokenProgramY: Address<TAccountTokenProgramY>;
-  lowerBinArray: Address<TAccountLowerBinArray>;
-  upperBinArray?: Address<TAccountUpperBinArray>;
+  owner: TAccountOwner;
+  pool: TAccountPool;
+  position: TAccountPosition;
+  positionTokenAccount: TAccountPositionTokenAccount;
+  tokenMintX: TAccountTokenMintX;
+  tokenMintY: TAccountTokenMintY;
+  tokenOwnerAccountX: TAccountTokenOwnerAccountX;
+  tokenOwnerAccountY: TAccountTokenOwnerAccountY;
+  tokenVaultX: TAccountTokenVaultX;
+  tokenVaultY: TAccountTokenVaultY;
+  tokenProgramX: TAccountTokenProgramX;
+  tokenProgramY: TAccountTokenProgramY;
+  lowerBinArray: TAccountLowerBinArray;
+  upperBinArray?: TAccountUpperBinArray;
   lowerBinId: WithdrawInstructionDataArgs["lowerBinId"];
   upperBinId: WithdrawInstructionDataArgs["upperBinId"];
   bpsToRemove: WithdrawInstructionDataArgs["bpsToRemove"];
@@ -219,20 +229,20 @@ export type WithdrawInput<
 };
 
 export function getWithdrawInstruction<
-  TAccountOwner extends string,
-  TAccountPool extends string,
-  TAccountPosition extends string,
-  TAccountPositionTokenAccount extends string,
-  TAccountTokenMintX extends string,
-  TAccountTokenMintY extends string,
-  TAccountTokenOwnerAccountX extends string,
-  TAccountTokenOwnerAccountY extends string,
-  TAccountTokenVaultX extends string,
-  TAccountTokenVaultY extends string,
-  TAccountTokenProgramX extends string,
-  TAccountTokenProgramY extends string,
-  TAccountLowerBinArray extends string,
-  TAccountUpperBinArray extends string,
+  TAccountOwner extends InstructionSignerInput,
+  TAccountPool extends InstructionAccountInput,
+  TAccountPosition extends InstructionAccountInput,
+  TAccountPositionTokenAccount extends InstructionAccountInput,
+  TAccountTokenMintX extends InstructionAccountInput,
+  TAccountTokenMintY extends InstructionAccountInput,
+  TAccountTokenOwnerAccountX extends InstructionAccountInput,
+  TAccountTokenOwnerAccountY extends InstructionAccountInput,
+  TAccountTokenVaultX extends InstructionAccountInput,
+  TAccountTokenVaultY extends InstructionAccountInput,
+  TAccountTokenProgramX extends InstructionAccountInput,
+  TAccountTokenProgramY extends InstructionAccountInput,
+  TAccountLowerBinArray extends InstructionAccountInput,
+  TAccountUpperBinArray extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: WithdrawInput<
@@ -254,49 +264,133 @@ export function getWithdrawInstruction<
   config?: { programAddress?: TProgramAddress },
 ): WithdrawInstruction<
   TProgramAddress,
-  TAccountOwner,
-  TAccountPool,
-  TAccountPosition,
-  TAccountPositionTokenAccount,
-  TAccountTokenMintX,
-  TAccountTokenMintY,
-  TAccountTokenOwnerAccountX,
-  TAccountTokenOwnerAccountY,
-  TAccountTokenVaultX,
-  TAccountTokenVaultY,
-  TAccountTokenProgramX,
-  TAccountTokenProgramY,
-  TAccountLowerBinArray,
-  TAccountUpperBinArray
+  ResolvedInstructionAccountMeta<
+    TAccountOwner,
+    InstructionAccountInputAddress<TAccountOwner>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPool,
+    InstructionAccountInputAddress<TAccountPool>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPosition,
+    InstructionAccountInputAddress<TAccountPosition>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPositionTokenAccount,
+    InstructionAccountInputAddress<TAccountPositionTokenAccount>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenMintX,
+    InstructionAccountInputAddress<TAccountTokenMintX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenMintY,
+    InstructionAccountInputAddress<TAccountTokenMintY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenOwnerAccountX,
+    InstructionAccountInputAddress<TAccountTokenOwnerAccountX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenOwnerAccountY,
+    InstructionAccountInputAddress<TAccountTokenOwnerAccountY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenVaultX,
+    InstructionAccountInputAddress<TAccountTokenVaultX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenVaultY,
+    InstructionAccountInputAddress<TAccountTokenVaultY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenProgramX,
+    InstructionAccountInputAddress<TAccountTokenProgramX>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountTokenProgramY,
+    InstructionAccountInputAddress<TAccountTokenProgramY>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountLowerBinArray,
+    InstructionAccountInputAddress<TAccountLowerBinArray>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountUpperBinArray,
+    InstructionAccountInputAddress<TAccountUpperBinArray>
+  >
 > {
   // 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: false },
-    pool: { value: input.pool ?? null, isWritable: false },
-    position: { value: input.position ?? null, isWritable: true },
+    owner: { value: input.owner ?? null, isSigner: true, isWritable: false },
+    pool: { value: input.pool ?? null, isSigner: false, isWritable: false },
+    position: {
+      value: input.position ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
     positionTokenAccount: {
       value: input.positionTokenAccount ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenMintX: {
+      value: input.tokenMintX ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenMintY: {
+      value: input.tokenMintY ?? null,
+      isSigner: false,
       isWritable: false,
     },
-    tokenMintX: { value: input.tokenMintX ?? null, isWritable: false },
-    tokenMintY: { value: input.tokenMintY ?? null, isWritable: false },
     tokenOwnerAccountX: {
       value: input.tokenOwnerAccountX ?? null,
+      isSigner: false,
       isWritable: true,
     },
     tokenOwnerAccountY: {
       value: input.tokenOwnerAccountY ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    tokenVaultX: {
+      value: input.tokenVaultX ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    tokenVaultY: {
+      value: input.tokenVaultY ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    tokenProgramX: {
+      value: input.tokenProgramX ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    tokenProgramY: {
+      value: input.tokenProgramY ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
+    lowerBinArray: {
+      value: input.lowerBinArray ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    upperBinArray: {
+      value: input.upperBinArray ?? 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 },
-    lowerBinArray: { value: input.lowerBinArray ?? null, isWritable: true },
-    upperBinArray: { value: input.upperBinArray ?? null, isWritable: true },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -306,7 +400,6 @@ export function getWithdrawInstruction<
   // Original args.
   const args = { ...input };
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("owner", accounts.owner),
@@ -330,20 +423,62 @@ export function getWithdrawInstruction<
     programAddress,
   } as WithdrawInstruction<
     TProgramAddress,
-    TAccountOwner,
-    TAccountPool,
-    TAccountPosition,
-    TAccountPositionTokenAccount,
-    TAccountTokenMintX,
-    TAccountTokenMintY,
-    TAccountTokenOwnerAccountX,
-    TAccountTokenOwnerAccountY,
-    TAccountTokenVaultX,
-    TAccountTokenVaultY,
-    TAccountTokenProgramX,
-    TAccountTokenProgramY,
-    TAccountLowerBinArray,
-    TAccountUpperBinArray
+    ResolvedInstructionAccountMeta<
+      TAccountOwner,
+      InstructionAccountInputAddress<TAccountOwner>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPosition,
+      InstructionAccountInputAddress<TAccountPosition>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPositionTokenAccount,
+      InstructionAccountInputAddress<TAccountPositionTokenAccount>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintX,
+      InstructionAccountInputAddress<TAccountTokenMintX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenMintY,
+      InstructionAccountInputAddress<TAccountTokenMintY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenOwnerAccountX,
+      InstructionAccountInputAddress<TAccountTokenOwnerAccountX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenOwnerAccountY,
+      InstructionAccountInputAddress<TAccountTokenOwnerAccountY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultX,
+      InstructionAccountInputAddress<TAccountTokenVaultX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenVaultY,
+      InstructionAccountInputAddress<TAccountTokenVaultY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramX,
+      InstructionAccountInputAddress<TAccountTokenProgramX>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountTokenProgramY,
+      InstructionAccountInputAddress<TAccountTokenProgramY>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountLowerBinArray,
+      InstructionAccountInputAddress<TAccountLowerBinArray>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountUpperBinArray,
+      InstructionAccountInputAddress<TAccountUpperBinArray>
+    >
   >);
 }