@picon-finance/dlmm-sdk 2.0.2 → 2.0.4

package/dist/generated/instructions/withdraw.d.ts

@@ -5,7 +5,8 @@
  *
  * @see https://github.com/codama-idl/codama
  */
-import { type AccountMeta, type AccountSignerMeta, type Address, type Codec, type Decoder, type Encoder, type Instruction, type InstructionWithAccounts, type InstructionWithData, type Option, type OptionOrNullable, type ReadonlyAccount, type ReadonlySignerAccount, type ReadonlyUint8Array, type TransactionSigner, type WritableAccount } from "@solana/kit";
+import { type AccountMeta, type AccountSignerMeta, type Address, type Codec, type Decoder, type Encoder, type Instruction, type InstructionWithAccounts, type InstructionWithData, type Option, type OptionOrNullable, type ReadonlyAccount, type ReadonlySignerAccount, type ReadonlyUint8Array, type WritableAccount } from "@solana/kit";
+import { type InstructionAccountInput, type InstructionAccountInputAddress, type InstructionSignerInput, type ResolvedInstructionAccountMeta } from "@solana/program-client-core";
 import { PICON_DLMM_PROGRAM_ADDRESS } from "../programs/index.js";
 import { type RemainingAccountsScheme, type RemainingAccountsSchemeArgs } from "../types/index.js";
 export declare const WITHDRAW_DISCRIMINATOR: ReadonlyUint8Array;
