@meteora-ag/cp-amm-sdk 1.0.0-rc.4 → 1.0.0-rc.5

package/dist/index.mjs

@@ -6616,6 +6616,24 @@ function getAllUserPositionNftAccount(connection, user) {
     return userPositionNftAccount;
   });
 }
+function getAllPositionNftAccountByOwner(connection, user) {
+  return __async(this, null, function* () {
+    const tokenAccounts = yield connection.getTokenAccountsByOwner(user, {
+      programId: TOKEN_2022_PROGRAM_ID
+    });
+    const userPositionNftAccount = [];
+    for (const { account, pubkey } of tokenAccounts.value) {
+      const tokenAccountData = AccountLayout.decode(account.data);
+      if (tokenAccountData.amount.toString() === "1") {
+        userPositionNftAccount.push({
+          positionNft: tokenAccountData.mint,
+          positionNftAccount: pubkey
+        });
+      }
+    }
+    return userPositionNftAccount;
+  });
+}
 
 // src/helpers/fee.ts
 import { BN as BN5 } from "@coral-xyz/anchor";
@@ -6748,7 +6766,8 @@ function getNextSqrtPrice(amount, sqrtPrice, liquidity, aToB) {
   if (aToB) {
     const product = amount.mul(sqrtPrice);
     const denominator = liquidity.add(product);
-    result = mulDiv(liquidity, sqrtPrice, denominator, 0 /* Up */);
+    const numerator = liquidity.mul(sqrtPrice);
+    result = numerator.add(denominator.sub(new BN4(1))).div(denominator);
   } else {
     const quotient = amount.shln(SCALE_OFFSET * 2).div(liquidity);
     result = sqrtPrice.add(quotient);
@@ -7485,6 +7504,34 @@ var CpAmm = class {
       return instructions;
     });
   }
