@meteora-ag/dynamic-bonding-curve-sdk 1.4.6 → 1.4.8

package/dist/index.js

@@ -7,10 +7,10 @@ import {
 } from "@solana/web3.js";
 
 // src/types.ts
-var ActivationType = /* @__PURE__ */ ((ActivationType3) => {
-  ActivationType3[ActivationType3["Slot"] = 0] = "Slot";
-  ActivationType3[ActivationType3["Timestamp"] = 1] = "Timestamp";
-  return ActivationType3;
+var ActivationType = /* @__PURE__ */ ((ActivationType4) => {
+  ActivationType4[ActivationType4["Slot"] = 0] = "Slot";
+  ActivationType4[ActivationType4["Timestamp"] = 1] = "Timestamp";
+  return ActivationType4;
 })(ActivationType || {});
 var TokenType = /* @__PURE__ */ ((TokenType2) => {
   TokenType2[TokenType2["SPL"] = 0] = "SPL";
@@ -25148,7 +25148,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
    * @param quoteMint - The quote mint token
    * @returns Instructions for the first buy
    */
-  async swapBuyTx(firstBuyParam, baseMint, config, baseFee, swapBaseForQuote, currentPoint, tokenType, quoteMint) {
+  async swapBuyTx(firstBuyParam, baseMint, config, baseFee, swapBaseForQuote, activationType, tokenType, quoteMint) {
     const {
       buyer,
       receiver,
@@ -25157,14 +25157,21 @@ var PoolService = class extends DynamicBondingCurveProgram {
       referralTokenAccount
     } = firstBuyParam;
     validateSwapAmount(buyAmount);
-    const rateLimiterApplied = isRateLimiterApplied(
-      currentPoint,
-      new BN16(0),
-      swapBaseForQuote ? 0 /* BaseToQuote */ : 1 /* QuoteToBase */,
-      baseFee.secondFactor,
-      baseFee.thirdFactor,
-      new BN16(baseFee.firstFactor)
-    );
+    let rateLimiterApplied = false;
+    if (baseFee.baseFeeMode === 2 /* RateLimiter */) {
+      const currentPoint = await getCurrentPoint(
+        this.connection,
+        activationType
+      );
+      rateLimiterApplied = isRateLimiterApplied(
+        currentPoint,
+        new BN16(0),
+        swapBaseForQuote ? 0 /* BaseToQuote */ : 1 /* QuoteToBase */,
+        baseFee.secondFactor,
+        baseFee.thirdFactor,
+        new BN16(baseFee.firstFactor)
+      );
+    }
     const quoteTokenFlag = await getTokenType(this.connection, quoteMint);
     const { inputMint, outputMint, inputTokenProgram, outputTokenProgram } = this.prepareSwapParams(
       false,
@@ -25377,10 +25384,6 @@ var PoolService = class extends DynamicBondingCurveProgram {
       params.tokenType,
       quoteMintToken
     );
-    const currentPoint = await getCurrentPoint(
-      this.connection,
-      configParam.activationType
-    );
     let swapBuyTx;
     if (params.firstBuyParam && params.firstBuyParam.buyAmount.gt(new BN16(0))) {
       swapBuyTx = await this.swapBuyTx(
@@ -25389,7 +25392,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
         configKey,
         configParam.poolFees.baseFee,
         false,
-        currentPoint,
+        configParam.activationType,
         params.tokenType,
         quoteMintToken
       );
@@ -25419,10 +25422,6 @@ var PoolService = class extends DynamicBondingCurveProgram {
       tokenType,
       quoteMint
     );
-    const currentPoint = await getCurrentPoint(
-      this.connection,
-      poolConfigState.activationType
-    );
     let swapBuyTx;
     if (firstBuyParam && firstBuyParam.buyAmount.gt(new BN16(0))) {
       swapBuyTx = await this.swapBuyTx(
@@ -25431,7 +25430,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
         config,
         poolConfigState.poolFees.baseFee,
         false,
-        currentPoint,
+        poolConfigState.activationType,
         tokenType,
         quoteMint
       );
@@ -25458,10 +25457,6 @@ var PoolService = class extends DynamicBondingCurveProgram {
       tokenType,
       quoteMint
     );
-    const currentPoint = await getCurrentPoint(
-      this.connection,
-      poolConfigState.activationType
-    );
     let partnerSwapBuyTx;
     if (partnerFirstBuyParam && partnerFirstBuyParam.buyAmount.gt(new BN16(0))) {
       partnerSwapBuyTx = await this.swapBuyTx(
@@ -25476,7 +25471,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
         config,
         poolConfigState.poolFees.baseFee,
         false,
-        currentPoint,
+        poolConfigState.activationType,
         tokenType,
         quoteMint
       );
@@ -25495,7 +25490,7 @@ var PoolService = class extends DynamicBondingCurveProgram {
         config,
         poolConfigState.poolFees.baseFee,
         false,
-        currentPoint,
+        poolConfigState.activationType,
         tokenType,
         quoteMint
       );
@@ -25536,18 +25531,21 @@ var PoolService = class extends DynamicBondingCurveProgram {
       throw new Error(`Pool config not found for virtual pool`);
     }
     validateSwapAmount(amountIn);
-    const currentPoint = await getCurrentPoint(
-      this.connection,
-      poolConfigState.activationType
-    );
-    const rateLimiterApplied = isRateLimiterApplied(
-      currentPoint,
-      poolState.activationPoint,
-      swapBaseForQuote ? 0 /* BaseToQuote */ : 1 /* QuoteToBase */,
-      poolConfigState.poolFees.baseFee.secondFactor,
-      poolConfigState.poolFees.baseFee.thirdFactor,
-      new BN16(poolConfigState.poolFees.baseFee.firstFactor)
-    );
+    let rateLimiterApplied = false;
+    if (poolConfigState.poolFees.baseFee.baseFeeMode === 2 /* RateLimiter */) {
+      const currentPoint = await getCurrentPoint(
+        this.connection,
+        poolConfigState.activationType
+      );
+      rateLimiterApplied = isRateLimiterApplied(
+        currentPoint,
+        poolState.activationPoint,
+        swapBaseForQuote ? 0 /* BaseToQuote */ : 1 /* QuoteToBase */,
+        poolConfigState.poolFees.baseFee.secondFactor,
+        poolConfigState.poolFees.baseFee.thirdFactor,
+        new BN16(poolConfigState.poolFees.baseFee.firstFactor)
+      );
+    }
     const { inputMint, outputMint, inputTokenProgram, outputTokenProgram } = this.prepareSwapParams(swapBaseForQuote, poolState, poolConfigState);
     const {
       ataTokenA: inputTokenAccount,
@@ -25644,18 +25642,21 @@ var PoolService = class extends DynamicBondingCurveProgram {
     if (!poolConfigState) {
       throw new Error(`Pool config not found for virtual pool`);
     }
-    const currentPoint = await getCurrentPoint(
-      this.connection,
-      poolConfigState.activationType
-    );
-    const rateLimiterApplied = isRateLimiterApplied(
-      currentPoint,
-      poolState.activationPoint,
-      swapBaseForQuote ? 0 /* BaseToQuote */ : 1 /* QuoteToBase */,
-      poolConfigState.poolFees.baseFee.secondFactor,
-      poolConfigState.poolFees.baseFee.thirdFactor,
-      new BN16(poolConfigState.poolFees.baseFee.firstFactor)
-    );
+    let rateLimiterApplied = false;
+    if (poolConfigState.poolFees.baseFee.baseFeeMode === 2 /* RateLimiter */) {
+      const currentPoint = await getCurrentPoint(
+        this.connection,
+        poolConfigState.activationType
+      );
+      rateLimiterApplied = isRateLimiterApplied(
+        currentPoint,
+        poolState.activationPoint,
+        swapBaseForQuote ? 0 /* BaseToQuote */ : 1 /* QuoteToBase */,
+        poolConfigState.poolFees.baseFee.secondFactor,
+        poolConfigState.poolFees.baseFee.thirdFactor,
+        new BN16(poolConfigState.poolFees.baseFee.firstFactor)
+      );
+    }
     const { inputMint, outputMint, inputTokenProgram, outputTokenProgram } = this.prepareSwapParams(swapBaseForQuote, poolState, poolConfigState);
     const {
       ataTokenA: inputTokenAccount,