@stabbleorg/mclmm-sdk 0.3.3 → 0.5.0

package/lib/index.js

@@ -72,6 +72,7 @@ __export(index_exports, {
   Q64: () => Q64,
   SLIPPAGE_CALC: () => SLIPPAGE_CALC,
   STABBLE_CLMM_PROGRAM_ID: () => STABBLE_CLMM_PROGRAM_ID,
+  STABBLE_CLMM_QAS_PROGRAM_ID: () => STABBLE_CLMM_QAS_PROGRAM_ID,
   SYSTEM_PROGRAM_ID: () => SYSTEM_PROGRAM_ID,
   SYSVAR_RENT_PROGRAM_ID: () => SYSVAR_RENT_PROGRAM_ID,
   SqrtPriceMath: () => SqrtPriceMath,
@@ -5184,6 +5185,7 @@ var import_decimal2 = __toESM(require("decimal.js"));
 // src/constants.ts
 var import_bn = __toESM(require("bn.js"));
 var STABBLE_CLMM_PROGRAM_ID = "6dMXqGZ3ga2dikrYS9ovDXgHGh5RUsb2RTUj6hrQXhk6";
+var STABBLE_CLMM_QAS_PROGRAM_ID = "8896VTm3Z3g8PuktiDdW9JLxZP1ww2r5c9Tz5AbaBjAJ";
 var METADATA_PROGRAM_ID = "metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s";
 var SYSTEM_PROGRAM_ID = "11111111111111111111111111111111";
 var SYSVAR_RENT_PROGRAM_ID = "SysvarRent111111111111111111111111111111111";
@@ -5646,11 +5648,12 @@ var PdaUtils = class {
    * @param ammConfig - AMM config address
    * @param tokenMintA - Token A mint address
    * @param tokenMintB - Token B mint address
+   * @param programId - Program address (defaults to production)
    * @returns Pool state PDA
    */
-  static async getPoolStatePda(ammConfig, tokenMintA, tokenMintB) {
+  static async getPoolStatePda(ammConfig, tokenMintA, tokenMintB, programId = STABBLE_CLMM_PROGRAM_ID) {
     return await (0, import_kit50.getProgramDerivedAddress)({
-      programAddress: STABBLE_CLMM_PROGRAM_ID,
+      programAddress: programId,
       seeds: [
         PDA_SEEDS.POOL_STATE,
         addressEncoder.encode(ammConfig),
@@ -5662,22 +5665,24 @@ var PdaUtils = class {
   /**
    * Derive AMM config PDA
    * @param index - Config index
+   * @param programId - Program address (defaults to production)
    * @returns AMM config PDA
    */
-  static async getAmmConfigPda(index) {
+  static async getAmmConfigPda(index, programId = STABBLE_CLMM_PROGRAM_ID) {
     return await (0, import_kit50.getProgramDerivedAddress)({
-      programAddress: STABBLE_CLMM_PROGRAM_ID,
+      programAddress: programId,
       seeds: [PDA_SEEDS.AMM_CONFIG, (0, import_kit50.getU16Encoder)().encode(index)]
     });
   }
   /**
    * Derive position state PDA
    * @param nftMint - Position NFT mint address
+   * @param programId - Program address (defaults to production)
    * @returns Position state PDA
    */
-  static async getPositionStatePda(nftMint) {
+  static async getPositionStatePda(nftMint, programId = STABBLE_CLMM_PROGRAM_ID) {
     return await (0, import_kit50.getProgramDerivedAddress)({
-      programAddress: STABBLE_CLMM_PROGRAM_ID,
+      programAddress: programId,
       seeds: [PDA_SEEDS.POSITION_STATE, addressEncoder.encode(nftMint)]
     });
   }
@@ -5685,11 +5690,12 @@ var PdaUtils = class {
    * Derive tick array state PDA
    * @param poolState - Pool state address
    * @param startTickIndex - Starting tick index of the array
+   * @param programId - Program address (defaults to production)
    * @returns Tick array state PDA
    */
-  static async getTickArrayStatePda(poolState, startTickIndex) {
+  static async getTickArrayStatePda(poolState, startTickIndex, programId = STABBLE_CLMM_PROGRAM_ID) {
     return await (0, import_kit50.getProgramDerivedAddress)({
-      programAddress: STABBLE_CLMM_PROGRAM_ID,
+      programAddress: programId,
       seeds: [
         PDA_SEEDS.TICK_ARRAY_STATE,
         addressEncoder.encode(poolState),
@@ -5700,32 +5706,34 @@ var PdaUtils = class {
   /**
    * Derive observation state PDA
    * @param poolState - Pool state address
+   * @param programId - Program address (defaults to production)
    * @returns Observation state PDA
    */
-  static async getObservationStatePda(poolState) {
+  static async getObservationStatePda(poolState, programId = STABBLE_CLMM_PROGRAM_ID) {
     return await (0, import_kit50.getProgramDerivedAddress)({
-      programAddress: STABBLE_CLMM_PROGRAM_ID,
+      programAddress: programId,
       seeds: [PDA_SEEDS.OBSERVATION_STATE, addressEncoder.encode(poolState)]
     });
   }
-  static async getPoolVaultIdPda(poolAddress, vaultAddress) {
+  static async getPoolVaultIdPda(poolAddress, vaultAddress, programId = STABBLE_CLMM_PROGRAM_ID) {
     return await (0, import_kit50.getProgramDerivedAddress)({
       seeds: [
         PDA_SEEDS.POOL_VAULT,
         addressEncoder.encode(poolAddress),
         addressEncoder.encode(vaultAddress)
       ],
-      programAddress: STABBLE_CLMM_PROGRAM_ID
+      programAddress: programId
     });
   }
   /**
    * Derive tick array bitmap extension PDA
    * @param poolState - Pool state address
+   * @param programId - Program address (defaults to production)
    * @returns Tick array bitmap extension PDA
    */
-  static async getTickArrayBitmapExtensionPda(poolState) {
+  static async getTickArrayBitmapExtensionPda(poolState, programId = STABBLE_CLMM_PROGRAM_ID) {
     return await (0, import_kit50.getProgramDerivedAddress)({
-      programAddress: STABBLE_CLMM_PROGRAM_ID,
+      programAddress: programId,
       seeds: [PDA_SEEDS.BITMAP_EXTENSION, addressEncoder.encode(poolState)]
     });
   }
@@ -5748,9 +5756,10 @@ var PdaUtils = class {
    * @param tickUpper - Upper tick of range
    * @param tickSpacing - Tick spacing of the pool
    * @param tickCurrent - Current pool tick
+   * @param programId - Program address (defaults to production)
    * @returns Array of tick array PDAs
    */
-  static async getTickArrayPdasForRange(poolState, tickLower, tickUpper, tickSpacing, tickCurrent) {
+  static async getTickArrayPdasForRange(poolState, tickLower, tickUpper, tickSpacing, tickCurrent, programId = STABBLE_CLMM_PROGRAM_ID) {
     const startIndexLower = this.getTickArrayStartIndex(tickLower, tickSpacing);
     const startIndexUpper = this.getTickArrayStartIndex(tickUpper, tickSpacing);
     const startIndexCurrent = this.getTickArrayStartIndex(
@@ -5764,7 +5773,7 @@ var PdaUtils = class {
     ]);
     return await Promise.all(
       Array.from(indices).map(
-        (index) => this.getTickArrayStatePda(poolState, index)
+        (index) => this.getTickArrayStatePda(poolState, index, programId)
       )
     );
   }
@@ -5773,11 +5782,12 @@ var PdaUtils = class {
    * @param poolState - Pool state address
    * @param tickLowerIndex - Lower tick index
    * @param tickUpperIndex - Upper tick index
+   * @param programId - Program address (defaults to production)
    * @returns Protocol position state PDA
    */
-  static async getProtocolPositionStatePda(poolState, tickLowerIndex, tickUpperIndex) {
+  static async getProtocolPositionStatePda(poolState, tickLowerIndex, tickUpperIndex, programId = STABBLE_CLMM_PROGRAM_ID) {
     return await (0, import_kit50.getProgramDerivedAddress)({
-      programAddress: STABBLE_CLMM_PROGRAM_ID,
+      programAddress: programId,
       seeds: [
         PDA_SEEDS.POSITION_STATE,
         addressEncoder.encode(poolState),
@@ -5789,11 +5799,12 @@ var PdaUtils = class {
   /**
    * Derive operation state PDA
    * @param poolState - Pool state address
+   * @param programId - Program address (defaults to production)
    * @returns Operation state PDA
    */
-  static async getOperationStatePda(poolState) {
+  static async getOperationStatePda(poolState, programId = STABBLE_CLMM_PROGRAM_ID) {
     return await (0, import_kit50.getProgramDerivedAddress)({
-      programAddress: STABBLE_CLMM_PROGRAM_ID,
+      programAddress: programId,
       seeds: [PDA_SEEDS.OPERATION, addressEncoder.encode(poolState)]
     });
   }
@@ -5812,7 +5823,7 @@ async function getMetadataPda(mint) {
 // src/utils/tickQuery.ts
 var FETCH_TICKARRAY_COUNT = 15;
 var TickQuery = class _TickQuery {
-  static async getTickArrays(rpc, poolId, tickCurrent, tickSpacing, tickArrayBitmapArray, exTickArrayBitmap) {
+  static async getTickArrays(rpc, poolId, tickCurrent, tickSpacing, tickArrayBitmapArray, exTickArrayBitmap, programId = STABBLE_CLMM_PROGRAM_ID) {
     const tickArraysToFetch = [];
     const currentTickArrayStartIndex = TickUtils.getTickArrayStartIndexByTick(
       tickCurrent,
@@ -5828,7 +5839,8 @@ var TickQuery = class _TickQuery {
     for (let i = 0; i < startIndexArray.length; i++) {
       const [tickArrayAddress] = await PdaUtils.getTickArrayStatePda(
         poolId,
-        startIndexArray[i]
+        startIndexArray[i],
+        programId
       );
       tickArraysToFetch.push(tickArrayAddress);
     }
@@ -5883,7 +5895,7 @@ var TickQuery = class _TickQuery {
    * @param zeroForOne - Search direction
    * @returns First initialized tick, tick array address, and start index
    */
-  static async firstInitializedTickInOneArray(poolId, tickArray, zeroForOne) {
+  static async firstInitializedTickInOneArray(poolId, tickArray, zeroForOne, programId = STABBLE_CLMM_PROGRAM_ID) {
     let nextInitializedTick = void 0;
     if (zeroForOne) {
       for (let i = TICK_ARRAY_SIZE - 1; i >= 0; i--) {
@@ -5904,7 +5916,8 @@ var TickQuery = class _TickQuery {
     }
     const [tickArrayAddress] = await PdaUtils.getTickArrayStatePda(
       poolId,
-      tickArray.data.startTickIndex
+      tickArray.data.startTickIndex,
+      programId
     );
     return {
       nextTick: nextInitializedTick,
@@ -5922,7 +5935,7 @@ var TickQuery = class _TickQuery {
    * @param zeroForOne - Search direction
    * @returns Next initialized tick info
    */
-  static async nextInitializedTickInOneArray(poolId, tickArrayCache, tickIndex, tickSpacing, zeroForOne) {
+  static async nextInitializedTickInOneArray(poolId, tickArrayCache, tickIndex, tickSpacing, zeroForOne, programId = STABBLE_CLMM_PROGRAM_ID) {
     const startIndex = TickUtils.getTickArrayStartIndexByTick(
       tickIndex,
       tickSpacing
@@ -5961,7 +5974,8 @@ var TickQuery = class _TickQuery {
     }
     const [tickArrayAddress] = await PdaUtils.getTickArrayStatePda(
       poolId,
-      startIndex
+      startIndex,
+      programId
     );
     return {
       initializedTick: nextInitializedTick,
@@ -5979,7 +5993,7 @@ var TickQuery = class _TickQuery {
    * @param zeroForOne - Search direction
    * @returns Next initialized tick info
    */
-  static async nextInitializedTick(poolId, tickArrayCache, tickIndex, tickSpacing, zeroForOne) {
+  static async nextInitializedTick(poolId, tickArrayCache, tickIndex, tickSpacing, zeroForOne, programId = STABBLE_CLMM_PROGRAM_ID) {
     let {
       initializedTick: nextTick,
       tickArrayAddress,
@@ -5989,7 +6003,8 @@ var TickQuery = class _TickQuery {
       tickArrayCache,
       tickIndex,
       tickSpacing,
-      zeroForOne
+      zeroForOne,
+      programId
     );
     while (nextTick === void 0 || nextTick.liquidityGross <= 0n) {
       const nextArrayStartIndex = zeroForOne ? tickArrayStartTickIndex - this.tickCount(tickSpacing) : tickArrayStartTickIndex + this.tickCount(tickSpacing);
@@ -6006,7 +6021,8 @@ var TickQuery = class _TickQuery {
       const result = await this.firstInitializedTickInOneArray(
         poolId,
         cachedTickArray,
-        zeroForOne
+        zeroForOne,
+        programId
       );
       nextTick = result.nextTick;
       tickArrayAddress = result.tickArrayAddress;
@@ -7847,7 +7863,9 @@ function getApisFromEndpoint(rpc) {
 var Clmm = class {
   constructor(config) {
     this.config = config;
+    this.programId = config.programAddress ?? STABBLE_CLMM_PROGRAM_ID;
   }
+  programId;
   /**
    * Create a new AMM configuration
    * @param params - Configuration parameters
@@ -7862,7 +7880,7 @@ var Clmm = class {
       protocolFeeRate,
       fundFeeRate
     } = params;
-    const ammConfigPda = await PdaUtils.getAmmConfigPda(index);
+    const ammConfigPda = await PdaUtils.getAmmConfigPda(index, this.programId);
     const instruction = await getCreateAmmConfigInstructionAsync({
       owner,
       ammConfig: ammConfigPda[0],
@@ -7871,7 +7889,7 @@ var Clmm = class {
       tradeFeeRate,
       protocolFeeRate,
       fundFeeRate
-    });
+    }, { programAddress: this.programId });
     return {
       instruction,
       extInfo: {
@@ -7936,7 +7954,9 @@ async function getToken(rpc, tokenAccount) {
 var PoolManager = class {
   constructor(config) {
     this.config = config;
+    this.programId = config.programAddress ?? STABBLE_CLMM_PROGRAM_ID;
   }
+  programId;
   /**
    * Make create pool instructions
    * @param params - Pool creation parameters
@@ -7972,12 +7992,13 @@ var PoolManager = class {
     const [poolPda] = await PdaUtils.getPoolStatePda(
       ammConfigId,
       token0,
-      token1
+      token1,
+      this.programId
     );
-    const [observationPda] = await PdaUtils.getObservationStatePda(poolPda);
-    const [tickArrayBitmapPda] = await PdaUtils.getTickArrayBitmapExtensionPda(poolPda);
-    const [tokenVault0] = await PdaUtils.getPoolVaultIdPda(poolPda, token0);
-    const [tokenVault1] = await PdaUtils.getPoolVaultIdPda(poolPda, token1);
+    const [observationPda] = await PdaUtils.getObservationStatePda(poolPda, this.programId);
+    const [tickArrayBitmapPda] = await PdaUtils.getTickArrayBitmapExtensionPda(poolPda, this.programId);
+    const [tokenVault0] = await PdaUtils.getPoolVaultIdPda(poolPda, token0, this.programId);
+    const [tokenVault1] = await PdaUtils.getPoolVaultIdPda(poolPda, token1, this.programId);
     const instruction = await getCreatePoolInstructionAsync({
       poolCreator: owner,
       ammConfig: ammConfigId,
@@ -7992,7 +8013,7 @@ var PoolManager = class {
       tokenProgram1: import_token2.TOKEN_PROGRAM_ADDRESS,
       sqrtPriceX64: BigInt(initialPriceX64.toString()),
       openTime: BigInt(0)
-    });
+    }, { programAddress: this.programId });
     return {
       instructions: [instruction],
       signers: [],
@@ -8022,7 +8043,7 @@ var PoolManager = class {
       protocolFeeRate,
       fundFeeRate
     } = params;
-    const ammConfigPda = await PdaUtils.getAmmConfigPda(index);
+    const ammConfigPda = await PdaUtils.getAmmConfigPda(index, this.programId);
     const instruction = getCreateAmmConfigInstruction({
       owner,
       ammConfig: ammConfigPda[0],
@@ -8032,7 +8053,7 @@ var PoolManager = class {
       tradeFeeRate,
       protocolFeeRate,
       fundFeeRate
-    });
+    }, { programAddress: this.programId });
     return {
       instructions: [instruction],
       signers: [owner],
@@ -8074,17 +8095,18 @@ var PoolManager = class {
    * @returns Pool information if found
    */
   async getPoolByTokenPairAndConfig(tokenA, tokenB, ammConfigIndex = 0) {
-    const ammConfigPda = await PdaUtils.getAmmConfigPda(ammConfigIndex);
+    const ammConfigPda = await PdaUtils.getAmmConfigPda(ammConfigIndex, this.programId);
     const poolPda = await PdaUtils.getPoolStatePda(
       ammConfigPda[0],
       tokenA,
-      tokenB
+      tokenB,
+      this.programId
     );
     return this.getPool(poolPda[0]);
   }
   async getAllPools(rpc) {
     try {
-      let accounts = await rpc.getProgramAccounts(STABBLE_CLMM_PROGRAM_ID, {
+      let accounts = await rpc.getProgramAccounts(this.programId, {
         commitment: "finalized",
         encoding: "base64",
         filters: [
@@ -8199,7 +8221,9 @@ var TOKEN_ACCOUNT_SIZE = 165n;
 var PositionManager = class {
   constructor(config) {
     this.config = config;
+    this.programId = config.programAddress ?? STABBLE_CLMM_PROGRAM_ID;
   }
+  programId;
   buildWrapSolInstructions(params) {
     const { payer, ata, owner, amount } = params;
     return [
@@ -8301,7 +8325,8 @@ var PositionManager = class {
       poolAccount.data.tickSpacing
     );
     const [positionStatePda] = await PdaUtils.getPositionStatePda(
-      nftMintAccount.address
+      nftMintAccount.address,
+      this.programId
     );
     const [metadataPda] = await getMetadataPda(nftMintAccount.address);
     const [positionNftAccountPda] = await (0, import_token4.findAssociatedTokenPda)({
@@ -8312,7 +8337,8 @@ var PositionManager = class {
     const [protocolPositionPda] = await PdaUtils.getProtocolPositionStatePda(
       poolAccount.address,
       tickLower,
-      tickUpper
+      tickUpper,
+      this.programId
     );
     const instruction = await getOpenPositionWithToken22NftInstructionAsync({
       payer: ownerInfo.feePayer,
@@ -8336,7 +8362,7 @@ var PositionManager = class {
       amount1Max: amountMaxB,
       withMetadata,
       baseFlag: null
-    });
+    }, { programAddress: this.programId });
     return {
       instructions: [instruction],
       signers,
@@ -8387,14 +8413,17 @@ var PositionManager = class {
     );
     const [tickArrayLower] = await PdaUtils.getTickArrayStatePda(
       poolAccount.address,
-      tickArrayLowerStartIndex
+      tickArrayLowerStartIndex,
+      this.programId
     );
     const [tickArrayUpper] = await PdaUtils.getTickArrayStatePda(
       poolAccount.address,
-      tickArrayUpperStartIndex
+      tickArrayUpperStartIndex,
+      this.programId
     );
     const [positionStatePda] = await PdaUtils.getPositionStatePda(
-      nftMintAccount.address
+      nftMintAccount.address,
+      this.programId
     );
     const [metadataPda] = await getMetadataPda(nftMintAccount.address);
     const [positionNftAccountPda] = await (0, import_token4.findAssociatedTokenPda)({
@@ -8405,7 +8434,8 @@ var PositionManager = class {
     const [protocolPositionPda] = await PdaUtils.getProtocolPositionStatePda(
       poolAccount.address,
       tickLower,
-      tickUpper
+      tickUpper,
+      this.programId
     );
     const amount0Max = base === "MintA" ? baseAmount : otherAmountMax;
     const amount1Max = base === "MintA" ? otherAmountMax : baseAmount;
@@ -8413,7 +8443,7 @@ var PositionManager = class {
       poolAccount.data.tickSpacing,
       [tickArrayLowerStartIndex, tickArrayUpperStartIndex]
     );
-    const extBitmapAccount = isOverflow ? await PdaUtils.getTickArrayBitmapExtensionPda(poolAccount.address) : void 0;
+    const extBitmapAccount = isOverflow ? await PdaUtils.getTickArrayBitmapExtensionPda(poolAccount.address, this.programId) : void 0;
     const remAccounts = extBitmapAccount ? [{ address: extBitmapAccount[0], role: import_kit53.AccountRole.WRITABLE }] : [];
     let wrapSolInstructions = [];
     if (poolAccount.data.tokenMint0.toString() === NATIVE_MINT.toString()) {
@@ -8456,7 +8486,7 @@ var PositionManager = class {
       withMetadata,
       baseFlag: base === "MintA" ? true : false
       // true = MintA is base, false = MintB is base
-    });
+    }, { programAddress: this.programId });
     const ixWithRemAccounts = {
       ...instruction,
       accounts: [...instruction.accounts, ...remAccounts]
@@ -8489,7 +8519,8 @@ var PositionManager = class {
       amountMaxB
     } = params;
     const [personalPosition] = await PdaUtils.getPositionStatePda(
-      ownerPosition.nftMint
+      ownerPosition.nftMint,
+      this.programId
     );
     const [positionNftAccount] = await (0, import_token4.findAssociatedTokenPda)({
       mint: ownerPosition.nftMint,
@@ -8499,27 +8530,30 @@ var PositionManager = class {
     const [protocolPositionPda] = await PdaUtils.getProtocolPositionStatePda(
       poolState.address,
       ownerPosition.tickLowerIndex,
-      ownerPosition.tickUpperIndex
+      ownerPosition.tickUpperIndex,
+      this.programId
     );
     const [tickArrayLower] = await PdaUtils.getTickArrayStatePda(
       poolState.address,
       PdaUtils.getTickArrayStartIndex(
         ownerPosition.tickLowerIndex,
         poolState.data.tickSpacing
-      )
+      ),
+      this.programId
     );
     const [tickArrayUpper] = await PdaUtils.getTickArrayStatePda(
       poolState.address,
       PdaUtils.getTickArrayStartIndex(
         ownerPosition.tickUpperIndex,
         poolState.data.tickSpacing
-      )
+      ),
+      this.programId
     );
     const isOverflow = PoolUtils.isOverflowDefaultTickArrayBitmap(
       poolState.data.tickSpacing,
       [ownerPosition.tickLowerIndex, ownerPosition.tickUpperIndex]
     );
-    const extBitmapAccount = isOverflow ? await PdaUtils.getTickArrayBitmapExtensionPda(poolState.address) : void 0;
+    const extBitmapAccount = isOverflow ? await PdaUtils.getTickArrayBitmapExtensionPda(poolState.address, this.programId) : void 0;
     const remAccounts = extBitmapAccount ? [{ address: extBitmapAccount[0], role: import_kit53.AccountRole.WRITABLE }] : [];
     const instruction = getIncreaseLiquidityV2Instruction({
       nftOwner: ownerInfo.wallet,
@@ -8539,7 +8573,7 @@ var PositionManager = class {
       amount0Max: amountMaxA,
       amount1Max: amountMaxB,
       baseFlag: null
-    });
+    }, { programAddress: this.programId });
     const ixWithRemAccounts = {
       ...instruction,
       accounts: [...instruction.accounts, ...remAccounts]
@@ -8577,7 +8611,8 @@ var PositionManager = class {
     } = params;
     const signers = [];
     const [personalPosition] = await PdaUtils.getPositionStatePda(
-      ownerPosition.nftMint
+      ownerPosition.nftMint,
+      this.programId
     );
     const [positionNftAccount] = await (0, import_token4.findAssociatedTokenPda)({
       mint: ownerPosition.nftMint,
@@ -8587,27 +8622,30 @@ var PositionManager = class {
     const [protocolPositionPda] = await PdaUtils.getProtocolPositionStatePda(
       poolState.address,
       ownerPosition.tickLowerIndex,
-      ownerPosition.tickUpperIndex
+      ownerPosition.tickUpperIndex,
+      this.programId
     );
     const [tickArrayLower] = await PdaUtils.getTickArrayStatePda(
       poolState.address,
       PdaUtils.getTickArrayStartIndex(
         ownerPosition.tickLowerIndex,
         poolState.data.tickSpacing
-      )
+      ),
+      this.programId
     );
     const [tickArrayUpper] = await PdaUtils.getTickArrayStatePda(
       poolState.address,
       PdaUtils.getTickArrayStartIndex(
         ownerPosition.tickUpperIndex,
         poolState.data.tickSpacing
-      )
+      ),
+      this.programId
     );
     const isOverflow = PoolUtils.isOverflowDefaultTickArrayBitmap(
       poolState.data.tickSpacing,
       [ownerPosition.tickLowerIndex, ownerPosition.tickUpperIndex]
     );
-    const extBitmapAccount = isOverflow ? await PdaUtils.getTickArrayBitmapExtensionPda(poolState.address) : void 0;
+    const extBitmapAccount = isOverflow ? await PdaUtils.getTickArrayBitmapExtensionPda(poolState.address, this.programId) : void 0;
     const remAccounts = extBitmapAccount ? [{ address: extBitmapAccount[0], role: import_kit53.AccountRole.WRITABLE }] : [];
     const createRecipientAta0Ix = (0, import_token4.getCreateAssociatedTokenIdempotentInstruction)(
       {
@@ -8644,7 +8682,7 @@ var PositionManager = class {
       liquidity,
       amount0Min: amountMinA,
       amount1Min: amountMinB
-    });
+    }, { programAddress: this.programId });
     const ixWithRemAccounts = {
       ...instruction,
       accounts: [...instruction.accounts, ...remAccounts]
@@ -8690,7 +8728,8 @@ var PositionManager = class {
   async makeClosePositionInstructions(params) {
     const { ownerPosition, ownerInfo } = params;
     const [personalPosition] = await PdaUtils.getPositionStatePda(
-      ownerPosition.nftMint
+      ownerPosition.nftMint,
+      this.programId
     );
     const [positionNftAccount] = await (0, import_token4.findAssociatedTokenPda)({
       mint: ownerPosition.nftMint,
@@ -8703,7 +8742,7 @@ var PositionManager = class {
       positionNftAccount,
       personalPosition,
       tokenProgram: import_token_20222.TOKEN_2022_PROGRAM_ADDRESS
-    });
+    }, { programAddress: this.programId });
     return {
       instructions: [instruction],
       signers: [],
@@ -8719,7 +8758,7 @@ var PositionManager = class {
    */
   async getPosition(positionMint) {
     try {
-      const positionStatePda = await PdaUtils.getPositionStatePda(positionMint);
+      const positionStatePda = await PdaUtils.getPositionStatePda(positionMint, this.programId);
       const positionState = await fetchMaybePersonalPositionState(
         this.config.rpc,
         positionStatePda[0],
@@ -8800,11 +8839,11 @@ var PositionManager = class {
     };
   }
   /**
-   * Get all positions for a wallet
+   * Get raw positions for a wallet (without pool-state enrichment)
    * @param wallet - Wallet address
-   * @returns Array of positions owned by the wallet
+   * @returns Array of raw position states owned by the wallet
    */
-  async getPositionsForWallet(wallet) {
+  async getRawPositionsForWallet(wallet) {
     try {
       const response22 = await this.config.rpc.getTokenAccountsByOwner(
         wallet,
@@ -8821,38 +8860,7 @@ var PositionManager = class {
           (ta) => this.getPosition(ta.account.data.parsed.info.mint)
         )
       );
-      const validPositions = positions.filter(
-        (p) => !!p
-      );
-      const enrichedPositions = await Promise.all(
-        validPositions.map(async (position) => {
-          try {
-            const poolAccount = await fetchMaybePoolState(
-              this.config.rpc,
-              position.poolId,
-              { commitment: this.config.commitment }
-            );
-            if (!poolAccount.exists) {
-              console.warn(`Pool ${position.poolId} not found for position`);
-              return null;
-            }
-            const { fees, rewards } = await this.getPositionFeeAndRewards(
-              position,
-              poolAccount.data
-            );
-            return this.enrichPositionInfo(
-              position,
-              poolAccount.data,
-              fees,
-              rewards
-            );
-          } catch (error) {
-            console.error(`Failed to enrich position: ${error}`);
-            return null;
-          }
-        })
-      );
-      return enrichedPositions.filter((p) => !!p);
+      return positions.filter((p) => !!p);
     } catch (error) {
       throw new ClmmError(
         "POSITION_NOT_FOUND" /* POSITION_NOT_FOUND */,
@@ -8860,6 +8868,49 @@ var PositionManager = class {
       );
     }
   }
+  /**
+   * Get all positions for a wallet, enriched with pool data
+   * @param wallet - Wallet address
+   * @returns Structured result with enriched positions and any failures
+   */
+  async getPositionsForWallet(wallet) {
+    const rawPositions = await this.getRawPositionsForWallet(wallet);
+    const results = await Promise.allSettled(
+      rawPositions.map(async (position) => {
+        const poolAccount = await fetchMaybePoolState(
+          this.config.rpc,
+          position.poolId,
+          { commitment: this.config.commitment }
+        );
+        if (!poolAccount.exists) {
+          throw new Error(`Pool ${position.poolId} not found for position`);
+        }
+        const { fees, rewards } = await this.getPositionFeeAndRewards(
+          position,
+          poolAccount.data
+        );
+        return this.enrichPositionInfo(
+          position,
+          poolAccount.data,
+          fees,
+          rewards
+        );
+      })
+    );
+    const positions = [];
+    const failed = [];
+    results.forEach((result, index) => {
+      if (result.status === "fulfilled") {
+        positions.push(result.value);
+      } else {
+        failed.push({
+          position: rawPositions[index],
+          error: result.reason instanceof Error ? result.reason : new Error(String(result.reason))
+        });
+      }
+    });
+    return { positions, failed };
+  }
   /**
    * Calculate pending fees and rewards for a position.
    *
@@ -8873,14 +8924,16 @@ var PositionManager = class {
       PdaUtils.getTickArrayStartIndex(
         position.tickLowerIndex,
         pool.tickSpacing
-      )
+      ),
+      this.programId
     );
     const [tickArrayUpper] = await PdaUtils.getTickArrayStatePda(
       position.poolId,
       PdaUtils.getTickArrayStartIndex(
         position.tickUpperIndex,
         pool.tickSpacing
-      )
+      ),
+      this.programId
     );
     const tickArrayLowerAccount = await fetchMaybeTickArrayState(
       this.config.rpc,
@@ -9154,6 +9207,7 @@ var ClmmApi = class {
 };
 
 // src/swap.ts
+var import_kit55 = require("@solana/kit");
 var import_token5 = require("@solana-program/token");
 
 // src/managers/pool-data-manager.ts
@@ -10255,6 +10309,7 @@ var SwapManager = class {
   constructor(config, managerConfig) {
     this.config = config;
     this.managerConfig = managerConfig;
+    this.programId = config.programAddress ?? STABBLE_CLMM_PROGRAM_ID;
     this.poolDataManager = new PoolDataManager(config, {
       cacheTTL: 2e3,
       immutability: "freeze",
@@ -10275,6 +10330,7 @@ var SwapManager = class {
       );
     }
   }
+  programId;
   poolDataManager;
   mathEngine;
   priceApiClient;
@@ -10885,7 +10941,8 @@ var SwapManager = class {
       const startIndex = currentStartIndex + offset * TICKS_PER_ARRAY * tickSpacing;
       const [tickArrayPda] = await PdaUtils.getTickArrayStatePda(
         poolAddress,
-        startIndex
+        startIndex,
+        this.programId
       );
       tickArrayAddresses.push(tickArrayPda);
     }
@@ -11195,7 +11252,10 @@ var SwapManager = class {
     }
     const pool = await this.poolDataManager.getPoolState(poolAddress, options);
     const zeroForOne = params.tokenIn === pool.tokenMint0;
-    const [observationState] = await PdaUtils.getObservationStatePda(poolAddress);
+    const [observationState] = await PdaUtils.getObservationStatePda(
+      poolAddress,
+      this.programId
+    );
     const [inputTokenAccount] = await (0, import_token5.findAssociatedTokenPda)({
       mint: params.tokenIn,
       owner: payer.address,
@@ -11227,7 +11287,35 @@ var SwapManager = class {
       sqrtPriceLimitX64: BigInt(sqrtPriceLimitX64.toString()),
       isBaseInput: true
     };
-    return getSwapV2Instruction(input);
+    const baseInstruction = getSwapV2Instruction(input, {
+      programAddress: this.programId
+    });
+    const remainingAccounts = [];
+    const [bitmapExtensionPda] = await PdaUtils.getTickArrayBitmapExtensionPda(
+      poolAddress,
+      this.programId
+    );
+    remainingAccounts.push({
+      address: bitmapExtensionPda,
+      role: import_kit55.AccountRole.READONLY
+    });
+    const tickArrayAddresses = await this.getRequiredTickArrays(
+      poolAddress,
+      pool.tickCurrent,
+      pool.tickSpacing,
+      zeroForOne,
+      this.estimateTickArrayCount(pool, params.amountIn)
+    );
+    for (const addr of tickArrayAddresses) {
+      remainingAccounts.push({
+        address: addr,
+        role: import_kit55.AccountRole.WRITABLE
+      });
+    }
+    return {
+      ...baseInstruction,
+      accounts: [...baseInstruction.accounts, ...remainingAccounts]
+    };
   }
   async getCurrentPrice(poolAddress, options) {
     const pool = await this.poolDataManager.getPoolState(poolAddress, options);
@@ -11451,6 +11539,7 @@ var DEFAULT_SDK_CONFIG = {
   Q64,
   SLIPPAGE_CALC,
   STABBLE_CLMM_PROGRAM_ID,
+  STABBLE_CLMM_QAS_PROGRAM_ID,
   SYSTEM_PROGRAM_ID,
   SYSVAR_RENT_PROGRAM_ID,
   SqrtPriceMath,