@picon-finance/dlmm-sdk 2.0.3 → 2.0.4

package/src/generated/instructions/createBinArray.ts

@@ -32,7 +32,6 @@ import {
   type InstructionWithData,
   type ReadonlyAccount,
   type ReadonlyUint8Array,
-  type TransactionSigner,
   type WritableAccount,
   type WritableSignerAccount,
 } from "@solana/kit";
@@ -40,7 +39,11 @@ import {
   getAccountMetaFactory,
   getAddressFromResolvedInstructionAccount,
   getNonNullResolvedInstructionInput,
+  type InstructionAccountInput,
+  type InstructionAccountInputAddress,
+  type InstructionSignerInput,
   type ResolvedInstructionAccount,
+  type ResolvedInstructionAccountMeta,
 } from "@solana/program-client-core";
 import { findBinArrayPda } from "../pdas/index.js";
 import { PICON_DLMM_PROGRAM_ADDRESS } from "../programs/index.js";
@@ -124,24 +127,25 @@ export function getCreateBinArrayInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type CreateBinArrayAsyncInput<
-  TAccountPayer extends string = string,
-  TAccountPool extends string = string,
-  TAccountBinArray extends string = string,
-  TAccountSystemProgram extends string = string,
+  TAccountPayer extends InstructionSignerInput = InstructionSignerInput,
+  TAccountPool extends InstructionAccountInput = InstructionAccountInput,
+  TAccountBinArray extends InstructionAccountInput = InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  payer: TransactionSigner<TAccountPayer>;
-  pool: Address<TAccountPool>;
-  binArray?: Address<TAccountBinArray>;
-  systemProgram?: Address<TAccountSystemProgram>;
+  payer: TAccountPayer;
+  pool: TAccountPool;
+  binArray?: TAccountBinArray;
+  systemProgram?: TAccountSystemProgram;
   index: CreateBinArrayInstructionDataArgs["index"];
   idempotent: CreateBinArrayInstructionDataArgs["idempotent"];
 };
 
 export async function getCreateBinArrayInstructionAsync<
-  TAccountPayer extends string,
-  TAccountPool extends string,
-  TAccountBinArray extends string,
-  TAccountSystemProgram extends string,
+  TAccountPayer extends InstructionSignerInput,
+  TAccountPool extends InstructionAccountInput,
+  TAccountBinArray extends InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: CreateBinArrayAsyncInput<
@@ -154,21 +158,44 @@ export async function getCreateBinArrayInstructionAsync<
 ): Promise<
   CreateBinArrayInstruction<
     TProgramAddress,
-    TAccountPayer,
-    TAccountPool,
-    TAccountBinArray,
-    TAccountSystemProgram
+    ResolvedInstructionAccountMeta<
+      TAccountPayer,
+      InstructionAccountInputAddress<TAccountPayer>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountBinArray,
+      InstructionAccountInputAddress<TAccountBinArray>
+    >,
+    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 = {
-    payer: { value: input.payer ?? null, isWritable: true },
-    pool: { value: input.pool ?? null, isWritable: false },
-    binArray: { value: input.binArray ?? null, isWritable: true },
-    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+    payer: { value: input.payer ?? null, isSigner: true, isWritable: true },
+    pool: { value: input.pool ?? null, isSigner: false, isWritable: false },
+    binArray: {
+      value: input.binArray ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    systemProgram: {
+      value: input.systemProgram ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -196,7 +223,6 @@ export async function getCreateBinArrayInstructionAsync<
       "11111111111111111111111111111111" as Address<"11111111111111111111111111111111">;
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("payer", accounts.payer),
@@ -210,32 +236,45 @@ export async function getCreateBinArrayInstructionAsync<
     programAddress,
   } as CreateBinArrayInstruction<
     TProgramAddress,
-    TAccountPayer,
-    TAccountPool,
-    TAccountBinArray,
-    TAccountSystemProgram
+    ResolvedInstructionAccountMeta<
+      TAccountPayer,
+      InstructionAccountInputAddress<TAccountPayer>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountBinArray,
+      InstructionAccountInputAddress<TAccountBinArray>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountSystemProgram,
+      InstructionAccountInputAddress<TAccountSystemProgram>
+    >
   >);
 }
 
 export type CreateBinArrayInput<