+  /**
+   * Builds a instruction to create a position.
+   * @param {CreatePositionParams} params - Parameters for position creation.
+   * @returns Transaction instruction.
+   */
+  buildCreatePositionInstruction(params) {
+    return __async(this, null, function* () {
+      const { owner, payer, pool, positionNft } = params;
+      const position = derivePositionAddress(positionNft);
+      const positionNftAccount = derivePositionNftAccount(positionNft);
+      const ix = yield this._program.methods.createPosition().accountsPartial({
+        owner,
+        positionNftMint: positionNft,
+        poolAuthority: this.poolAuthority,
+        positionNftAccount,
+        payer,
+        pool,
+        position,
+        tokenProgram: TOKEN_2022_PROGRAM_ID2,
+        systemProgram: SystemProgram2.programId
+      }).instruction();
+      return {
+        ix,
+        position,
+        positionNftAccount
+      };
+    });
+  }
   /**
    * Fetches the Config state of the program.
    * @param config - Public key of the config account.
@@ -7588,7 +7635,7 @@ var CpAmm = class {
    */
   getPositionsByUser(user) {
     return __async(this, null, function* () {
-      const userPositionAccounts = yield getAllUserPositionNftAccount(
+      const userPositionAccounts = yield getAllPositionNftAccountByOwner(
         this._program.provider.connection,
         user
       );
@@ -7676,6 +7723,32 @@ var CpAmm = class {
       return poolState !== null;
     });
   }
+  /**
+   * Computes the liquidity delta based on the provided token amounts and sqrt price
+   *
+   * @param {LiquidityDeltaParams} params - The parameters for liquidity calculation
+   * @returns {Promise<BN>} - The computed liquidity delta in Q64 value.
+   */
+  getLiquidityDelta(params) {
+    const {
+      maxAmountTokenA,
+      maxAmountTokenB,
+      sqrtMaxPrice,
+      sqrtMinPrice,
+      sqrtPrice
+    } = params;
+    const liquidityDeltaFromAmountA = getLiquidityDeltaFromAmountA(
+      maxAmountTokenA,
+      sqrtPrice,
+      sqrtMaxPrice
+    );
+    const liquidityDeltaFromAmountB = getLiquidityDeltaFromAmountB(
+      maxAmountTokenB,
+      sqrtMinPrice,
+      sqrtPrice
+    );
+    return min2(liquidityDeltaFromAmountA, liquidityDeltaFromAmountB);
+  }
   /**
    * Calculates swap quote based on input amount and pool state.
    * @param params - Swap parameters including input amount, pool state, slippage, etc.
@@ -8151,20 +8224,8 @@ var CpAmm = class {
    */
   createPosition(params) {
     return __async(this, null, function* () {
-      const { owner, payer, pool, positionNft } = params;
-      const position = derivePositionAddress(positionNft);
-      const positionNftAccount = derivePositionNftAccount(positionNft);
-      return yield this._program.methods.createPosition().accountsPartial({
-        owner,
-        positionNftMint: positionNft,
-        poolAuthority: this.poolAuthority,
-        positionNftAccount,
-        payer,
-        pool,
-        position,
-        tokenProgram: TOKEN_2022_PROGRAM_ID2,
-        systemProgram: SystemProgram2.programId
-      }).transaction();
+      const { ix } = yield this.buildCreatePositionInstruction(params);
+      return new Transaction().add(ix);
     });
   }
   /**
@@ -8251,6 +8312,104 @@ var CpAmm = class {
       return transaction;
     });
   }
+  /**
+   * Creates a new position and add liquidity to position it in a single transaction.
+   * Handles both native SOL and other tokens, automatically wrapping/unwrapping SOL as needed.
+   *
+   * @param {CreatePositionAndAddLiquidity} params - Parameters for creating position and adding liquidity
+   *
+   * @returns {Transaction} A transaction that creates a position and adds liquidity
+   *
+   **/
+  createPositionAndAddLiquidity(params) {
+    return __async(this, null, function* () {
+      const {
+        owner,
+        pool,
+        positionNft,
+        liquidityDelta,
+        maxAmountTokenA,
+        maxAmountTokenB,
+        tokenAAmountThreshold,
+        tokenBAmountThreshold,
+        tokenAMint,
+        tokenBMint,
+        tokenAVault,
+        tokenBVault,
+        tokenAProgram,
+        tokenBProgram
+      } = params;
+      const {
+        tokenAAta: tokenAAccount,
+        tokenBAta: tokenBAccount,
+        instructions: preInstructions
+      } = yield this.prepareTokenAccounts(
+        owner,
+        tokenAMint,
+        tokenBMint,
+        tokenAProgram,
+        tokenBProgram
+      );
+      if (tokenAMint.equals(NATIVE_MINT2)) {
+        const wrapSOLIx = wrapSOLInstruction(
+          owner,
+          tokenAAccount,
+          BigInt(maxAmountTokenA.toString())
+        );
+        preInstructions.push(...wrapSOLIx);
+      }
+      if (tokenBMint.equals(NATIVE_MINT2)) {
+        const wrapSOLIx = wrapSOLInstruction(
+          owner,
+          tokenBAccount,
+          BigInt(maxAmountTokenB.toString())
+        );
+        preInstructions.push(...wrapSOLIx);
+      }
+      const postInstructions = [];
+      if ([tokenAMint.toBase58(), tokenBMint.toBase58()].includes(
+        NATIVE_MINT2.toBase58()
+      )) {
+        const closeWrappedSOLIx = yield unwrapSOLInstruction(owner);
+        closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
+      }
+      const {
+        ix: createPositionIx,
+        position,
+        positionNftAccount
+      } = yield this.buildCreatePositionInstruction({
+        owner,
+        payer: owner,
+        pool,
+        positionNft
+      });
+      const addLiquidityInstruction = yield this.buildAddLiquidityInstruction({
+        pool,
+        position,
+        positionNftAccount,
+        owner,
+        tokenAAccount,
+        tokenBAccount,
+        tokenAMint,
+        tokenBMint,
+        tokenAVault,
+        tokenBVault,
+        tokenAProgram,
+        tokenBProgram,
+        liquidityDelta,
+        tokenAAmountThreshold,
+        tokenBAmountThreshold
+      });
+      const transaction = new Transaction();
+      transaction.add(createPositionIx);
+      transaction.add(
+        ...preInstructions.length > 0 ? preInstructions : [],
+        addLiquidityInstruction,
+        ...postInstructions.length > 0 ? postInstructions : []
+      );
+      return transaction;
+    });
+  }
   /**
    * Builds a transaction to remove liquidity from a position.
    * @param {RemoveLiquidityParams} params - Parameters for removing liquidity.
@@ -9060,6 +9219,7 @@ export {
   deriveRewardVaultAddress,
   deriveTokenBadgeAddress,
   deriveTokenVaultAddress,
+  getAllPositionNftAccountByOwner,
   getAllUserPositionNftAccount,
   getAmountAFromLiquidityDelta,
   getAmountBFromLiquidityDelta,