@meteora-ag/cp-amm-sdk 1.0.1-rc.28 → 1.0.1-rc.29

package/dist/index.js

@@ -6355,23 +6355,6 @@ var cp_amm_default = {
 
 var _web3js = require('@solana/web3.js');
 
-// src/constants.ts
-
-
-var CP_AMM_PROGRAM_ID = new (0, _web3js.PublicKey)(
-  "cpamdpZCGKUy5JxQXB4dcpGPiikHawvSWAd6mEn1sGG"
-);
-var LIQUIDITY_SCALE = 128;
-var SCALE_OFFSET = 64;
-var BASIS_POINT_MAX = 1e4;
-var MAX_FEE_NUMERATOR = 5e8;
-var FEE_DENOMINATOR = 1e9;
-var PRECISION = 1e6;
-var MIN_SQRT_PRICE = new (0, _anchor.BN)("4295048016");
-var MAX_SQRT_PRICE = new (0, _anchor.BN)("79226673521066979257578248091");
-var MIN_CU_BUFFER = 5e4;
-var MAX_CU_BUFFER = 2e5;
-
 // src/types.ts
 var Rounding = /* @__PURE__ */ ((Rounding2) => {
   Rounding2[Rounding2["Up"] = 0] = "Up";
@@ -6406,6 +6389,25 @@ var ActivationType = /* @__PURE__ */ ((ActivationType2) => {
 
 // src/pda.ts
 
+
+// src/constants.ts
+
+
+var CP_AMM_PROGRAM_ID = new (0, _web3js.PublicKey)(
+  "cpamdpZCGKUy5JxQXB4dcpGPiikHawvSWAd6mEn1sGG"
+);
+var LIQUIDITY_SCALE = 128;
+var SCALE_OFFSET = 64;
+var BASIS_POINT_MAX = 1e4;
+var MAX_FEE_NUMERATOR = 5e8;
+var FEE_DENOMINATOR = 1e9;
+var PRECISION = 1e6;
+var MIN_SQRT_PRICE = new (0, _anchor.BN)("4295048016");
+var MAX_SQRT_PRICE = new (0, _anchor.BN)("79226673521066979257578248091");
+var MIN_CU_BUFFER = 5e4;
+var MAX_CU_BUFFER = 2e5;
+
+// src/pda.ts
 function getFirstKey(key1, key2) {
   const buf1 = key1.toBuffer();
   const buf2 = key2.toBuffer();
@@ -6422,19 +6424,19 @@ function getSecondKey(key1, key2) {
   }
   return buf1;
 }
-function derivePoolAuthority(programId) {
+function derivePoolAuthority() {
   return _web3js.PublicKey.findProgramAddressSync(
     [Buffer.from("pool_authority")],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
-function deriveConfigAddress(index, programId) {
+function deriveConfigAddress(index) {
   return _web3js.PublicKey.findProgramAddressSync(
     [Buffer.from("config"), index.toArrayLike(Buffer, "le", 8)],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
-function derivePoolAddress(config, tokenAMint, tokenBMint, programId) {
+function derivePoolAddress(config, tokenAMint, tokenBMint) {
   return _web3js.PublicKey.findProgramAddressSync(
     [
       Buffer.from("pool"),
@@ -6442,69 +6444,64 @@ function derivePoolAddress(config, tokenAMint, tokenBMint, programId) {
       getFirstKey(tokenAMint, tokenBMint),
       getSecondKey(tokenAMint, tokenBMint)
     ],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
-function derivePositionAddress(positionNft, programId) {
+function derivePositionAddress(positionNft) {
   return _web3js.PublicKey.findProgramAddressSync(
     [Buffer.from("position"), positionNft.toBuffer()],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
-function deriveTokenVaultAddress(tokenMint, pool, programId) {
+function deriveTokenVaultAddress(tokenMint, pool) {
   return _web3js.PublicKey.findProgramAddressSync(
     [Buffer.from("token_vault"), tokenMint.toBuffer(), pool.toBuffer()],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
-function deriveRewardVaultAddress(pool, rewardIndex, programId) {
+function deriveRewardVaultAddress(pool, rewardIndex) {
   return _web3js.PublicKey.findProgramAddressSync(
     [Buffer.from("reward_vault"), pool.toBuffer(), Buffer.from([rewardIndex])],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
-function deriveCustomizablePoolAddress(tokenAMint, tokenBMint, programId) {
+function deriveCustomizablePoolAddress(tokenAMint, tokenBMint) {
   return _web3js.PublicKey.findProgramAddressSync(
     [
       Buffer.from("cpool"),
       getFirstKey(tokenAMint, tokenBMint),
       getSecondKey(tokenAMint, tokenBMint)
     ],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
-function deriveTokenBadgeAddress(tokenMint, programId) {
+function deriveTokenBadgeAddress(tokenMint) {
   return _web3js.PublicKey.findProgramAddressSync(
     [Buffer.from("token_badge"), tokenMint.toBuffer()],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
-function deriveClaimFeeOperatorAddress(operator, programId) {
+function deriveClaimFeeOperatorAddress(operator) {
   return _web3js.PublicKey.findProgramAddressSync(
     [Buffer.from("cf_operator"), operator.toBuffer()],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
-function derivePositionNftAccount(positionNftMint, programId) {
+function derivePositionNftAccount(positionNftMint) {
   return _web3js.PublicKey.findProgramAddressSync(
     [Buffer.from("position_nft_account"), positionNftMint.toBuffer()],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
-function deriveEventAuthority(programId) {
-  return _web3js.PublicKey.findProgramAddressSync(
-    [Buffer.from("__event_authority")],
-    programId
-  );
-}
-function deriveTokenBadge(tokenMint, programId) {
+function deriveTokenBadge(tokenMint) {
   return _web3js.PublicKey.findProgramAddressSync(
     [Buffer.from("token_badge"), tokenMint.toBuffer()],
-    programId
+    CP_AMM_PROGRAM_ID
   )[0];
 }
 
 // src/helpers/token.ts
+var _bytes = require('@coral-xyz/anchor/dist/cjs/utils/bytes');
 
 
 
@@ -6603,19 +6600,38 @@ function getNftOwner(connection, nftMint) {
     return new (0, _web3js.PublicKey)(owner);
   });
 }
-function getAllNftByUser(_0, _1) {
-  return __async(this, arguments, function* (connection, user, tokenProgram = _spltoken.TOKEN_2022_PROGRAM_ID) {
-    const allUserTokenAccounts = yield connection.getTokenAccountsByOwner(user, {
-      programId: tokenProgram
-    });
-    const userNfts = [];
-    for (const { account } of allUserTokenAccounts.value) {
-      const tokenAccountData = _spltoken.AccountLayout.decode(account.data);
-      if (tokenAccountData.amount.toString() === "1") {
-        userNfts.push(tokenAccountData.mint.toString());
+function getAllUserPositionNftAccount(connection, user) {
+  return __async(this, null, function* () {
+    const filters = [
+      {
+        memcmp: {
+          offset: 32,
+          bytes: user.toBase58()
+        }
+      },
+      {
+        memcmp: {
+          offset: 64,
+          bytes: _bytes.bs58.encode(Buffer.from([1, 0, 0, 0, 0, 0, 0, 0]))
+          // 1
+        }
       }
+    ];
+    const tokenAccountsRaw = yield connection.getProgramAccounts(
+      _spltoken.TOKEN_2022_PROGRAM_ID,
+      {
+        filters
+      }
+    );
+    const userPositionNftAccount = [];
+    for (const { account, pubkey } of tokenAccountsRaw) {
+      const tokenAccountData = _spltoken.AccountLayout.decode(account.data);
+      userPositionNftAccount.push({
+        positionNft: tokenAccountData.mint,
+        positionNftAccount: pubkey
+      });
     }
-    return userNfts;
+    return userPositionNftAccount;
   });
 }
 
@@ -7007,11 +7023,20 @@ var getPriceImpact = (actualAmount, idealAmount) => {
   const diff = idealAmount.sub(actualAmount);
   return new (0, _decimaljs2.default)(diff.toString()).div(new (0, _decimaljs2.default)(idealAmount.toString())).mul(100).toNumber();
 };
-var getCurrentPrice = (sqrtPrice, tokenADecimal, tokenBDecimal) => {
+var getPriceFromSqrtPrice = (sqrtPrice, tokenADecimal, tokenBDecimal) => {
   const decimalSqrtPrice = new (0, _decimaljs2.default)(sqrtPrice.toString());
   const price = decimalSqrtPrice.mul(decimalSqrtPrice).mul(new (0, _decimaljs2.default)(__pow(10, tokenADecimal - tokenBDecimal))).div(_decimaljs2.default.pow(2, 128)).toString();
   return price;
 };
+var getSqrtPriceFromPrice = (price, tokenADecimal, tokenBDecimal) => {
+  const decimalPrice = new (0, _decimaljs2.default)(price);
+  const adjustedByDecimals = decimalPrice.div(
+    new (0, _decimaljs2.default)(__pow(10, tokenADecimal - tokenBDecimal))
+  );
+  const sqrtValue = _decimaljs2.default.sqrt(adjustedByDecimals);
+  const sqrtValueQ64 = sqrtValue.mul(_decimaljs2.default.pow(2, 64));
+  return new (0, _anchor.BN)(sqrtValueQ64.floor().toFixed());
+};
 var getUnClaimReward = (poolState, positionState) => {
   const totalPositionLiquidity = positionState.unlockedLiquidity.add(positionState.vestedLiquidity).add(positionState.permanentLockedLiquidity);
   const feeAPerTokenStored = new (0, _anchor.BN)(
@@ -7163,6 +7188,7 @@ var CpAmm = class {
     this._program = new (0, _anchor.Program)(cp_amm_default, {
       connection
     });
+    this.poolAuthority = derivePoolAuthority();
   }
   /**
    * Returns the Anchor program instance.
@@ -7171,46 +7197,6 @@ var CpAmm = class {
   getProgram() {
     return this._program;
   }
-  /**
-   * Prepares parameters required for pool creation, including initial sqrt price and liquidity.
-   * @private
-   * @param {PreparePoolCreationParams} params - Initial token amounts for pool creation.
-   * @returns init sqrt price and liquidity in Q64 format.
-   */
-  preparePoolCreationParams(params) {
-    return __async(this, null, function* () {
-      const { tokenAAmount, tokenBAmount, minSqrtPrice, maxSqrtPrice } = params;
-      if (tokenAAmount.eq(new (0, _anchor.BN)(0)) && tokenBAmount.eq(new (0, _anchor.BN)(0))) {
-        throw new Error("Invalid input amount");
-      }
-      if (minSqrtPrice.gt(maxSqrtPrice)) {
-        throw new Error("Invalid sqrtPrice");
-      }
-      const sqrtPriceQ64 = calculateInitSqrtPrice(
-        tokenAAmount,
-        tokenBAmount,
-        minSqrtPrice,
-        maxSqrtPrice
-      );
-      const liquidityDeltaFromAmountA = getLiquidityDeltaFromAmountA(
-        tokenAAmount,
-        sqrtPriceQ64,
-        maxSqrtPrice
-      );
-      const liquidityDeltaFromAmountB = getLiquidityDeltaFromAmountB(
-        tokenBAmount,
-        minSqrtPrice,
-        sqrtPriceQ64
-      );
-      const liquidityQ64 = liquidityDeltaFromAmountA.gte(
-        liquidityDeltaFromAmountB
-      ) ? liquidityDeltaFromAmountB : liquidityDeltaFromAmountA;
-      return {
-        sqrtPriceQ64,
-        liquidityQ64
-      };
-    });
-  }
   /**
    * Prepares token accounts for a transaction by retrieving or creating associated token accounts.
    * @private
@@ -7260,12 +7246,12 @@ var CpAmm = class {
   getTokenBadgeAccounts(tokenAMint, tokenBMint) {
     return [
       {
-        pubkey: deriveTokenBadge(tokenAMint, this._program.programId),
+        pubkey: deriveTokenBadge(tokenAMint),
         isWritable: false,
         isSigner: false
       },
       {
-        pubkey: deriveTokenBadge(tokenBMint, this._program.programId),
+        pubkey: deriveTokenBadge(tokenBMint),
         isWritable: false,
         isSigner: false
       }
@@ -7516,35 +7502,47 @@ var CpAmm = class {
    */
   getUserPositionByPool(pool, user) {
     return __async(this, null, function* () {
-      const positions = yield this._program.account.position.all([
-        positionByPoolFilter(pool)
-      ]);
-      const userNfts = yield getAllNftByUser(
-        this._program.provider.connection,
-        user
+      const allUserPositions = yield this.getPositionsByUser(user);
+      return allUserPositions.filter(
+        (position) => position.positionState.pool.equals(pool)
       );
-      const result = positions.filter(
-        (item) => userNfts.includes(item.account.nftMint.toString())
-      );
-      return result;
     });
   }
   /**
    * Gets all positions of a user across all pools.
    * @param user - Public key of the user.
-   * @returns Array of user positions.
+   * @returns Array of user positions already sorted by liquidity
    */
   getPositionsByUser(user) {
     return __async(this, null, function* () {
-      const userNfts = yield getAllNftByUser(
+      const userPositionAccounts = yield getAllUserPositionNftAccount(
         this._program.provider.connection,
         user
       );
-      const positions = yield this._program.account.position.all();
-      const result = positions.filter(
-        (item) => userNfts.includes(item.account.nftMint.toString())
+      if (userPositionAccounts.length === 0) {
+        return [];
+      }
+      const positionAddresses = userPositionAccounts.map(
+        (account) => derivePositionAddress(account.positionNft)
       );
-      return result;
+      const positionStates = yield this._program.account.position.fetchMultiple(
+        positionAddresses
+      );
+      const positionResult = userPositionAccounts.map((account, index) => {
+        const positionState = positionStates[index];
+        if (!positionState) return null;
+        return {
+          positionNftAccount: account.positionNftAccount,
+          position: positionAddresses[index],
+          positionState
+        };
+      }).filter(Boolean);
+      positionResult.sort((a, b) => {
+        const totalLiquidityA = a.positionState.vestedLiquidity.add(a.positionState.permanentLockedLiquidity).add(a.positionState.unlockedLiquidity);
+        const totalLiquidityB = b.positionState.vestedLiquidity.add(b.positionState.permanentLockedLiquidity).add(b.positionState.unlockedLiquidity);
+        return totalLiquidityB.cmp(totalLiquidityA);
+      });
+      return positionResult;
     });
   }
   getAllVestingsByPosition(position) {
@@ -7770,50 +7768,92 @@ var CpAmm = class {
     });
   }
   /**
-   * Computes the liquidity delta based on the provided token amounts and pool state.
-   *
-   * @param {LiquidityDeltaParams} params - The parameters for liquidity calculation
-   * @returns {Promise<BN>} - The computed liquidity delta in Q64 value.
+   * Calculates liquidity and corresponding token amounts for token A single-sided pool creation
+   * Only supports initialization where initial price equals min sqrt price
+   * @param params Parameters for single-sided pool creation
+   * @returns Calculated liquidity delta
    */
-  getLiquidityDelta(params) {
-    return __async(this, null, function* () {
-      const {
-        maxAmountTokenA,
-        maxAmountTokenB,
-        sqrtMaxPrice,
-        sqrtMinPrice,
-        sqrtPrice,
-        tokenAInfo,
-        tokenBInfo
-      } = params;
-      let actualMaxAmountTokenA = maxAmountTokenA;
-      let actualMaxAmountTokenB = maxAmountTokenB;
-      if (tokenAInfo) {
-        actualMaxAmountTokenA = calculateTransferFeeExcludedAmount(
-          maxAmountTokenA,
-          tokenAInfo.mint,
-          tokenAInfo.currentEpoch
-        ).amount;
-      }
-      if (tokenBInfo) {
-        actualMaxAmountTokenB = calculateTransferFeeExcludedAmount(
-          maxAmountTokenB,
-          tokenBInfo.mint,
-          tokenBInfo.currentEpoch
-        ).amount;
-      }
-      const liquidityDeltaFromAmountA = getLiquidityDeltaFromAmountA(
-        actualMaxAmountTokenA,
-        sqrtPrice,
-        sqrtMaxPrice
-      );
-      const liquidityDeltaFromAmountB = getLiquidityDeltaFromAmountB(
-        actualMaxAmountTokenB,
-        sqrtMinPrice,
-        sqrtPrice
-      );
-      return _bnjs.min.call(void 0, liquidityDeltaFromAmountA, liquidityDeltaFromAmountB);
-    });
+  preparePoolCreationSingleSide(params) {
+    const {
+      tokenAAmount,
+      initSqrtPrice,
+      minSqrtPrice,
+      maxSqrtPrice,
+      tokenAInfo
+    } = params;
+    if (!initSqrtPrice.eq(minSqrtPrice)) {
+      throw new Error("Only support single side for base token.");
+    }
+    const actualAmountIn = tokenAInfo ? tokenAAmount.sub(
+      calculateTransferFeeIncludedAmount(
+        tokenAAmount,
+        tokenAInfo.mint,
+        tokenAInfo.currentEpoch
+      ).transferFee
+    ) : tokenAAmount;
+    const liquidityDelta = getLiquidityDeltaFromAmountA(
+      actualAmountIn,
+      initSqrtPrice,
+      maxSqrtPrice
+    );
+    return liquidityDelta;
+  }
+  /**
+   * Prepares parameters required for pool creation, including initial sqrt price and liquidity.
+   * @private
+   * @param {PreparePoolCreationParams} params - Initial token amounts for pool creation.
+   * @returns init sqrt price and liquidity in Q64 format.
+   */
+  preparePoolCreationParams(params) {
+    const {
+      tokenAAmount,
+      tokenBAmount,
+      minSqrtPrice,
+      maxSqrtPrice,
+      tokenAInfo,
+      tokenBInfo
+    } = params;
+    if (tokenAAmount.eq(new (0, _anchor.BN)(0)) && tokenBAmount.eq(new (0, _anchor.BN)(0))) {
+      throw new Error("Invalid input amount");
+    }
+    const actualAmountAIn = tokenAInfo ? tokenAAmount.sub(
+      calculateTransferFeeIncludedAmount(
+        tokenAAmount,
+        tokenAInfo.mint,
+        tokenAInfo.currentEpoch
+      ).transferFee
+    ) : tokenAAmount;
+    const actualAmountBIn = tokenBInfo ? tokenAAmount.sub(
+      calculateTransferFeeIncludedAmount(
+        tokenBAmount,
+        tokenBInfo.mint,
+        tokenBInfo.currentEpoch
+      ).transferFee
+    ) : tokenAAmount;
+    const initSqrtPrice = calculateInitSqrtPrice(
+      tokenAAmount,
+      tokenBAmount,
+      minSqrtPrice,
+      maxSqrtPrice
+    );
+    const liquidityDeltaFromAmountA = getLiquidityDeltaFromAmountA(
+      actualAmountAIn,
+      initSqrtPrice,
+      maxSqrtPrice
+    );
+    const liquidityDeltaFromAmountB = getLiquidityDeltaFromAmountB(
+      actualAmountBIn,
+      minSqrtPrice,
+      initSqrtPrice
+    );
+    const liquidityDelta = _bnjs.min.call(void 0, 
+      liquidityDeltaFromAmountA,
+      liquidityDeltaFromAmountB
+    );
+    return {
+      initSqrtPrice,
+      liquidityDelta
+    };
   }
   /**
    * Builds a transaction to create a permissionless pool.
@@ -7829,51 +7869,19 @@ var CpAmm = class {
         positionNft,
         tokenAMint,
         tokenBMint,
+        initSqrtPrice,
+        liquidityDelta,
         activationPoint,
         tokenAAmount,
         tokenBAmount,
-        minSqrtPrice,
-        maxSqrtPrice,
-        tokenADecimal,
-        tokenBDecimal,
         tokenAProgram,
         tokenBProgram
       } = params;
-      const { sqrtPriceQ64, liquidityQ64 } = yield this.preparePoolCreationParams(
-        {
-          tokenAAmount,
-          tokenBAmount,
-          minSqrtPrice,
-          maxSqrtPrice,
-          tokenADecimal,
-          tokenBDecimal
-        }
-      );
-      const poolAuthority = derivePoolAuthority(this._program.programId);
-      const pool = derivePoolAddress(
-        config,
-        tokenAMint,
-        tokenBMint,
-        this._program.programId
-      );
-      const position = derivePositionAddress(
-        positionNft,
-        this._program.programId
-      );
-      const positionNftAccount = derivePositionNftAccount(
-        positionNft,
-        this._program.programId
-      );
-      const tokenAVault = deriveTokenVaultAddress(
-        tokenAMint,
-        pool,
-        this._program.programId
-      );
-      const tokenBVault = deriveTokenVaultAddress(
-        tokenBMint,
-        pool,
-        this._program.programId
-      );
+      const pool = derivePoolAddress(config, tokenAMint, tokenBMint);
+      const position = derivePositionAddress(positionNft);
+      const positionNftAccount = derivePositionNftAccount(positionNft);
+      const tokenAVault = deriveTokenVaultAddress(tokenAMint, pool);
+      const tokenBVault = deriveTokenVaultAddress(tokenBMint, pool);
       const {
         tokenAAta: payerTokenA,
         tokenBAta: payerTokenB,
@@ -7906,8 +7914,8 @@ var CpAmm = class {
         tokenBMint
       );
       const tx = yield this._program.methods.initializePool({
-        liquidity: liquidityQ64,
-        sqrtPrice: sqrtPriceQ64,
+        liquidity: liquidityDelta,
+        sqrtPrice: initSqrtPrice,
         activationPoint
       }).accountsPartial({
         creator,
@@ -7915,7 +7923,7 @@ var CpAmm = class {
         positionNftMint: positionNft,
         payer,
         config,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool,
         position,
         tokenAMint,
@@ -7944,10 +7952,10 @@ var CpAmm = class {
         tokenBMint,
         tokenAAmount,
         tokenBAmount,
-        minSqrtPrice,
-        maxSqrtPrice,
-        tokenADecimal,
-        tokenBDecimal,
+        sqrtMinPrice,
+        sqrtMaxPrice,
+        liquidityDelta,
+        initSqrtPrice,
         payer,
         creator,
         positionNft,
@@ -7959,40 +7967,11 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram
       } = params;
-      const { sqrtPriceQ64, liquidityQ64 } = yield this.preparePoolCreationParams(
-        {
-          tokenAAmount,
-          tokenBAmount,
-          minSqrtPrice,
-          maxSqrtPrice,
-          tokenADecimal,
-          tokenBDecimal
-        }
-      );
-      const poolAuthority = derivePoolAuthority(this._program.programId);
-      const pool = deriveCustomizablePoolAddress(
-        tokenAMint,
-        tokenBMint,
-        this._program.programId
-      );
-      const position = derivePositionAddress(
-        positionNft,
-        this._program.programId
-      );
-      const positionNftAccount = derivePositionNftAccount(
-        positionNft,
-        this._program.programId
-      );
-      const tokenAVault = deriveTokenVaultAddress(
-        tokenAMint,
-        pool,
-        this._program.programId
-      );
-      const tokenBVault = deriveTokenVaultAddress(
-        tokenBMint,
-        pool,
-        this._program.programId
-      );
+      const pool = deriveCustomizablePoolAddress(tokenAMint, tokenBMint);
+      const position = derivePositionAddress(positionNft);
+      const positionNftAccount = derivePositionNftAccount(positionNft);
+      const tokenAVault = deriveTokenVaultAddress(tokenAMint, pool);
+      const tokenBVault = deriveTokenVaultAddress(tokenBMint, pool);
       const {
         tokenAAta: payerTokenA,
         tokenBAta: payerTokenB,
@@ -8026,11 +8005,11 @@ var CpAmm = class {
       );
       const transaction = yield this._program.methods.initializeCustomizablePool({
         poolFees,
-        sqrtMinPrice: MIN_SQRT_PRICE,
-        sqrtMaxPrice: MAX_SQRT_PRICE,
+        sqrtMinPrice,
+        sqrtMaxPrice,
         hasAlphaVault,
-        liquidity: liquidityQ64,
-        sqrtPrice: sqrtPriceQ64,
+        liquidity: liquidityDelta,
+        sqrtPrice: initSqrtPrice,
         activationType,
         collectFeeMode,
         activationPoint
@@ -8039,7 +8018,7 @@ var CpAmm = class {
         positionNftAccount,
         positionNftMint: positionNft,
         payer,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool,
         position,
         tokenAMint,
@@ -8064,19 +8043,12 @@ var CpAmm = class {
   createPosition(params) {
     return __async(this, null, function* () {
       const { owner, payer, pool, positionNft } = params;
-      const poolAuthority = derivePoolAuthority(this._program.programId);
-      const position = derivePositionAddress(
-        positionNft,
-        this._program.programId
-      );
-      const positionNftAccount = derivePositionNftAccount(
-        positionNft,
-        this._program.programId
-      );
+      const position = derivePositionAddress(positionNft);
+      const positionNftAccount = derivePositionNftAccount(positionNft);
       return yield this._program.methods.createPosition().accountsPartial({
         owner,
         positionNftMint: positionNft,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         positionNftAccount,
         payer,
         pool,
@@ -8097,8 +8069,8 @@ var CpAmm = class {
         owner,
         pool,
         position,
-        positionNftMint,
-        liquidityDeltaQ64,
+        positionNftAccount,
+        liquidityDelta,
         maxAmountTokenA,
         maxAmountTokenB,
         tokenAAmountThreshold,
@@ -8110,10 +8082,6 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram
       } = params;
-      const positionNftAccount = derivePositionNftAccount(
-        positionNftMint,
-        this._program.programId
-      );
       const {
         tokenAAta: tokenAAccount,
         tokenBAta: tokenBAccount,
@@ -8161,7 +8129,7 @@ var CpAmm = class {
         tokenBVault,
         tokenAProgram,
         tokenBProgram,
-        liquidityDelta: liquidityDeltaQ64,
+        liquidityDelta,
         tokenAAmountThreshold,
         tokenBAmountThreshold
       });
@@ -8185,8 +8153,8 @@ var CpAmm = class {
         owner,
         pool,
         position,
-        positionNftMint,
-        liquidityDeltaQ64,
+        positionNftAccount,
+        liquidityDelta,
         tokenAAmountThreshold,
         tokenBAmountThreshold,
         tokenAMint,
@@ -8196,11 +8164,6 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram
       } = params;
-      const positionNftAccount = derivePositionNftAccount(
-        positionNftMint,
-        this._program.programId
-      );
-      const poolAuthority = derivePoolAuthority(this._program.programId);
       const {
         tokenAAta: tokenAAccount,
         tokenBAta: tokenBAccount,
@@ -8220,11 +8183,11 @@ var CpAmm = class {
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
       return yield this._program.methods.removeLiquidity({
-        liquidityDelta: liquidityDeltaQ64,
+        liquidityDelta,
         tokenAAmountThreshold,
         tokenBAmountThreshold
       }).accountsPartial({
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool,
         position,
         positionNftAccount,
@@ -8251,7 +8214,7 @@ var CpAmm = class {
         owner,
         pool,
         position,
-        positionNftMint,
+        positionNftAccount,
         tokenAAmountThreshold,
         tokenBAmountThreshold,
         tokenAMint,
@@ -8261,11 +8224,6 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram
       } = params;
-      const positionNftAccount = derivePositionNftAccount(
-        positionNftMint,
-        this._program.programId
-      );
-      const poolAuthority = derivePoolAuthority(this._program.programId);
       const {
         tokenAAta: tokenAAccount,
         tokenBAta: tokenBAccount,
@@ -8285,7 +8243,7 @@ var CpAmm = class {
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
       const removeAllLiquidityInstruction = yield this.buildRemoveAllLiquidityInstruction({
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         owner,
         pool,
         position,
@@ -8332,7 +8290,6 @@ var CpAmm = class {
         tokenBProgram,
         referralTokenAccount
       } = params;
-      const poolAuthority = derivePoolAuthority(this._program.programId);
       const [inputTokenProgram, outputTokenProgram] = inputTokenMint.equals(
         tokenAMint
       ) ? [tokenAProgram, tokenBProgram] : [tokenBProgram, tokenAProgram];
@@ -8366,7 +8323,7 @@ var CpAmm = class {
         amountIn,
         minimumAmountOut
       }).accountsPartial({
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool,
         payer,
         inputTokenAccount,
@@ -8394,17 +8351,13 @@ var CpAmm = class {
         payer,
         vestingAccount,
         position,
-        positionNftMint,
+        positionNftAccount,
         cliffPoint,
         periodFrequency,
         cliffUnlockLiquidity,
         liquidityPerPeriod,
         numberOfPeriod
       } = params;
-      const positionNftAccount = derivePositionNftAccount(
-        positionNftMint,
-        this._program.programId
-      );
       const lockPositionParams = {
         cliffPoint,
         periodFrequency,
@@ -8430,11 +8383,7 @@ var CpAmm = class {
    */
   permanentLockPosition(params) {
     return __async(this, null, function* () {
-      const { owner, position, positionNftMint, pool, unlockedLiquidity } = params;
-      const positionNftAccount = derivePositionNftAccount(
-        positionNftMint,
-        this._program.programId
-      );
+      const { owner, position, positionNftAccount, pool, unlockedLiquidity } = params;
       return yield this._program.methods.permanentLockPosition(unlockedLiquidity).accountsPartial({
         position,
         positionNftAccount,
@@ -8450,11 +8399,7 @@ var CpAmm = class {
    */
   refreshVesting(params) {
     return __async(this, null, function* () {
-      const { owner, position, positionNftMint, pool, vestings } = params;
-      const positionNftAccount = derivePositionNftAccount(
-        positionNftMint,
-        this._program.programId
-      );
+      const { owner, position, positionNftAccount, pool, vestings } = params;
       return yield this._program.methods.refreshVesting().accountsPartial({
         position,
         positionNftAccount,
@@ -8482,7 +8427,7 @@ var CpAmm = class {
         owner,
         pool,
         position,
-        nftPositionMint,
+        positionNftAccount,
         tokenAVault,
         tokenBVault,
         tokenAMint,
@@ -8490,11 +8435,6 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram
       } = params;
-      const positionNftAccount = derivePositionNftAccount(
-        nftPositionMint,
-        this._program.programId
-      );
-      const poolAuthority = derivePoolAuthority(this._program.programId);
       const {
         tokenAAta: tokenAAccount,
         tokenBAta: tokenBAccount,
@@ -8515,7 +8455,7 @@ var CpAmm = class {
       }
       const claimPositionFeeInstruction = yield this.buildClaimPositionFeeInstruction({
         owner,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool,
         position,
         positionNftAccount,
@@ -8539,15 +8479,10 @@ var CpAmm = class {
   }
   closePosition(params) {
     return __async(this, null, function* () {
-      const { owner, pool, position, positionNftMint } = params;
-      const poolAuthority = derivePoolAuthority(this._program.programId);
-      const positionNftAccount = derivePositionNftAccount(
-        positionNftMint,
-        this._program.programId
-      );
+      const { owner, pool, position, positionNftMint, positionNftAccount } = params;
       const instruction = yield this.buildClosePositionInstruction({
         owner,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool,
         position,
         positionNftMint,
@@ -8572,6 +8507,7 @@ var CpAmm = class {
       const {
         owner,
         position,
+        positionNftAccount,
         positionState,
         poolState,
         tokenAAmountThreshold,
@@ -8583,11 +8519,6 @@ var CpAmm = class {
       if (isLockedPosition) {
         throw Error("position must be unlocked");
       }
-      const positionNftAccount = derivePositionNftAccount(
-        positionNftMint,
-        this._program.programId
-      );
-      const poolAuthority = derivePoolAuthority(this._program.programId);
       const tokenAProgram = getTokenProgram(poolState.tokenAFlag);
       const tokenBProgram = getTokenProgram(poolState.tokenBFlag);
       const {
@@ -8614,7 +8545,7 @@ var CpAmm = class {
       }
       const claimPositionFeeInstruction = yield this.buildClaimPositionFeeInstruction({
         owner,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool,
         position,
         positionNftAccount,
@@ -8629,7 +8560,7 @@ var CpAmm = class {
       });
       transaction.add(claimPositionFeeInstruction);
       const removeAllLiquidityInstruction = yield this.buildRemoveAllLiquidityInstruction({
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         owner,
         pool,
         position,
@@ -8648,7 +8579,7 @@ var CpAmm = class {
       transaction.add(removeAllLiquidityInstruction);
       const closePositionInstruction = yield this.buildClosePositionInstruction({
         owner,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool,
         position,
         positionNftMint,
@@ -8680,10 +8611,13 @@ var CpAmm = class {
         positionA,
         positionB,
         positionBState,
-        positionAState,
         poolState,
-        tokenAAmountThreshold,
-        tokenBAmountThreshold
+        positionBNftAccount,
+        positionANftAccount,
+        tokenAAmountAddLiquidityThreshold,
+        tokenBAmountAddLiquidityThreshold,
+        tokenAAmountRemoveLiquidityThreshold,
+        tokenBAmountRemoveLiquidityThreshold
       } = params;
       const isLockedPosition = this.isLockedPosition(positionBState);
       if (isLockedPosition) {
@@ -8692,15 +8626,6 @@ var CpAmm = class {
       const postionBLiquidityDelta = positionBState.unlockedLiquidity;
       const pool = positionBState.pool;
       const { tokenAMint, tokenBMint, tokenAVault, tokenBVault } = poolState;
-      const positionBNftAccount = derivePositionNftAccount(
-        positionBState.nftMint,
-        this._program.programId
-      );
-      const positionANftAccount = derivePositionNftAccount(
-        positionAState.nftMint,
-        this._program.programId
-      );
-      const poolAuthority = derivePoolAuthority(this._program.programId);
       const tokenAProgram = getTokenProgram(poolState.tokenAFlag);
       const tokenBProgram = getTokenProgram(poolState.tokenBFlag);
       const {
@@ -8727,7 +8652,7 @@ var CpAmm = class {
       }
       const claimPositionFeeInstruction = yield this.buildClaimPositionFeeInstruction({
         owner,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool,
         position: positionB,
         positionNftAccount: positionBNftAccount,
@@ -8742,15 +8667,15 @@ var CpAmm = class {
       });
       transaction.add(claimPositionFeeInstruction);
       const removeAllLiquidityInstruction = yield this.buildRemoveAllLiquidityInstruction({
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         owner,
         pool,
         position: positionB,
         positionNftAccount: positionBNftAccount,
         tokenAAccount,
         tokenBAccount,
-        tokenAAmountThreshold,
-        tokenBAmountThreshold,
+        tokenAAmountThreshold: tokenAAmountRemoveLiquidityThreshold,
+        tokenBAmountThreshold: tokenBAmountRemoveLiquidityThreshold,
         tokenAMint,
         tokenBMint,
         tokenAVault,
@@ -8773,13 +8698,13 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram,
         liquidityDelta: postionBLiquidityDelta,
-        tokenAAmountThreshold,
-        tokenBAmountThreshold
+        tokenAAmountThreshold: tokenAAmountAddLiquidityThreshold,
+        tokenBAmountThreshold: tokenBAmountAddLiquidityThreshold
       });
       transaction.add(addLiquidityInstruction);
       const closePositionInstruction = yield this.buildClosePositionInstruction({
         owner,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool: positionBState.pool,
         position: positionB,
         positionNftMint: positionBState.nftMint,
@@ -8868,7 +8793,6 @@ var CpAmm = class {
   withdrawIneligibleReward(params) {
     return __async(this, null, function* () {
       const { rewardIndex, pool, funder } = params;
-      const poolAuthority = derivePoolAuthority(this._program.programId);
       const poolState = yield this.fetchPoolState(pool);
       const rewardInfo = poolState.rewardInfos[rewardIndex];
       const { mint, vault, rewardTokenFlag } = rewardInfo;
@@ -8892,7 +8816,7 @@ var CpAmm = class {
         pool,
         rewardVault: vault,
         rewardMint: mint,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         funderTokenAccount,
         funder,
         tokenProgram
@@ -8916,7 +8840,6 @@ var CpAmm = class {
         tokenAFlag,
         tokenBFlag
       } = poolState;
-      const poolAuthority = derivePoolAuthority(this._program.programId);
       const tokenAProgram = getTokenProgram(tokenAFlag);
       const tokenBProgram = getTokenProgram(tokenBFlag);
       const {
@@ -8939,7 +8862,7 @@ var CpAmm = class {
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
       return yield this._program.methods.claimPartnerFee(maxAmountA, maxAmountB).accountsPartial({
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         pool,
         tokenAAccount,
         tokenBAccount,
@@ -8960,14 +8883,14 @@ var CpAmm = class {
    */
   claimReward(params) {
     return __async(this, null, function* () {
-      const { user, position, rewardIndex } = params;
-      const poolAuthority = derivePoolAuthority(this._program.programId);
-      const positionState = yield this.fetchPositionState(position);
-      const poolState = yield this.fetchPoolState(positionState.pool);
-      const positionNftAccount = derivePositionNftAccount(
-        positionState.nftMint,
-        this._program.programId
-      );
+      const {
+        user,
+        position,
+        positionNftAccount,
+        rewardIndex,
+        poolState,
+        positionState
+      } = params;
       const rewardInfo = poolState.rewardInfos[rewardIndex];
       const tokenProgram = getTokenProgram(rewardInfo.rewardTokenFlag);
       const preInstructions = [];
@@ -8990,7 +8913,7 @@ var CpAmm = class {
         positionNftAccount,
         rewardVault: rewardInfo.vault,
         rewardMint: rewardInfo.mint,
-        poolAuthority,
+        poolAuthority: this.poolAuthority,
         position,
         userTokenAccount,
         owner: user,
@@ -9075,5 +8998,5 @@ var index_default = cp_amm_default;
 
 
 
-exports.ActivationPoint = ActivationPoint; exports.ActivationType = ActivationType; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.CP_AMM_PROGRAM_ID = CP_AMM_PROGRAM_ID; exports.CollectFeeMode = CollectFeeMode; exports.CpAmm = CpAmm; exports.FEE_DENOMINATOR = FEE_DENOMINATOR; exports.FeeSchedulerMode = FeeSchedulerMode; exports.LIQUIDITY_SCALE = LIQUIDITY_SCALE; exports.MAX_CU_BUFFER = MAX_CU_BUFFER; exports.MAX_FEE_NUMERATOR = MAX_FEE_NUMERATOR; exports.MAX_SQRT_PRICE = MAX_SQRT_PRICE; exports.MIN_CU_BUFFER = MIN_CU_BUFFER; exports.MIN_SQRT_PRICE = MIN_SQRT_PRICE; exports.ONE = ONE; exports.PRECISION = PRECISION; exports.Rounding = Rounding; exports.SCALE_OFFSET = SCALE_OFFSET; exports.TradeDirection = TradeDirection; exports.calculateInitSqrtPrice = calculateInitSqrtPrice; exports.calculateTransferFeeExcludedAmount = calculateTransferFeeExcludedAmount; exports.calculateTransferFeeIncludedAmount = calculateTransferFeeIncludedAmount; exports.decimalToQ64 = decimalToQ64; exports.default = index_default; exports.deriveClaimFeeOperatorAddress = deriveClaimFeeOperatorAddress; exports.deriveConfigAddress = deriveConfigAddress; exports.deriveCustomizablePoolAddress = deriveCustomizablePoolAddress; exports.deriveEventAuthority = deriveEventAuthority; exports.derivePoolAddress = derivePoolAddress; exports.derivePoolAuthority = derivePoolAuthority; exports.derivePositionAddress = derivePositionAddress; exports.derivePositionNftAccount = derivePositionNftAccount; exports.deriveRewardVaultAddress = deriveRewardVaultAddress; exports.deriveTokenBadge = deriveTokenBadge; exports.deriveTokenBadgeAddress = deriveTokenBadgeAddress; exports.deriveTokenVaultAddress = deriveTokenVaultAddress; exports.divCeil = divCeil; exports.getAllNftByUser = getAllNftByUser; exports.getAmountAFromLiquidityDelta = getAmountAFromLiquidityDelta; exports.getAmountBFromLiquidityDelta = getAmountBFromLiquidityDelta; exports.getBaseFeeNumerator = getBaseFeeNumerator; exports.getCurrentPrice = getCurrentPrice; exports.getDeltaAmountA = getDeltaAmountA; exports.getDeltaAmountB = getDeltaAmountB; exports.getDynamicFeeNumerator = getDynamicFeeNumerator; exports.getEstimatedComputeUnitIxWithBuffer = getEstimatedComputeUnitIxWithBuffer; exports.getEstimatedComputeUnitUsageWithBuffer = getEstimatedComputeUnitUsageWithBuffer; exports.getFeeNumerator = getFeeNumerator; exports.getFirstKey = getFirstKey; exports.getLiquidityDeltaFromAmountA = getLiquidityDeltaFromAmountA; exports.getLiquidityDeltaFromAmountB = getLiquidityDeltaFromAmountB; exports.getMaxAmountWithSlippage = getMaxAmountWithSlippage; exports.getMinAmountWithSlippage = getMinAmountWithSlippage; exports.getNextSqrtPrice = getNextSqrtPrice; exports.getNftOwner = getNftOwner; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getPriceImpact = getPriceImpact; exports.getSecondKey = getSecondKey; exports.getSimulationComputeUnits = getSimulationComputeUnits; exports.getSwapAmount = getSwapAmount; exports.getTokenDecimals = getTokenDecimals; exports.getTokenProgram = getTokenProgram; exports.getUnClaimReward = getUnClaimReward; exports.mulDiv = mulDiv; exports.mulShr = mulShr; exports.positionByPoolFilter = positionByPoolFilter; exports.pow = pow; exports.q64ToDecimal = q64ToDecimal; exports.shlDiv = shlDiv; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.vestingByPositionFilter = vestingByPositionFilter; exports.wrapSOLInstruction = wrapSOLInstruction;
+exports.ActivationPoint = ActivationPoint; exports.ActivationType = ActivationType; exports.BASIS_POINT_MAX = BASIS_POINT_MAX; exports.CP_AMM_PROGRAM_ID = CP_AMM_PROGRAM_ID; exports.CollectFeeMode = CollectFeeMode; exports.CpAmm = CpAmm; exports.FEE_DENOMINATOR = FEE_DENOMINATOR; exports.FeeSchedulerMode = FeeSchedulerMode; exports.LIQUIDITY_SCALE = LIQUIDITY_SCALE; exports.MAX_CU_BUFFER = MAX_CU_BUFFER; exports.MAX_FEE_NUMERATOR = MAX_FEE_NUMERATOR; exports.MAX_SQRT_PRICE = MAX_SQRT_PRICE; exports.MIN_CU_BUFFER = MIN_CU_BUFFER; exports.MIN_SQRT_PRICE = MIN_SQRT_PRICE; exports.ONE = ONE; exports.PRECISION = PRECISION; exports.Rounding = Rounding; exports.SCALE_OFFSET = SCALE_OFFSET; exports.TradeDirection = TradeDirection; exports.calculateInitSqrtPrice = calculateInitSqrtPrice; exports.calculateTransferFeeExcludedAmount = calculateTransferFeeExcludedAmount; exports.calculateTransferFeeIncludedAmount = calculateTransferFeeIncludedAmount; exports.decimalToQ64 = decimalToQ64; exports.default = index_default; exports.deriveClaimFeeOperatorAddress = deriveClaimFeeOperatorAddress; exports.deriveConfigAddress = deriveConfigAddress; exports.deriveCustomizablePoolAddress = deriveCustomizablePoolAddress; exports.derivePoolAddress = derivePoolAddress; exports.derivePoolAuthority = derivePoolAuthority; exports.derivePositionAddress = derivePositionAddress; exports.derivePositionNftAccount = derivePositionNftAccount; exports.deriveRewardVaultAddress = deriveRewardVaultAddress; exports.deriveTokenBadge = deriveTokenBadge; exports.deriveTokenBadgeAddress = deriveTokenBadgeAddress; exports.deriveTokenVaultAddress = deriveTokenVaultAddress; exports.divCeil = divCeil; exports.getAllUserPositionNftAccount = getAllUserPositionNftAccount; exports.getAmountAFromLiquidityDelta = getAmountAFromLiquidityDelta; exports.getAmountBFromLiquidityDelta = getAmountBFromLiquidityDelta; exports.getBaseFeeNumerator = getBaseFeeNumerator; exports.getDeltaAmountA = getDeltaAmountA; exports.getDeltaAmountB = getDeltaAmountB; exports.getDynamicFeeNumerator = getDynamicFeeNumerator; exports.getEstimatedComputeUnitIxWithBuffer = getEstimatedComputeUnitIxWithBuffer; exports.getEstimatedComputeUnitUsageWithBuffer = getEstimatedComputeUnitUsageWithBuffer; exports.getFeeNumerator = getFeeNumerator; exports.getFirstKey = getFirstKey; exports.getLiquidityDeltaFromAmountA = getLiquidityDeltaFromAmountA; exports.getLiquidityDeltaFromAmountB = getLiquidityDeltaFromAmountB; exports.getMaxAmountWithSlippage = getMaxAmountWithSlippage; exports.getMinAmountWithSlippage = getMinAmountWithSlippage; exports.getNextSqrtPrice = getNextSqrtPrice; exports.getNftOwner = getNftOwner; exports.getOrCreateATAInstruction = getOrCreateATAInstruction; exports.getPriceFromSqrtPrice = getPriceFromSqrtPrice; exports.getPriceImpact = getPriceImpact; exports.getSecondKey = getSecondKey; exports.getSimulationComputeUnits = getSimulationComputeUnits; exports.getSqrtPriceFromPrice = getSqrtPriceFromPrice; exports.getSwapAmount = getSwapAmount; exports.getTokenDecimals = getTokenDecimals; exports.getTokenProgram = getTokenProgram; exports.getUnClaimReward = getUnClaimReward; exports.mulDiv = mulDiv; exports.mulShr = mulShr; exports.positionByPoolFilter = positionByPoolFilter; exports.pow = pow; exports.q64ToDecimal = q64ToDecimal; exports.shlDiv = shlDiv; exports.unwrapSOLInstruction = unwrapSOLInstruction; exports.vestingByPositionFilter = vestingByPositionFilter; exports.wrapSOLInstruction = wrapSOLInstruction;
 //# sourceMappingURL=index.js.map