@picon-finance/dlmm-sdk 2.0.5 → 2.0.7

package/src/generated/instructions/syncPool.ts

@@ -131,7 +131,9 @@ export function getSyncPoolInstruction<
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: SyncPoolInput<TAccountUser, TAccountPool>,
-  config?: { programAddress?: TProgramAddress },
+  config?: {
+    programAddress?: TProgramAddress | { readonly address: TProgramAddress };
+  },
 ): SyncPoolInstruction<
   TProgramAddress,
   ResolvedInstructionAccountMeta<
@@ -144,7 +146,12 @@ export function getSyncPoolInstruction<
   >
 > {
   // Program address.
-  const programAddress = config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
+  const programAddressInput =
+    config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
+  const programAddress =
+    typeof programAddressInput === "string"
+      ? programAddressInput
+      : programAddressInput.address;
 
   // Account meta helper.
   const getAccountMeta = getAccountMetaFactory(programAddress, "programId");

package/src/generated/instructions/transferAdminAuthority.ts

@@ -25,6 +25,7 @@ import {
   type FixedSizeCodec,
   type FixedSizeDecoder,
   type FixedSizeEncoder,
+  type HasAddress,
   type Instruction,
   type InstructionWithAccounts,
   type InstructionWithData,
@@ -78,7 +79,7 @@ export type TransferAdminAuthorityInstructionData = {
 };
 
 export type TransferAdminAuthorityInstructionDataArgs = {
-  newAuthority: Address;
+  newAuthority: Address | HasAddress;
 };
 
 export function getTransferAdminAuthorityInstructionDataEncoder(): FixedSizeEncoder<TransferAdminAuthorityInstructionDataArgs> {
@@ -129,7 +130,9 @@ export async function getTransferAdminAuthorityInstructionAsync<
     TAccountAuthority,
     TAccountAdminConfig
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: {
+    programAddress?: TProgramAddress | { readonly address: TProgramAddress };
+  },
 ): Promise<
   TransferAdminAuthorityInstruction<
     TProgramAddress,
@@ -144,7 +147,12 @@ export async function getTransferAdminAuthorityInstructionAsync<
   >
 > {
   // Program address.
-  const programAddress = config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
+  const programAddressInput =
+    config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
+  const programAddress =
+    typeof programAddressInput === "string"
+      ? programAddressInput
+      : programAddressInput.address;
 
   // Account meta helper.
   const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
@@ -212,7 +220,9 @@ export function getTransferAdminAuthorityInstruction<
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: TransferAdminAuthorityInput<TAccountAuthority, TAccountAdminConfig>,
-  config?: { programAddress?: TProgramAddress },
+  config?: {
+    programAddress?: TProgramAddress | { readonly address: TProgramAddress };
+  },
 ): TransferAdminAuthorityInstruction<
   TProgramAddress,
   ResolvedInstructionAccountMeta<
@@ -225,7 +235,12 @@ export function getTransferAdminAuthorityInstruction<
   >
 > {
   // Program address.
-  const programAddress = config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
+  const programAddressInput =
+    config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
+  const programAddress =
+    typeof programAddressInput === "string"
+      ? programAddressInput
+      : programAddressInput.address;
 
   // Account meta helper.
   const getAccountMeta = getAccountMetaFactory(programAddress, "programId");

package/src/generated/instructions/withdraw.ts

@@ -261,7 +261,9 @@ export function getWithdrawInstruction<
     TAccountLowerBinArray,
     TAccountUpperBinArray
   >,
-  config?: { programAddress?: TProgramAddress },
+  config?: {
+    programAddress?: TProgramAddress | { readonly address: TProgramAddress };
+  },
 ): WithdrawInstruction<
   TProgramAddress,
   ResolvedInstructionAccountMeta<
@@ -322,7 +324,12 @@ export function getWithdrawInstruction<
   >
 > {
   // Program address.
-  const programAddress = config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
+  const programAddressInput =
+    config?.programAddress ?? PICON_DLMM_PROGRAM_ADDRESS;
+  const programAddress =
+    typeof programAddressInput === "string"
+      ? programAddressInput
+      : programAddressInput.address;
 
   // Account meta helper.
   const getAccountMeta = getAccountMetaFactory(programAddress, "programId");

package/src/generated/pdas/adminConfig.ts

@@ -10,15 +10,21 @@ import {
   getBytesEncoder,
   getProgramDerivedAddress,
   type Address,
+  type HasAddress,
   type ProgramDerivedAddress,
 } from "@solana/kit";
 
 export async function findAdminConfigPda(
-  config: { programAddress?: Address | undefined } = {},
+  config: { programAddress?: Address | HasAddress | undefined } = {},
 ): Promise<ProgramDerivedAddress> {
   const {
-    programAddress = "pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC" as Address<"pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC">,
+    programAddress:
+      programAddressInput = "pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC" as Address<"pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC">,
   } = config;
+  const programAddress =
+    typeof programAddressInput === "string"
+      ? programAddressInput
+      : programAddressInput.address;
   return await getProgramDerivedAddress({
     programAddress,
     seeds: [

package/src/generated/pdas/binArray.ts

@@ -12,21 +12,27 @@ import {
   getI32Encoder,
   getProgramDerivedAddress,
   type Address,
+  type HasAddress,
   type ProgramDerivedAddress,
 } from "@solana/kit";
 
 export type BinArraySeeds = {
-  pool: Address;
+  pool: Address | HasAddress;
   index: number;
 };
 
 export async function findBinArrayPda(
   seeds: BinArraySeeds,
-  config: { programAddress?: Address | undefined } = {},
+  config: { programAddress?: Address | HasAddress | undefined } = {},
 ): Promise<ProgramDerivedAddress> {
   const {
-    programAddress = "pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC" as Address<"pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC">,
+    programAddress:
+      programAddressInput = "pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC" as Address<"pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC">,
   } = config;
+  const programAddress =
+    typeof programAddressInput === "string"
+      ? programAddressInput
+      : programAddressInput.address;
   return await getProgramDerivedAddress({
     programAddress,
     seeds: [

package/src/generated/pdas/pool.ts

@@ -13,23 +13,29 @@ import {
   getU16Encoder,
   getU32Encoder,
   type Address,
+  type HasAddress,
   type ProgramDerivedAddress,
 } from "@solana/kit";
 
 export type PoolSeeds = {
-  tokenMintX: Address;
-  tokenMintY: Address;
+  tokenMintX: Address | HasAddress;
+  tokenMintY: Address | HasAddress;
   binStep: number;
   feeRate: number;
 };
 
 export async function findPoolPda(
   seeds: PoolSeeds,
-  config: { programAddress?: Address | undefined } = {},
+  config: { programAddress?: Address | HasAddress | undefined } = {},
 ): Promise<ProgramDerivedAddress> {
   const {
-    programAddress = "pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC" as Address<"pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC">,
+    programAddress:
+      programAddressInput = "pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC" as Address<"pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC">,
   } = config;
+  const programAddress =
+    typeof programAddressInput === "string"
+      ? programAddressInput
+      : programAddressInput.address;
   return await getProgramDerivedAddress({
     programAddress,
     seeds: [

package/src/generated/pdas/position.ts

@@ -11,20 +11,26 @@ import {
   getBytesEncoder,
   getProgramDerivedAddress,
   type Address,
+  type HasAddress,
   type ProgramDerivedAddress,
 } from "@solana/kit";
 
 export type PositionSeeds = {
-  positionMint: Address;
+  positionMint: Address | HasAddress;
 };
 
 export async function findPositionPda(
   seeds: PositionSeeds,
-  config: { programAddress?: Address | undefined } = {},
+  config: { programAddress?: Address | HasAddress | undefined } = {},
 ): Promise<ProgramDerivedAddress> {
   const {
-    programAddress = "pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC" as Address<"pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC">,
+    programAddress:
+      programAddressInput = "pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC" as Address<"pDLMMk3KW3CUSxE1Wgjhx3jSmm2spe6Ry7Mq2HT26rC">,
   } = config;
+  const programAddress =
+    typeof programAddressInput === "string"
+      ? programAddressInput
+      : programAddressInput.address;
   return await getProgramDerivedAddress({
     programAddress,
     seeds: [

package/src/generated/programs/piconDlmm.ts

@@ -24,6 +24,7 @@ import {
   type ExtendedClient,
   type GetAccountInfoApi,
   type GetMultipleAccountsApi,
+  type HasAddress,
   type Instruction,
   type InstructionWithData,
   type ReadonlyUint8Array,
@@ -766,74 +767,93 @@ export type PiconDlmmPluginAccounts = {
 export type PiconDlmmPluginInstructions = {
   acceptAdminAuthority: (
     input: AcceptAdminAuthorityAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getAcceptAdminAuthorityInstructionAsync> &
     SelfPlanAndSendFunctions;
   claimFee: (
     input: ClaimFeeInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getClaimFeeInstruction> & SelfPlanAndSendFunctions;
   claimProtocolFee: (
     input: ClaimProtocolFeeAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getClaimProtocolFeeInstructionAsync> &
     SelfPlanAndSendFunctions;
   closePosition: (
     input: ClosePositionAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getClosePositionInstructionAsync> &
     SelfPlanAndSendFunctions;
   createAdminConfig: (
     input: CreateAdminConfigAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getCreateAdminConfigInstructionAsync> &
     SelfPlanAndSendFunctions;
   createBinArray: (
     input: MakeOptional<CreateBinArrayAsyncInput, "payer">,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getCreateBinArrayInstructionAsync> &
     SelfPlanAndSendFunctions;
   createPool: (
     input: CreatePoolAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getCreatePoolInstructionAsync> &
     SelfPlanAndSendFunctions;
   deleteBinArray: (
     input: DeleteBinArrayAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getDeleteBinArrayInstructionAsync> &
     SelfPlanAndSendFunctions;
   depositByWeight: (
     input: DepositByWeightInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getDepositByWeightInstruction> &
     SelfPlanAndSendFunctions;
   openPosition: (
     input: OpenPositionAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getOpenPositionInstructionAsync> &
     SelfPlanAndSendFunctions;
   resetAdminAuthority: (
     input: ResetAdminAuthorityAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getResetAdminAuthorityInstructionAsync> &
     SelfPlanAndSendFunctions;
   setMetadataUpdateAuthority: (
     input: SetMetadataUpdateAuthorityAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getSetMetadataUpdateAuthorityInstructionAsync> &
     SelfPlanAndSendFunctions;
   setPoolDynamicFeeConfig: (
     input: SetPoolDynamicFeeConfigAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getSetPoolDynamicFeeConfigInstructionAsync> &
     SelfPlanAndSendFunctions;
   setPoolProtocolShare: (
     input: SetPoolProtocolShareAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getSetPoolProtocolShareInstructionAsync> &
     SelfPlanAndSendFunctions;
   swapExactIn: (
     input: SwapExactInInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getSwapExactInInstruction> & SelfPlanAndSendFunctions;
   swapExactOut: (
     input: SwapExactOutInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getSwapExactOutInstruction> & SelfPlanAndSendFunctions;
   syncPool: (
     input: SyncPoolInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getSyncPoolInstruction> & SelfPlanAndSendFunctions;
   transferAdminAuthority: (
     input: TransferAdminAuthorityAsyncInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getTransferAdminAuthorityInstructionAsync> &
     SelfPlanAndSendFunctions;
   withdraw: (
     input: WithdrawInput,
+    config?: { programAddress?: Address | HasAddress },
   ) => ReturnType<typeof getWithdrawInstruction> & SelfPlanAndSendFunctions;
 };
 
@@ -851,7 +871,9 @@ export type PiconDlmmPluginRequirements = ClientWithRpc<
   ClientWithTransactionPlanning &
   ClientWithTransactionSending;
 
-export function piconDlmmProgram() {
+export function piconDlmmProgram(
+  config: { programAddress?: Address | HasAddress } = {},
+) {
   return <T extends PiconDlmmPluginRequirements>(
     client: T,
   ): ExtendedClient<T, { piconDlmm: PiconDlmmPlugin }> => {
@@ -864,101 +886,183 @@ export function piconDlmmProgram() {
           position: addSelfFetchFunctions(client, getPositionCodec()),
         },
         instructions: {
-          acceptAdminAuthority: (input) =>
+          acceptAdminAuthority: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getAcceptAdminAuthorityInstructionAsync(input),
+              getAcceptAdminAuthorityInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
+            ),
+          claimFee: (input, instructionConfig) =>
+            addSelfPlanAndSendFunctions(
+              client,
+              getClaimFeeInstruction(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
+            ),
+          claimProtocolFee: (input, instructionConfig) =>
+            addSelfPlanAndSendFunctions(
+              client,
+              getClaimProtocolFeeInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
+            ),
+          closePosition: (input, instructionConfig) =>
+            addSelfPlanAndSendFunctions(
+              client,
+              getClosePositionInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          claimFee: (input) =>
-            addSelfPlanAndSendFunctions(client, getClaimFeeInstruction(input)),
-          claimProtocolFee: (input) =>
+          createAdminConfig: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getClaimProtocolFeeInstructionAsync(input),
+              getCreateAdminConfigInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          closePosition: (input) =>
+          createBinArray: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getClosePositionInstructionAsync(input),
+              getCreateBinArrayInstructionAsync(
+                { ...input, payer: input.payer ?? client.payer },
+                {
+                  programAddress:
+                    instructionConfig?.programAddress ?? config.programAddress,
+                },
+              ),
             ),
-          createAdminConfig: (input) =>
+          createPool: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getCreateAdminConfigInstructionAsync(input),
+              getCreatePoolInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          createBinArray: (input) =>
+          deleteBinArray: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getCreateBinArrayInstructionAsync({
-                ...input,
-                payer: input.payer ?? client.payer,
+              getDeleteBinArrayInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
               }),
             ),
-          createPool: (input) =>
+          depositByWeight: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getCreatePoolInstructionAsync(input),
+              getDepositByWeightInstruction(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          deleteBinArray: (input) =>
+          openPosition: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getDeleteBinArrayInstructionAsync(input),
+              getOpenPositionInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          depositByWeight: (input) =>
+          resetAdminAuthority: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getDepositByWeightInstruction(input),
+              getResetAdminAuthorityInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          openPosition: (input) =>
+          setMetadataUpdateAuthority: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getOpenPositionInstructionAsync(input),
+              getSetMetadataUpdateAuthorityInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          resetAdminAuthority: (input) =>
+          setPoolDynamicFeeConfig: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getResetAdminAuthorityInstructionAsync(input),
+              getSetPoolDynamicFeeConfigInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          setMetadataUpdateAuthority: (input) =>
+          setPoolProtocolShare: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getSetMetadataUpdateAuthorityInstructionAsync(input),
+              getSetPoolProtocolShareInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          setPoolDynamicFeeConfig: (input) =>
+          swapExactIn: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getSetPoolDynamicFeeConfigInstructionAsync(input),
+              getSwapExactInInstruction(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          setPoolProtocolShare: (input) =>
+          swapExactOut: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getSetPoolProtocolShareInstructionAsync(input),
+              getSwapExactOutInstruction(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          swapExactIn: (input) =>
+          syncPool: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getSwapExactInInstruction(input),
+              getSyncPoolInstruction(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          swapExactOut: (input) =>
+          transferAdminAuthority: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getSwapExactOutInstruction(input),
+              getTransferAdminAuthorityInstructionAsync(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          syncPool: (input) =>
-            addSelfPlanAndSendFunctions(client, getSyncPoolInstruction(input)),
-          transferAdminAuthority: (input) =>
+          withdraw: (input, instructionConfig) =>
             addSelfPlanAndSendFunctions(
               client,
-              getTransferAdminAuthorityInstructionAsync(input),
+              getWithdrawInstruction(input, {
+                programAddress:
+                  instructionConfig?.programAddress ?? config.programAddress,
+              }),
             ),
-          withdraw: (input) =>
-            addSelfPlanAndSendFunctions(client, getWithdrawInstruction(input)),
         },
         pdas: {
-          adminConfig: findAdminConfigPda,
-          position: findPositionPda,
-          binArray: findBinArrayPda,
-          pool: findPoolPda,
+          adminConfig: (pdaConfig) =>
+            findAdminConfigPda({
+              programAddress:
+                pdaConfig?.programAddress ?? config.programAddress,
+            }),
+          position: (seeds, pdaConfig) =>
+            findPositionPda(seeds, {
+              programAddress:
+                pdaConfig?.programAddress ?? config.programAddress,
+            }),
+          binArray: (seeds, pdaConfig) =>
+            findBinArrayPda(seeds, {
+              programAddress:
+                pdaConfig?.programAddress ?? config.programAddress,
+            }),
+          pool: (seeds, pdaConfig) =>
+            findPoolPda(seeds, {
+              programAddress:
+                pdaConfig?.programAddress ?? config.programAddress,
+            }),
         },
         identifyAccount: identifyPiconDlmmAccount,
         identifyInstruction: identifyPiconDlmmInstruction,