-  TAccountPayer extends string = string,
-  TAccountPool extends string = string,
-  TAccountBinArray extends string = string,
-  TAccountSystemProgram extends string = string,
+  TAccountPayer extends InstructionSignerInput = InstructionSignerInput,
+  TAccountPool extends InstructionAccountInput = InstructionAccountInput,
+  TAccountBinArray extends InstructionAccountInput = InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput =
+    InstructionAccountInput,
 > = {
-  payer: TransactionSigner<TAccountPayer>;
-  pool: Address<TAccountPool>;
-  binArray: Address<TAccountBinArray>;
-  systemProgram?: Address<TAccountSystemProgram>;
+  payer: TAccountPayer;
+  pool: TAccountPool;
+  binArray: TAccountBinArray;
+  systemProgram?: TAccountSystemProgram;
   index: CreateBinArrayInstructionDataArgs["index"];
   idempotent: CreateBinArrayInstructionDataArgs["idempotent"];
 };
 
 export function getCreateBinArrayInstruction<
-  TAccountPayer extends string,
-  TAccountPool extends string,
-  TAccountBinArray extends string,
-  TAccountSystemProgram extends string,
+  TAccountPayer extends InstructionSignerInput,
+  TAccountPool extends InstructionAccountInput,
+  TAccountBinArray extends InstructionAccountInput,
+  TAccountSystemProgram extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: CreateBinArrayInput<
@@ -247,20 +286,43 @@ export function getCreateBinArrayInstruction<
   config?: { programAddress?: TProgramAddress },
 ): CreateBinArrayInstruction<
   TProgramAddress,
-  TAccountPayer,
-  TAccountPool,
-  TAccountBinArray,
-  TAccountSystemProgram
+  ResolvedInstructionAccountMeta<
+    TAccountPayer,
+    InstructionAccountInputAddress<TAccountPayer>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountPool,
+    InstructionAccountInputAddress<TAccountPool>
+  >,
+  ResolvedInstructionAccountMeta<
+    TAccountBinArray,
+    InstructionAccountInputAddress<TAccountBinArray>
+  >,
+  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 = {
-    payer: { value: input.payer ?? null, isWritable: true },
-    pool: { value: input.pool ?? null, isWritable: false },
-    binArray: { value: input.binArray ?? null, isWritable: true },
-    systemProgram: { value: input.systemProgram ?? null, isWritable: false },
+    payer: { value: input.payer ?? null, isSigner: true, isWritable: true },
+    pool: { value: input.pool ?? null, isSigner: false, isWritable: false },
+    binArray: {
+      value: input.binArray ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
+    systemProgram: {
+      value: input.systemProgram ?? null,
+      isSigner: false,
+      isWritable: false,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -276,7 +338,6 @@ export function getCreateBinArrayInstruction<
       "11111111111111111111111111111111" as Address<"11111111111111111111111111111111">;
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("payer", accounts.payer),
@@ -290,10 +351,22 @@ export function getCreateBinArrayInstruction<
     programAddress,
   } as CreateBinArrayInstruction<
     TProgramAddress,
-    TAccountPayer,
-    TAccountPool,
-    TAccountBinArray,
-    TAccountSystemProgram
+    ResolvedInstructionAccountMeta<
+      TAccountPayer,
+      InstructionAccountInputAddress<TAccountPayer>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountPool,
+      InstructionAccountInputAddress<TAccountPool>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountBinArray,
+      InstructionAccountInputAddress<TAccountBinArray>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountSystemProgram,
+      InstructionAccountInputAddress<TAccountSystemProgram>
+    >
   >);
 }