@@ -43,29 +44,29 @@ export type WithdrawInstructionDataArgs = {
 export declare function getWithdrawInstructionDataEncoder(): Encoder<WithdrawInstructionDataArgs>;
 export declare function getWithdrawInstructionDataDecoder(): Decoder<WithdrawInstructionData>;
 export declare function getWithdrawInstructionDataCodec(): Codec<WithdrawInstructionDataArgs, WithdrawInstructionData>;
-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> = {
-    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>;
+export type WithdrawInput<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: 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"];
     remainingAccountsScheme: WithdrawInstructionDataArgs["remainingAccountsScheme"];
 };
-export declare 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, TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS>(input: WithdrawInput<TAccountOwner, TAccountPool, TAccountPosition, TAccountPositionTokenAccount, TAccountTokenMintX, TAccountTokenMintY, TAccountTokenOwnerAccountX, TAccountTokenOwnerAccountY, TAccountTokenVaultX, TAccountTokenVaultY, TAccountTokenProgramX, TAccountTokenProgramY, TAccountLowerBinArray, TAccountUpperBinArray>, config?: {
+export declare function getWithdrawInstruction<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<TAccountOwner, TAccountPool, TAccountPosition, TAccountPositionTokenAccount, TAccountTokenMintX, TAccountTokenMintY, TAccountTokenOwnerAccountX, TAccountTokenOwnerAccountY, TAccountTokenVaultX, TAccountTokenVaultY, TAccountTokenProgramX, TAccountTokenProgramY, TAccountLowerBinArray, TAccountUpperBinArray>, config?: {
     programAddress?: TProgramAddress;
-}): WithdrawInstruction<TProgramAddress, TAccountOwner, TAccountPool, TAccountPosition, TAccountPositionTokenAccount, TAccountTokenMintX, TAccountTokenMintY, TAccountTokenOwnerAccountX, TAccountTokenOwnerAccountY, TAccountTokenVaultX, TAccountTokenVaultY, TAccountTokenProgramX, TAccountTokenProgramY, TAccountLowerBinArray, TAccountUpperBinArray>;
+}): WithdrawInstruction<TProgramAddress, 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>>>;
 export type ParsedWithdrawInstruction<TProgram extends string = typeof PICON_DLMM_PROGRAM_ADDRESS, TAccountMetas extends readonly AccountMeta[] = readonly AccountMeta[]> = {
     programAddress: Address<TProgram>;
     accounts: {

package/dist/generated/instructions/withdraw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withdraw.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/withdraw.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"withdraw.d.ts","sourceRoot":"","sources":["../../../src/generated/instructions/withdraw.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAiBL,KAAK,WAAW,EAChB,KAAK,iBAAiB,EACtB,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,OAAO,EACZ,KAAK,OAAO,EACZ,KAAK,WAAW,EAChB,KAAK,uBAAuB,EAC5B,KAAK,mBAAmB,EACxB,KAAK,MAAM,EACX,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACrB,MAAM,aAAa,CAAC;AACrB,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,8BAA8B,EACnC,KAAK,sBAAsB,EAE3B,KAAK,8BAA8B,EACpC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAGL,KAAK,uBAAuB,EAC5B,KAAK,2BAA2B,EACjC,MAAM,mBAAmB,CAAC;AAE3B,eAAO,MAAM,sBAAsB,EAAE,kBAEnC,CAAC;AAEH,wBAAgB,6BAA6B,IAAI,kBAAkB,CAElE;AAED,MAAM,MAAM,mBAAmB,CAC7B,QAAQ,SAAS,MAAM,GAAG,OAAO,0BAA0B,EAC3D,aAAa,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EAC3D,YAAY,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EAC1D,gBAAgB,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EAC9D,4BAA4B,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EAC1E,kBAAkB,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EAChE,kBAAkB,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EAChE,0BAA0B,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EACxE,0BAA0B,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EACxE,mBAAmB,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EACjE,mBAAmB,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EACjE,qBAAqB,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EACnE,qBAAqB,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EACnE,qBAAqB,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EACnE,qBAAqB,SAAS,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,GAAG,MAAM,EACnE,kBAAkB,SAAS,SAAS,WAAW,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAC5D,WAAW,CAAC,QAAQ,CAAC,GACvB,mBAAmB,CAAC,kBAAkB,CAAC,GACvC,uBAAuB,CACrB;IACE,aAAa,SAAS,MAAM,GACxB,qBAAqB,CAAC,aAAa,CAAC,GAClC,iBAAiB,CAAC,aAAa,CAAC,GAClC,aAAa;IACjB,YAAY,SAAS,MAAM,GACvB,eAAe,CAAC,YAAY,CAAC,GAC7B,YAAY;IAChB,gBAAgB,SAAS,MAAM,GAC3B,eAAe,CAAC,gBAAgB,CAAC,GACjC,gBAAgB;IACpB,4BAA4B,SAAS,MAAM,GACvC,eAAe,CAAC,4BAA4B,CAAC,GAC7C,4BAA4B;IAChC,kBAAkB,SAAS,MAAM,GAC7B,eAAe,CAAC,kBAAkB,CAAC,GACnC,kBAAkB;IACtB,kBAAkB,SAAS,MAAM,GAC7B,eAAe,CAAC,kBAAkB,CAAC,GACnC,kBAAkB;IACtB,0BAA0B,SAAS,MAAM,GACrC,eAAe,CAAC,0BAA0B,CAAC,GAC3C,0BAA0B;IAC9B,0BAA0B,SAAS,MAAM,GACrC,eAAe,CAAC,0BAA0B,CAAC,GAC3C,0BAA0B;IAC9B,mBAAmB,SAAS,MAAM,GAC9B,eAAe,CAAC,mBAAmB,CAAC,GACpC,mBAAmB;IACvB,mBAAmB,SAAS,MAAM,GAC9B,eAAe,CAAC,mBAAmB,CAAC,GACpC,mBAAmB;IACvB,qBAAqB,SAAS,MAAM,GAChC,eAAe,CAAC,qBAAqB,CAAC,GACtC,qBAAqB;IACzB,qBAAqB,SAAS,MAAM,GAChC,eAAe,CAAC,qBAAqB,CAAC,GACtC,qBAAqB;IACzB,qBAAqB,SAAS,MAAM,GAChC,eAAe,CAAC,qBAAqB,CAAC,GACtC,qBAAqB;IACzB,qBAAqB,SAAS,MAAM,GAChC,eAAe,CAAC,qBAAqB,CAAC,GACtC,qBAAqB;IACzB,GAAG,kBAAkB;CACtB,CACF,CAAC;AAEJ,MAAM,MAAM,uBAAuB,GAAG;IACpC,aAAa,EAAE,kBAAkB,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,uBAAuB,EAAE,MAAM,CAAC,uBAAuB,CAAC,CAAC;CAC1D,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,uBAAuB,EAAE,gBAAgB,CAAC,2BAA2B,CAAC,CAAC;CACxE,CAAC;AAEF,wBAAgB,iCAAiC,IAAI,OAAO,CAAC,2BAA2B,CAAC,CAcxF;AAED,wBAAgB,iCAAiC,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAWpF;AAED,wBAAgB,+BAA+B,IAAI,KAAK,CACtD,2BAA2B,EAC3B,uBAAuB,CACxB,CAKA;AAED,MAAM,MAAM,aAAa,CACvB,aAAa,SAAS,sBAAsB,GAAG,sBAAsB,EACrE,YAAY,SAAS,uBAAuB,GAAG,uBAAuB,EACtE,gBAAgB,SAAS,uBAAuB,GAAG,uBAAuB,EAC1E,4BAA4B,SAAS,uBAAuB,GAC1D,uBAAuB,EACzB,kBAAkB,SAAS,uBAAuB,GAAG,uBAAuB,EAC5E,kBAAkB,SAAS,uBAAuB,GAAG,uBAAuB,EAC5E,0BAA0B,SAAS,uBAAuB,GACxD,uBAAuB,EACzB,0BAA0B,SAAS,uBAAuB,GACxD,uBAAuB,EACzB,mBAAmB,SAAS,uBAAuB,GAAG,uBAAuB,EAC7E,mBAAmB,SAAS,uBAAuB,GAAG,uBAAuB,EAC7E,qBAAqB,SAAS,uBAAuB,GACnD,uBAAuB,EACzB,qBAAqB,SAAS,uBAAuB,GACnD,uBAAuB,EACzB,qBAAqB,SAAS,uBAAuB,GACnD,uBAAuB,EACzB,qBAAqB,SAAS,uBAAuB,GACnD,uBAAuB,IACvB;IACF,KAAK,EAAE,aAAa,CAAC;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,oBAAoB,EAAE,4BAA4B,CAAC;IACnD,UAAU,EAAE,kBAAkB,CAAC;IAC/B,UAAU,EAAE,kBAAkB,CAAC;IAC/B,kBAAkB,EAAE,0BAA0B,CAAC;IAC/C,kBAAkB,EAAE,0BAA0B,CAAC;IAC/C,WAAW,EAAE,mBAAmB,CAAC;IACjC,WAAW,EAAE,mBAAmB,CAAC;IACjC,aAAa,EAAE,qBAAqB,CAAC;IACrC,aAAa,EAAE,qBAAqB,CAAC;IACrC,aAAa,EAAE,qBAAqB,CAAC;IACrC,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC,CAAC;IACtD,UAAU,EAAE,2BAA2B,CAAC,YAAY,CAAC,CAAC;IACtD,WAAW,EAAE,2BAA2B,CAAC,aAAa,CAAC,CAAC;IACxD,uBAAuB,EAAE,2BAA2B,CAAC,yBAAyB,CAAC,CAAC;CACjF,CAAC;AAEF,wBAAgB,sBAAsB,CACpC,aAAa,SAAS,sBAAsB,EAC5C,YAAY,SAAS,uBAAuB,EAC5C,gBAAgB,SAAS,uBAAuB,EAChD,4BAA4B,SAAS,uBAAuB,EAC5D,kBAAkB,SAAS,uBAAuB,EAClD,kBAAkB,SAAS,uBAAuB,EAClD,0BAA0B,SAAS,uBAAuB,EAC1D,0BAA0B,SAAS,uBAAuB,EAC1D,mBAAmB,SAAS,uBAAuB,EACnD,mBAAmB,SAAS,uBAAuB,EACnD,qBAAqB,SAAS,uBAAuB,EACrD,qBAAqB,SAAS,uBAAuB,EACrD,qBAAqB,SAAS,uBAAuB,EACrD,qBAAqB,SAAS,uBAAuB,EACrD,eAAe,SAAS,OAAO,GAAG,OAAO,0BAA0B,EAEnE,KAAK,EAAE,aAAa,CAClB,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,4BAA4B,EAC5B,kBAAkB,EAClB,kBAAkB,EAClB,0BAA0B,EAC1B,0BAA0B,EAC1B,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,qBAAqB,EACrB,qBAAqB,CACtB,EACD,MAAM,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,eAAe,CAAA;CAAE,GAC5C,mBAAmB,CACpB,eAAe,EACf,8BAA8B,CAC5B,aAAa,EACb,8BAA8B,CAAC,aAAa,CAAC,CAC9C,EACD,8BAA8B,CAC5B,YAAY,EACZ,8BAA8B,CAAC,YAAY,CAAC,CAC7C,EACD,8BAA8B,CAC5B,gBAAgB,EAChB,8BAA8B,CAAC,gBAAgB,CAAC,CACjD,EACD,8BAA8B,CAC5B,4BAA4B,EAC5B,8BAA8B,CAAC,4BAA4B,CAAC,CAC7D,EACD,8BAA8B,CAC5B,kBAAkB,EAClB,8BAA8B,CAAC,kBAAkB,CAAC,CACnD,EACD,8BAA8B,CAC5B,kBAAkB,EAClB,8BAA8B,CAAC,kBAAkB,CAAC,CACnD,EACD,8BAA8B,CAC5B,0BAA0B,EAC1B,8BAA8B,CAAC,0BAA0B,CAAC,CAC3D,EACD,8BAA8B,CAC5B,0BAA0B,EAC1B,8BAA8B,CAAC,0BAA0B,CAAC,CAC3D,EACD,8BAA8B,CAC5B,mBAAmB,EACnB,8BAA8B,CAAC,mBAAmB,CAAC,CACpD,EACD,8BAA8B,CAC5B,mBAAmB,EACnB,8BAA8B,CAAC,mBAAmB,CAAC,CACpD,EACD,8BAA8B,CAC5B,qBAAqB,EACrB,8BAA8B,CAAC,qBAAqB,CAAC,CACtD,EACD,8BAA8B,CAC5B,qBAAqB,EACrB,8BAA8B,CAAC,qBAAqB,CAAC,CACtD,EACD,8BAA8B,CAC5B,qBAAqB,EACrB,8BAA8B,CAAC,qBAAqB,CAAC,CACtD,EACD,8BAA8B,CAC5B,qBAAqB,EACrB,8BAA8B,CAAC,qBAAqB,CAAC,CACtD,CACF,CAgKA;AAED,MAAM,MAAM,yBAAyB,CACnC,QAAQ,SAAS,MAAM,GAAG,OAAO,0BAA0B,EAC3D,aAAa,SAAS,SAAS,WAAW,EAAE,GAAG,SAAS,WAAW,EAAE,IACnE;IACF,cAAc,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClC,QAAQ,EAAE;QACR,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QACvB,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QAC3B,oBAAoB,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QACvC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QAC7B,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QAC7B,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QACrC,kBAAkB,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QACrC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QAC9B,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC;QAC9B,aAAa,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;QACjC,aAAa,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;QACjC,aAAa,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;QACjC,aAAa,CAAC,EAAE,aAAa,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;KAC/C,CAAC;IACF,IAAI,EAAE,uBAAuB,CAAC;CAC/B,CAAC;AAEF,wBAAgB,wBAAwB,CACtC,QAAQ,SAAS,MAAM,EACvB,aAAa,SAAS,SAAS,WAAW,EAAE,EAE5C,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,GAChC,uBAAuB,CAAC,aAAa,CAAC,GACtC,mBAAmB,CAAC,kBAAkB,CAAC,GACxC,yBAAyB,CAAC,QAAQ,EAAE,aAAa,CAAC,CA0CpD"}

package/dist/generated/instructions/withdraw.js

@@ -45,36 +45,76 @@ export function getWithdrawInstructionDataCodec() {
 export function getWithdrawInstruction(input, config) {
     // 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;
     // Original args.
     const args = { ...input };
-    const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
     return Object.freeze({
         accounts: [
             getAccountMeta("owner", accounts.owner),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@picon-finance/dlmm-sdk",
-  "version": "2.0.2",
+  "version": "2.0.4",
   "description": "Typescript SDK for interacting with the Picon DLMM protocol",
   "author": "Picon Finance",
   "license": "MIT",
@@ -45,15 +45,15 @@
   "dependencies": {
     "@solana-program/system": "^0.14.1",
     "@solana-program/token": "^0.16.1",
-    "@solana-program/token-2022": "^0.16.1",
-    "@solana/kit": "^8.2.0",
-    "@solana/program-client-core": "^8.2.0",
-    "@solana/transaction-messages": "^8.2.0"
+    "@solana-program/token-2022": "^0.18.0",
+    "@solana/kit": "^8.3.0",
+    "@solana/program-client-core": "^8.3.0",
+    "@solana/transaction-messages": "^8.3.0"
   },
   "devDependencies": {
     "@types/bun": "latest",
-    "@codama/nodes-from-anchor": "^1.5.5",
-    "@codama/renderers-js": "^2.4.0",
-    "codama": "^1.10.2"
+    "@codama/nodes-from-anchor": "^1.5.6",
+    "@codama/renderers-js": "^2.5.0",
+    "codama": "^1.11.0"
   }
 }

package/src/entities/dlmm_program.ts

@@ -135,7 +135,7 @@ export class DlmmProgram {
       { positionMints: candidateMints },
       { programAddress: this.#programAddress },
     );
-    const maybePools = await fetchAllMaybePositionPoolsChunked(
+    const maybeEntries = await fetchAllMaybePositionPoolsChunked(
       this.#rpc,
       positionAddresses,
       config,
@@ -143,8 +143,8 @@ export class DlmmProgram {
 
     return new Map(
       Map.groupBy(
-        maybePools.flatMap((maybePool, i) =>
-          maybePool ? [{ pool: maybePool.pool, mint: candidateMints[i] }] : []),
+        maybeEntries.flatMap((maybeEntry, i) =>
+          maybeEntry ? [{ pool: maybeEntry.pool, mint: candidateMints[i] }] : []),
         ({ pool }) => pool,
       ).entries().map(([pool, pairs]) => [pool, pairs.map(({ mint }) => mint)]),
     );

package/src/generated/instructions/acceptAdminAuthority.ts

@@ -28,12 +28,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";
@@ -100,16 +103,17 @@ export function getAcceptAdminAuthorityInstructionDataCodec(): FixedSizeCodec<
 }
 
 export type AcceptAdminAuthorityAsyncInput<
-  TAccountPendingAuthority extends string = string,
-  TAccountAdminConfig extends string = string,
+  TAccountPendingAuthority extends InstructionSignerInput =
+    InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput = InstructionAccountInput,
 > = {
-  pendingAuthority: TransactionSigner<TAccountPendingAuthority>;
-  adminConfig?: Address<TAccountAdminConfig>;
+  pendingAuthority: TAccountPendingAuthority;
+  adminConfig?: TAccountAdminConfig;
 };
 
 export async function getAcceptAdminAuthorityInstructionAsync<
-  TAccountPendingAuthority extends string,
-  TAccountAdminConfig extends string,
+  TAccountPendingAuthority extends InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: AcceptAdminAuthorityAsyncInput<
@@ -120,20 +124,34 @@ export async function getAcceptAdminAuthorityInstructionAsync<
 ): Promise<
   AcceptAdminAuthorityInstruction<
     TProgramAddress,
-    TAccountPendingAuthority,
-    TAccountAdminConfig
+    ResolvedInstructionAccountMeta<
+      TAccountPendingAuthority,
+      InstructionAccountInputAddress<TAccountPendingAuthority>
+    >,
+    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 = {
     pendingAuthority: {
       value: input.pendingAuthority ?? null,
+      isSigner: true,
       isWritable: false,
     },
-    adminConfig: { value: input.adminConfig ?? null, isWritable: true },
+    adminConfig: {
+      value: input.adminConfig ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
@@ -145,7 +163,6 @@ export async function getAcceptAdminAuthorityInstructionAsync<
     accounts.adminConfig.value = await findAdminConfigPda({ programAddress });
   }
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("pendingAuthority", accounts.pendingAuthority),
@@ -155,22 +172,29 @@ export async function getAcceptAdminAuthorityInstructionAsync<
     programAddress,
   } as AcceptAdminAuthorityInstruction<
     TProgramAddress,
-    TAccountPendingAuthority,
-    TAccountAdminConfig
+    ResolvedInstructionAccountMeta<
+      TAccountPendingAuthority,
+      InstructionAccountInputAddress<TAccountPendingAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >
   >);
 }
 
 export type AcceptAdminAuthorityInput<
-  TAccountPendingAuthority extends string = string,
-  TAccountAdminConfig extends string = string,
+  TAccountPendingAuthority extends InstructionSignerInput =
+    InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput = InstructionAccountInput,
 > = {
-  pendingAuthority: TransactionSigner<TAccountPendingAuthority>;
-  adminConfig: Address<TAccountAdminConfig>;
+  pendingAuthority: TAccountPendingAuthority;
+  adminConfig: TAccountAdminConfig;
 };
 
 export function getAcceptAdminAuthorityInstruction<
-  TAccountPendingAuthority extends string,
-  TAccountAdminConfig extends string,
+  TAccountPendingAuthority extends InstructionSignerInput,
+  TAccountAdminConfig extends InstructionAccountInput,
   TProgramAddress extends Address = typeof PICON_DLMM_PROGRAM_ADDRESS,
 >(
   input: AcceptAdminAuthorityInput<
@@ -180,26 +204,39 @@ export function getAcceptAdminAuthorityInstruction<
   config?: { programAddress?: TProgramAddress },
 ): AcceptAdminAuthorityInstruction<
   TProgramAddress,
-  TAccountPendingAuthority,
-  TAccountAdminConfig
+  ResolvedInstructionAccountMeta<
+    TAccountPendingAuthority,
+    InstructionAccountInputAddress<TAccountPendingAuthority>
+  >,
+  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 = {
     pendingAuthority: {
       value: input.pendingAuthority ?? null,
+      isSigner: true,
       isWritable: false,
     },
-    adminConfig: { value: input.adminConfig ?? null, isWritable: true },
+    adminConfig: {
+      value: input.adminConfig ?? null,
+      isSigner: false,
+      isWritable: true,
+    },
   };
   const accounts = originalAccounts as Record<
     keyof typeof originalAccounts,
     ResolvedInstructionAccount
   >;
 
-  const getAccountMeta = getAccountMetaFactory(programAddress, "programId");
   return Object.freeze({
     accounts: [
       getAccountMeta("pendingAuthority", accounts.pendingAuthority),
@@ -209,8 +246,14 @@ export function getAcceptAdminAuthorityInstruction<
     programAddress,
   } as AcceptAdminAuthorityInstruction<
     TProgramAddress,
-    TAccountPendingAuthority,
-    TAccountAdminConfig
+    ResolvedInstructionAccountMeta<
+      TAccountPendingAuthority,
+      InstructionAccountInputAddress<TAccountPendingAuthority>
+    >,
+    ResolvedInstructionAccountMeta<
+      TAccountAdminConfig,
+      InstructionAccountInputAddress<TAccountAdminConfig>
+    >
   >);
 }