@meteora-ag/cp-amm-sdk 1.2.7 → 1.2.8-rc.0

package/dist/index.mjs

@@ -40,7 +40,7 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/CpAmm.ts
-import { Program as Program2 } from "@coral-xyz/anchor";
+import { Program } from "@coral-xyz/anchor";
 import { NATIVE_MINT as NATIVE_MINT2, TOKEN_2022_PROGRAM_ID as TOKEN_2022_PROGRAM_ID3 } from "@solana/spl-token";
 import invariant from "invariant";
 
@@ -8824,11 +8824,8 @@ function getTotalFeeNumerator(poolFees, baseFeeNumerator, maxFeeNumerator) {
   const totalFeeNumerator = dynamicFeeNumerator.add(baseFeeNumerator);
   return BN6.min(totalFeeNumerator, maxFeeNumerator);
 }
-function getTotalTradingFeeFromIncludedFeeAmount(program, poolFees, currentPoint, activationPoint, includedFeeAmount, tradeDirection, maxFeeNumerator, initSqrtPrice, currentSqrtPrice) {
-  const baseFeeHandler = getBaseFeeHandler(
-    program,
-    poolFees.baseFee.baseFeeInfo.data
-  );
+function getTotalTradingFeeFromIncludedFeeAmount(poolFees, currentPoint, activationPoint, includedFeeAmount, tradeDirection, maxFeeNumerator, initSqrtPrice, currentSqrtPrice) {
+  const baseFeeHandler = getBaseFeeHandler(poolFees.baseFee.baseFeeInfo.data);
   const baseFeeNumerator = baseFeeHandler.getBaseFeeNumeratorFromIncludedFeeAmount(
     currentPoint,
     activationPoint,
@@ -8839,11 +8836,8 @@ function getTotalTradingFeeFromIncludedFeeAmount(program, poolFees, currentPoint
   );
   return getTotalFeeNumerator(poolFees, baseFeeNumerator, maxFeeNumerator);
 }
-function getTotalTradingFeeFromExcludedFeeAmount(program, poolFees, currentPoint, activationPoint, excludedFeeAmount, tradeDirection, maxFeeNumerator, initSqrtPrice, currentSqrtPrice) {
-  const baseFeeHandler = getBaseFeeHandler(
-    program,
-    poolFees.baseFee.baseFeeInfo.data
-  );
+function getTotalTradingFeeFromExcludedFeeAmount(poolFees, currentPoint, activationPoint, excludedFeeAmount, tradeDirection, maxFeeNumerator, initSqrtPrice, currentSqrtPrice) {
+  const baseFeeHandler = getBaseFeeHandler(poolFees.baseFee.baseFeeInfo.data);
   const baseFeeNumerator = baseFeeHandler.getBaseFeeNumeratorFromExcludedFeeAmount(
     currentPoint,
     activationPoint,
@@ -9192,28 +9186,6 @@ function getMaxBaseFeeNumerator(cliffFeeNumerator) {
 }
 
 // src/math/poolFees/feeTimeScheduler.ts
-function toPodAlignedFeeTimeScheduler(borshFeeScheduler) {
-  return {
-    cliffFeeNumerator: borshFeeScheduler.cliffFeeNumerator,
-    baseFeeMode: borshFeeScheduler.baseFeeMode,
-    padding: new Array(16).fill(0),
-    // Assumes default/rust alignment of 16
-    numberOfPeriod: borshFeeScheduler.numberOfPeriod,
-    periodFrequency: borshFeeScheduler.periodFrequency,
-    reductionFactor: borshFeeScheduler.reductionFactor
-  };
-}
-function toBorshFeeTimeScheduler(podAlignedFeeScheduler) {
-  return {
-    cliffFeeNumerator: podAlignedFeeScheduler.cliffFeeNumerator,
-    numberOfPeriod: podAlignedFeeScheduler.numberOfPeriod,
-    periodFrequency: podAlignedFeeScheduler.periodFrequency,
-    reductionFactor: podAlignedFeeScheduler.reductionFactor,
-    baseFeeMode: podAlignedFeeScheduler.baseFeeMode,
-    padding: new Array(16).fill(0)
-    // Assumes default/rust alignment of 16
-  };
-}
 function getFeeTimeBaseFeeNumeratorByPeriod(cliffFeeNumerator, numberOfPeriod, period, reductionFactor, feeTimeSchedulerMode) {
   const periodValue = BN9.min(period, new BN9(numberOfPeriod));
   const periodNumber = periodValue.toNumber();
@@ -9536,7 +9508,7 @@ var FeeMarketCapScheduler = class {
     );
   }
 };
-function getBaseFeeHandler(program, rawData) {
+function getBaseFeeHandler(rawData) {
   const data = Buffer.from(rawData);
   const modeIndex = data.readUInt8(8);
   const baseFeeMode = modeIndex;
@@ -9724,14 +9696,13 @@ function getLiquidityDeltaFromAmountB(amountB, lowerSqrtPrice, upperSqrtPrice) {
 }
 
 // src/math/quote.ts
-function getSwapResultFromExactInput(program, poolState, amountIn, feeMode, tradeDirection, currentPoint) {
+function getSwapResultFromExactInput(poolState, amountIn, feeMode, tradeDirection, currentPoint) {
   let actualProtocolFee = new BN14(0);
   let actualTradingFee = new BN14(0);
   let actualReferralFee = new BN14(0);
   let actualPartnerFee = new BN14(0);
   const maxFeeNumerator = getMaxFeeNumerator(poolState.version);
   const tradeFeeNumerator = getTotalTradingFeeFromIncludedFeeAmount(
-    program,
     poolState.poolFees,
     currentPoint,
     poolState.activationPoint,
@@ -9838,14 +9809,13 @@ function calculateBtoAFromAmountIn(poolState, amountIn) {
     amountLeft: new BN14(0)
   };
 }
-function getSwapResultFromPartialInput(program, poolState, amountIn, feeMode, tradeDirection, currentPoint) {
+function getSwapResultFromPartialInput(poolState, amountIn, feeMode, tradeDirection, currentPoint) {
   let actualProtocolFee = new BN14(0);
   let actualTradingFee = new BN14(0);
   let actualReferralFee = new BN14(0);
   let actualPartnerFee = new BN14(0);
   const maxFeeNumerator = getMaxFeeNumerator(poolState.version);
   const tradeFeeNumerator = getTotalTradingFeeFromIncludedFeeAmount(
-    program,
     poolState.poolFees,
     currentPoint,
     poolState.activationPoint,
@@ -9890,7 +9860,6 @@ function getSwapResultFromPartialInput(program, poolState, amountIn, feeMode, tr
     actualAmountIn = actualAmountIn.sub(amountLeft);
     if (feeMode.feesOnInput) {
       const tradeFeeNumerator2 = getTotalTradingFeeFromExcludedFeeAmount(
-        program,
         poolState.poolFees,
         currentPoint,
         poolState.activationPoint,
@@ -10018,7 +9987,7 @@ function calculateBtoAFromPartialAmountIn(poolState, amountIn) {
     amountLeft
   };
 }
-function getSwapResultFromExactOutput(program, poolState, amountOut, feeMode, tradeDirection, currentPoint) {
+function getSwapResultFromExactOutput(poolState, amountOut, feeMode, tradeDirection, currentPoint) {
   let actualProtocolFee = new BN14(0);
   let actualTradingFee = new BN14(0);
   let actualReferralFee = new BN14(0);
@@ -10029,7 +9998,6 @@ function getSwapResultFromExactOutput(program, poolState, amountOut, feeMode, tr
     includedFeeAmountOut = amountOut;
   } else {
     const tradeFeeNumerator = getTotalTradingFeeFromExcludedFeeAmount(
-      program,
       poolState.poolFees,
       currentPoint,
       poolState.activationPoint,
@@ -10071,7 +10039,6 @@ function getSwapResultFromExactOutput(program, poolState, amountOut, feeMode, tr
   let includedFeeInputAmount;
   if (feeMode.feesOnInput) {
     const tradeFeeNumerator = getTotalTradingFeeFromExcludedFeeAmount(
-      program,
       poolState.poolFees,
       currentPoint,
       poolState.activationPoint,
@@ -10153,7 +10120,7 @@ function calculateBtoAFromAmountOut(poolState, amountOut) {
     nextSqrtPrice
   };
 }
-function swapQuoteExactInput(program, pool, currentPoint, amountIn, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
+function swapQuoteExactInput(pool, currentPoint, amountIn, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
   if (amountIn.lte(new BN14(0))) {
     throw new Error("Amount in must be greater than 0");
   }
@@ -10171,7 +10138,6 @@ function swapQuoteExactInput(program, pool, currentPoint, amountIn, slippage, aT
     ).amount;
   }
   const swapResult = getSwapResultFromExactInput(
-    program,
     pool,
     actualAmountIn,
     feeMode,
@@ -10204,7 +10170,7 @@ function swapQuoteExactInput(program, pool, currentPoint, amountIn, slippage, aT
     priceImpact
   });
 }
-function swapQuoteExactOutput(program, pool, currentPoint, amountOut, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
+function swapQuoteExactOutput(pool, currentPoint, amountOut, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
   if (amountOut.lte(new BN14(0))) {
     throw new Error("Amount out must be greater than 0");
   }
@@ -10222,7 +10188,6 @@ function swapQuoteExactOutput(program, pool, currentPoint, amountOut, slippage,
     ).amount;
   }
   const swapResult = getSwapResultFromExactOutput(
-    program,
     pool,
     actualAmountOut,
     feeMode,
@@ -10255,7 +10220,7 @@ function swapQuoteExactOutput(program, pool, currentPoint, amountOut, slippage,
     priceImpact
   });
 }
-function swapQuotePartialInput(program, pool, currentPoint, amountIn, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
+function swapQuotePartialInput(pool, currentPoint, amountIn, slippage, aToB, hasReferral, tokenADecimal, tokenBDecimal, inputTokenInfo, outputTokenInfo) {
   if (amountIn.lte(new BN14(0))) {
     throw new Error("Amount in must be greater than 0");
   }
@@ -10273,7 +10238,6 @@ function swapQuotePartialInput(program, pool, currentPoint, amountIn, slippage,
     ).amount;
   }
   const swapResult = getSwapResultFromPartialInput(
-    program,
     pool,
     actualAmountIn,
     feeMode,
@@ -10908,7 +10872,7 @@ function getDynamicFeeParams(baseFeeBps, maxPriceChangeBps = MAX_PRICE_CHANGE_BP
 import BN19, { min as min2, max } from "bn.js";
 var CpAmm = class {
   constructor(connection) {
-    this._program = new Program2(cp_amm_default, {
+    this._program = new Program(cp_amm_default, {
       connection
     });
     this.poolAuthority = derivePoolAuthority();
@@ -11396,9 +11360,7 @@ var CpAmm = class {
    */
   fetchConfigState(config) {
     return __async(this, null, function* () {
-      const configState = yield this._program.account.config.fetchNullable(
-        config
-      );
+      const configState = yield this._program.account.config.fetchNullable(config);
       invariant(configState, `Config account: ${config} not found`);
       return configState;
     });
@@ -11464,13 +11426,56 @@ var CpAmm = class {
    */
   fetchPositionState(position) {
     return __async(this, null, function* () {
-      const positionState = yield this._program.account.position.fetchNullable(
-        position
-      );
+      const positionState = yield this._program.account.position.fetchNullable(position);
       invariant(positionState, `Position account: ${position} not found`);
       return positionState;
     });
   }
+  /**
+   * Fetches multiple Config states.
+   * @param configs - Array of public keys of config accounts.
+   * @returns Array of parsed ConfigState.
+   */
+  getMultipleConfigs(configs) {
+    return __async(this, null, function* () {
+      const configStates = yield this._program.account.config.fetchMultiple(configs);
+      configStates.forEach((configState, index) => {
+        invariant(configState, `Config account: ${configs[index]} not found`);
+      });
+      return configStates;
+    });
+  }
+  /**
+   * Fetches multiple Pool states.
+   * @param pools - Array of public keys of pool accounts.
+   * @returns Array of parsed PoolState.
+   */
+  getMultiplePools(pools) {
+    return __async(this, null, function* () {
+      const poolStates = yield this._program.account.pool.fetchMultiple(pools);
+      poolStates.forEach((poolState, index) => {
+        invariant(poolState, `Pool account: ${pools[index]} not found`);
+      });
+      return poolStates;
+    });
+  }
+  /**
+   * Fetches multiple Position states.
+   * @param positions - Array of public keys of position accounts.
+   * @returns Array of parsed PositionState.
+   */
+  getMultiplePositions(positions) {
+    return __async(this, null, function* () {
+      const positionStates = yield this._program.account.position.fetchMultiple(positions);
+      positionStates.forEach((positionState, index) => {
+        invariant(
+          positionState,
+          `Position account: ${positions[index]} not found`
+        );
+      });
+      return positionStates;
+    });
+  }
   /**
    * Retrieves all config accounts.
    * @returns Array of config public keys and their states.
@@ -11544,9 +11549,7 @@ var CpAmm = class {
       const positionAddresses = userPositionAccounts.map(
         (account) => derivePositionAddress(account.positionNft)
       );
-      const positionStates = yield this._program.account.position.fetchMultiple(
-        positionAddresses
-      );
+      const positionStates = yield this._program.account.position.fetchMultiple(positionAddresses);
       const positionResult = userPositionAccounts.map((account, index) => {
         const positionState = positionStates[index];
         if (!positionState) return null;
@@ -11691,7 +11694,6 @@ var CpAmm = class {
     const aToB = poolState.tokenAMint.equals(inputTokenMint);
     const currentPoint = activationType ? new BN19(currentTime) : new BN19(currentSlot);
     const swapResult = swapQuoteExactInput(
-      this._program,
       poolState,
       currentPoint,
       inAmount,
@@ -11735,7 +11737,6 @@ var CpAmm = class {
       case 0 /* ExactIn */:
         if ("amountIn" in params) {
           return swapQuoteExactInput(
-            this._program,
             poolState,
             currentPoint,
             params.amountIn,
@@ -11752,7 +11753,6 @@ var CpAmm = class {
       case 2 /* ExactOut */:
         if ("amountOut" in params) {
           return swapQuoteExactOutput(
-            this._program,
             poolState,
             currentPoint,
             params.amountOut,
@@ -11769,7 +11769,6 @@ var CpAmm = class {
       case 1 /* PartialFill */:
         if ("amountIn" in params) {
           return swapQuotePartialInput(
-            this._program,
             poolState,
             currentPoint,
             params.amountIn,
@@ -12623,7 +12622,8 @@ var CpAmm = class {
         tokenBMint,
         tokenAProgram,
         tokenBProgram,
-        referralTokenAccount
+        referralTokenAccount,
+        receiver
       } = params;
       const [inputTokenProgram, outputTokenProgram] = inputTokenMint.equals(
         tokenAMint
@@ -12635,8 +12635,8 @@ var CpAmm = class {
         instructions: preInstructions
       } = yield this.prepareTokenAccounts({
         payer,
-        tokenAOwner: payer,
-        tokenBOwner: payer,
+        tokenAOwner: receiver != null ? receiver : payer,
+        tokenBOwner: receiver != null ? receiver : payer,
         tokenAMint: inputTokenMint,
         tokenBMint: outputTokenMint,
         tokenAProgram: inputTokenProgram,
@@ -12644,7 +12644,7 @@ var CpAmm = class {
       });
       if (inputTokenMint.equals(NATIVE_MINT2)) {
         const wrapSOLIx = wrapSOLInstruction(
-          payer,
+          receiver != null ? receiver : payer,
           inputTokenAccount,
           BigInt(amountIn.toString())
         );
@@ -12654,7 +12654,7 @@ var CpAmm = class {
       if ([tokenAMint.toBase58(), tokenBMint.toBase58()].includes(
         NATIVE_MINT2.toBase58()
       )) {
-        const closeWrappedSOLIx = yield unwrapSOLInstruction(payer);
+        const closeWrappedSOLIx = yield unwrapSOLInstruction(receiver != null ? receiver : payer);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
       let { poolState } = params;
@@ -12692,7 +12692,7 @@ var CpAmm = class {
       }).accountsPartial({
         poolAuthority: this.poolAuthority,
         pool,
-        payer,
+        payer: receiver != null ? receiver : payer,
         inputTokenAccount,
         outputTokenAccount,
         tokenAVault,
@@ -12724,7 +12724,8 @@ var CpAmm = class {
         tokenAProgram,
         tokenBProgram,
         referralTokenAccount,
-        swapMode
+        swapMode,
+        receiver
       } = params;
       const [inputTokenProgram, outputTokenProgram] = inputTokenMint.equals(
         tokenAMint
@@ -12736,8 +12737,8 @@ var CpAmm = class {
         instructions: preInstructions
       } = yield this.prepareTokenAccounts({
         payer,
-        tokenAOwner: payer,
-        tokenBOwner: payer,
+        tokenAOwner: receiver != null ? receiver : payer,
+        tokenBOwner: receiver != null ? receiver : payer,
         tokenAMint: inputTokenMint,
         tokenBMint: outputTokenMint,
         tokenAProgram: inputTokenProgram,
@@ -12755,7 +12756,7 @@ var CpAmm = class {
       if (inputTokenMint.equals(NATIVE_MINT2)) {
         const amount = swapMode === 0 /* ExactIn */ || swapMode === 1 /* PartialFill */ ? amount0 : amount1;
         const wrapSOLIx = wrapSOLInstruction(
-          payer,
+          receiver != null ? receiver : payer,
           inputTokenAccount,
           BigInt(amount.toString())
         );
@@ -12765,7 +12766,7 @@ var CpAmm = class {
       if ([tokenAMint.toBase58(), tokenBMint.toBase58()].includes(
         NATIVE_MINT2.toBase58()
       )) {
-        const closeWrappedSOLIx = yield unwrapSOLInstruction(payer);
+        const closeWrappedSOLIx = yield unwrapSOLInstruction(receiver != null ? receiver : payer);
         closeWrappedSOLIx && postInstructions.push(closeWrappedSOLIx);
       }
       let { poolState } = params;
@@ -12804,7 +12805,7 @@ var CpAmm = class {
       }).accountsPartial({
         poolAuthority: this.poolAuthority,
         pool,
-        payer,
+        payer: receiver != null ? receiver : payer,
         inputTokenAccount,
         outputTokenAccount,
         tokenAVault,
@@ -13778,9 +13779,7 @@ export {
   swapQuoteExactInput,
   swapQuoteExactOutput,
   swapQuotePartialInput,
-  toBorshFeeTimeScheduler,
   toNumerator,
-  toPodAlignedFeeTimeScheduler,
   unwrapSOLInstruction,
   validateFeeFraction,
   validateFeeMarketCapBaseFeeIsStatic,