@magmaprotocol/magma-clmm-sdk 0.5.66 → 0.5.68

package/dist/index.mjs

@@ -37,7 +37,7 @@ var CachedContent = class {
 };
 
 // src/utils/common.ts
-import BN13 from "bn.js";
+import BN12 from "bn.js";
 import { fromB64, fromHEX } from "@mysten/bcs";
 import { Ed25519Keypair } from "@mysten/sui/keypairs/ed25519";
 import { Secp256k1Keypair } from "@mysten/sui/keypairs/secp256k1";
@@ -1592,9 +1592,6 @@ function collectFeesQuote(param) {
   return updateFees(param.position, fee_growth_inside_a, fee_growth_inside_b);
 }
 
-// src/math/dlmmStrategy.ts
-import BN10 from "bn.js";
-
 // src/math/dlmmWeightToAmounts.ts
 import BN9 from "bn.js";
 import Decimal3 from "decimal.js";
@@ -1878,31 +1875,11 @@ function toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBi
 
 // src/math/dlmmStrategy.ts
 var StrategyType = /* @__PURE__ */ ((StrategyType2) => {
-  StrategyType2[StrategyType2["Spot"] = 0] = "Spot";
-  StrategyType2[StrategyType2["Curve"] = 1] = "Curve";
-  StrategyType2[StrategyType2["BidAsk"] = 2] = "BidAsk";
+  StrategyType2[StrategyType2["Spot"] = 1] = "Spot";
+  StrategyType2[StrategyType2["Curve"] = 2] = "Curve";
+  StrategyType2[StrategyType2["BidAsk"] = 3] = "BidAsk";
   return StrategyType2;
 })(StrategyType || {});
-function toWeightDecendingOrder(minBinId, maxBinId) {
-  const distributions = [];
-  for (let i = minBinId; i <= maxBinId; i++) {
-    distributions.push({
-      binId: i,
-      weight: maxBinId - i + 1
-    });
-  }
-  return distributions;
-}
-function toWeightAscendingOrder(minBinId, maxBinId) {
-  const distributions = [];
-  for (let i = minBinId; i <= maxBinId; i++) {
-    distributions.push({
-      binId: i,
-      weight: i - minBinId + 1
-    });
-  }
-  return distributions;
-}
 function toWeightSpotBalanced(minBinId, maxBinId) {
   const distributions = [];
   for (let i = minBinId; i <= maxBinId; i++) {
@@ -1977,15 +1954,15 @@ function toWeightBidAsk(minBinId, maxBinId, activeId) {
 }
 function autoFillYByStrategy(activeId, binStep, amountX, amountXInActiveBin, amountYInActiveBin, minBinId, maxBinId, strategyType) {
   switch (strategyType) {
-    case 0 /* Spot */: {
+    case 1 /* Spot */: {
       const weights = toWeightSpotBalanced(minBinId, maxBinId);
       return autoFillYByWeight(activeId, binStep, amountX, amountXInActiveBin, amountYInActiveBin, weights);
     }
-    case 1 /* Curve */: {
+    case 2 /* Curve */: {
       const weights = toWeightCurve(minBinId, maxBinId, activeId);
       return autoFillYByWeight(activeId, binStep, amountX, amountXInActiveBin, amountYInActiveBin, weights);
     }
-    case 2 /* BidAsk */: {
+    case 3 /* BidAsk */: {
       const weights = toWeightBidAsk(minBinId, maxBinId, activeId);
       return autoFillYByWeight(activeId, binStep, amountX, amountXInActiveBin, amountYInActiveBin, weights);
     }
@@ -1995,15 +1972,15 @@ function autoFillYByStrategy(activeId, binStep, amountX, amountXInActiveBin, amo
 }
 function autoFillXByStrategy(activeId, binStep, amountY, amountXInActiveBin, amountYInActiveBin, minBinId, maxBinId, strategyType) {
   switch (strategyType) {
-    case 0 /* Spot */: {
+    case 1 /* Spot */: {
       const weights = toWeightSpotBalanced(minBinId, maxBinId);
       return autoFillXByWeight(activeId, binStep, amountY, amountXInActiveBin, amountYInActiveBin, weights);
     }
-    case 1 /* Curve */: {
+    case 2 /* Curve */: {
       const weights = toWeightCurve(minBinId, maxBinId, activeId);
       return autoFillXByWeight(activeId, binStep, amountY, amountXInActiveBin, amountYInActiveBin, weights);
     }
-    case 2 /* BidAsk */: {
+    case 3 /* BidAsk */: {
       const weights = toWeightBidAsk(minBinId, maxBinId, activeId);
       return autoFillXByWeight(activeId, binStep, amountY, amountXInActiveBin, amountYInActiveBin, weights);
     }
@@ -2014,178 +1991,17 @@ function autoFillXByStrategy(activeId, binStep, amountY, amountXInActiveBin, amo
 function toAmountsBothSideByStrategy(activeId, binStep, minBinId, maxBinId, amountX, amountY, amountXInActiveBin, amountYInActiveBin, strategyType) {
   const isSingleSideX = amountY.isZero();
   switch (strategyType) {
-    case 0 /* Spot */: {
-      if (activeId < minBinId || activeId > maxBinId) {
-        const weights = toWeightSpotBalanced(minBinId, maxBinId);
-        return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
-      }
-      const amountsInBin = [];
-      if (!isSingleSideX) {
-        if (minBinId <= activeId) {
-          const weights = toWeightSpotBalanced(minBinId, activeId);
-          const amounts = toAmountBidSide(activeId, amountY, weights);
-          for (const bin of amounts) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: new BN10(0),
-              amountY: bin.amount
-            });
-          }
-        }
-        if (activeId < maxBinId) {
-          const weights = toWeightSpotBalanced(activeId + 1, maxBinId);
-          const amounts = toAmountAskSide(activeId, binStep, amountX, weights);
-          for (const bin of amounts) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: bin.amount,
-              amountY: new BN10(0)
-            });
-          }
-        }
-      } else {
-        if (minBinId < activeId) {
-          const weights = toWeightSpotBalanced(minBinId, activeId - 1);
-          const amountsIntoBidSide = toAmountBidSide(activeId, amountY, weights);
-          for (const bin of amountsIntoBidSide) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: new BN10(0),
-              amountY: bin.amount
-            });
-          }
-        }
-        if (activeId <= maxBinId) {
-          const weights = toWeightSpotBalanced(activeId, maxBinId);
-          const amountsIntoAskSide = toAmountAskSide(activeId, binStep, amountX, weights);
-          for (const bin of amountsIntoAskSide) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: bin.amount,
-              amountY: new BN10(0)
-            });
-          }
-        }
-      }
-      return amountsInBin;
-    }
-    case 1 /* Curve */: {
-      if (activeId < minBinId) {
-        const weights = toWeightDecendingOrder(minBinId, maxBinId);
-        return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
-      }
-      if (activeId > maxBinId) {
-        const weights = toWeightAscendingOrder(minBinId, maxBinId);
-        return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
-      }
-      const amountsInBin = [];
-      if (!isSingleSideX) {
-        if (minBinId <= activeId) {
-          const weights = toWeightAscendingOrder(minBinId, activeId);
-          const amounts = toAmountBidSide(activeId, amountY, weights);
-          for (const bin of amounts) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: new BN10(0),
-              amountY: bin.amount
-            });
-          }
-        }
-        if (activeId < maxBinId) {
-          const weights = toWeightDecendingOrder(activeId + 1, maxBinId);
-          const amounts = toAmountAskSide(activeId, binStep, amountX, weights);
-          for (const bin of amounts) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: bin.amount,
-              amountY: new BN10(0)
-            });
-          }
-        }
-      } else {
-        if (minBinId < activeId) {
-          const weights = toWeightAscendingOrder(minBinId, activeId - 1);
-          const amountsIntoBidSide = toAmountBidSide(activeId, amountY, weights);
-          for (const bin of amountsIntoBidSide) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: new BN10(0),
-              amountY: bin.amount
-            });
-          }
-        }
-        if (activeId <= maxBinId) {
-          const weights = toWeightDecendingOrder(activeId, maxBinId);
-          const amountsIntoAskSide = toAmountAskSide(activeId, binStep, amountX, weights);
-          for (const bin of amountsIntoAskSide) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: bin.amount,
-              amountY: new BN10(0)
-            });
-          }
-        }
-      }
-      return amountsInBin;
-    }
-    case 2 /* BidAsk */: {
-      if (activeId < minBinId) {
-        const weights = toWeightAscendingOrder(minBinId, maxBinId);
-        return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
-      }
-      if (activeId > maxBinId) {
-        const weights = toWeightDecendingOrder(minBinId, maxBinId);
-        return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
-      }
-      const amountsInBin = [];
-      if (!isSingleSideX) {
-        if (minBinId <= activeId) {
-          const weights = toWeightDecendingOrder(minBinId, activeId);
-          const amounts = toAmountBidSide(activeId, amountY, weights);
-          for (const bin of amounts) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: new BN10(0),
-              amountY: bin.amount
-            });
-          }
-        }
-        if (activeId < maxBinId) {
-          const weights = toWeightAscendingOrder(activeId + 1, maxBinId);
-          const amounts = toAmountAskSide(activeId, binStep, amountX, weights);
-          for (const bin of amounts) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: bin.amount,
-              amountY: new BN10(0)
-            });
-          }
-        }
-      } else {
-        if (minBinId < activeId) {
-          const weights = toWeightDecendingOrder(minBinId, activeId - 1);
-          const amountsIntoBidSide = toAmountBidSide(activeId, amountY, weights);
-          for (const bin of amountsIntoBidSide) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: new BN10(0),
-              amountY: bin.amount
-            });
-          }
-        }
-        if (activeId <= maxBinId) {
-          const weights = toWeightAscendingOrder(activeId, maxBinId);
-          const amountsIntoAskSide = toAmountAskSide(activeId, binStep, amountX, weights);
-          for (const bin of amountsIntoAskSide) {
-            amountsInBin.push({
-              binId: bin.binId,
-              amountX: bin.amount,
-              amountY: new BN10(0)
-            });
-          }
-        }
-      }
-      return amountsInBin;
+    case 1 /* Spot */: {
+      const weights = toWeightSpotBalanced(minBinId, maxBinId);
+      return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
+    }
+    case 2 /* Curve */: {
+      const weights = toWeightCurve(minBinId, maxBinId, activeId);
+      return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
+    }
+    case 3 /* BidAsk */: {
+      const weights = toWeightBidAsk(minBinId, maxBinId, activeId);
+      return toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBin, amountYInActiveBin, weights);
     }
     default:
       throw new Error(`Unsupported strategy type: ${strategyType}`);
@@ -2245,7 +2061,7 @@ function getCoinXYForLiquidity(liquidity, reserveInSize, reserveOutSize, lpSuply
 }
 
 // src/math/percentage.ts
-import BN11 from "bn.js";
+import BN10 from "bn.js";
 var Percentage = class {
   numerator;
   denominator;
@@ -2273,8 +2089,8 @@ var Percentage = class {
    * @returns
    */
   static fromFraction(numerator, denominator) {
-    const num = typeof numerator === "number" ? new BN11(numerator.toString()) : numerator;
-    const denom = typeof denominator === "number" ? new BN11(denominator.toString()) : denominator;
+    const num = typeof numerator === "number" ? new BN10(numerator.toString()) : numerator;
+    const denom = typeof denominator === "number" ? new BN10(denominator.toString()) : denominator;
     return new Percentage(num, denom);
   }
 };
@@ -2374,7 +2190,7 @@ function adjustForCoinSlippage(tokenAmount, slippage, adjustUp) {
 }
 
 // src/math/SplitSwap.ts
-import BN12 from "bn.js";
+import BN11 from "bn.js";
 var SplitUnit = /* @__PURE__ */ ((SplitUnit2) => {
   SplitUnit2[SplitUnit2["FIVE"] = 5] = "FIVE";
   SplitUnit2[SplitUnit2["TEN"] = 10] = "TEN";
@@ -2432,7 +2248,7 @@ function updateSplitSwapResult(maxIndex, currentIndex, splitSwapResult, stepResu
   return splitSwapResult;
 }
 function computeSplitSwap(a2b, byAmountIn, amounts, poolData, swapTicks) {
-  let currentLiquidity = new BN12(poolData.liquidity);
+  let currentLiquidity = new BN11(poolData.liquidity);
   let { currentSqrtPrice } = poolData;
   let splitSwapResult = {
     amountInArray: [],
@@ -2495,7 +2311,7 @@ function computeSplitSwap(a2b, byAmountIn, amounts, poolData, swapTicks) {
         targetSqrtPrice,
         currentLiquidity,
         remainerAmount,
-        new BN12(poolData.feeRate),
+        new BN11(poolData.feeRate),
         byAmountIn
       );
       tempStepResult = stepResult;
@@ -2507,7 +2323,7 @@ function computeSplitSwap(a2b, byAmountIn, amounts, poolData, swapTicks) {
         splitSwapResult.amountOutArray[i] = splitSwapResult.amountOutArray[i].add(stepResult.amountOut);
         splitSwapResult.feeAmountArray[i] = splitSwapResult.feeAmountArray[i].add(stepResult.feeAmount);
         if (stepResult.nextSqrtPrice.eq(tick.sqrtPrice)) {
-          signedLiquidityChange = a2b ? tick.liquidityNet.mul(new BN12(-1)) : tick.liquidityNet;
+          signedLiquidityChange = a2b ? tick.liquidityNet.mul(new BN11(-1)) : tick.liquidityNet;
           currentLiquidity = signedLiquidityChange.gt(ZERO) ? currentLiquidity.add(signedLiquidityChange) : currentLiquidity.sub(signedLiquidityChange.abs());
           currentSqrtPrice = tick.sqrtPrice;
         } else {
@@ -2532,7 +2348,7 @@ function computeSplitSwap(a2b, byAmountIn, amounts, poolData, swapTicks) {
       break;
     }
     if (tempStepResult.nextSqrtPrice.eq(tick.sqrtPrice)) {
-      signedLiquidityChange = a2b ? tick.liquidityNet.mul(new BN12(-1)) : tick.liquidityNet;
+      signedLiquidityChange = a2b ? tick.liquidityNet.mul(new BN11(-1)) : tick.liquidityNet;
       currentLiquidity = signedLiquidityChange.gt(ZERO) ? currentLiquidity.add(signedLiquidityChange) : currentLiquidity.sub(signedLiquidityChange.abs());
       currentSqrtPrice = tick.sqrtPrice;
     } else {
@@ -2757,7 +2573,7 @@ function buildPool(objects) {
   const rewarders = [];
   fields.rewarder_manager.fields.rewarders.forEach((item) => {
     const { emissions_per_second } = item.fields;
-    const emissionSeconds = MathUtil.fromX64(new BN13(emissions_per_second));
+    const emissionSeconds = MathUtil.fromX64(new BN12(emissions_per_second));
     const emissionsEveryDay = Math.floor(emissionSeconds.toNumber() * 60 * 60 * 24);
     rewarders.push({
       emissions_per_second,
@@ -2949,11 +2765,11 @@ function buildTickData(objects) {
   const possition = {
     objectId: getObjectId(objects),
     index: asIntN(BigInt(valueItem.index.fields.bits)),
-    sqrtPrice: new BN13(valueItem.sqrt_price),
-    liquidityNet: new BN13(valueItem.liquidity_net.fields.bits),
-    liquidityGross: new BN13(valueItem.liquidity_gross),
-    feeGrowthOutsideA: new BN13(valueItem.fee_growth_outside_a),
-    feeGrowthOutsideB: new BN13(valueItem.fee_growth_outside_b),
+    sqrtPrice: new BN12(valueItem.sqrt_price),
+    liquidityNet: new BN12(valueItem.liquidity_net.fields.bits),
+    liquidityGross: new BN12(valueItem.liquidity_gross),
+    feeGrowthOutsideA: new BN12(valueItem.fee_growth_outside_a),
+    feeGrowthOutsideB: new BN12(valueItem.fee_growth_outside_b),
     rewardersGrowthOutside: valueItem.rewards_growth_outside
   };
   return possition;
@@ -2963,11 +2779,11 @@ function buildTickDataByEvent(fields) {
     throw new ClmmpoolsError(`Invalid tick fields.`, "InvalidTickFields" /* InvalidTickFields */);
   }
   const index = asIntN(BigInt(fields.index.bits));
-  const sqrtPrice = new BN13(fields.sqrt_price);
-  const liquidityNet = new BN13(fields.liquidity_net.bits);
-  const liquidityGross = new BN13(fields.liquidity_gross);
-  const feeGrowthOutsideA = new BN13(fields.fee_growth_outside_a);
-  const feeGrowthOutsideB = new BN13(fields.fee_growth_outside_b);
+  const sqrtPrice = new BN12(fields.sqrt_price);
+  const liquidityNet = new BN12(fields.liquidity_net.bits);
+  const liquidityGross = new BN12(fields.liquidity_gross);
+  const feeGrowthOutsideA = new BN12(fields.fee_growth_outside_a);
+  const feeGrowthOutsideB = new BN12(fields.fee_growth_outside_b);
   const rewardersGrowthOutside = fields.rewards_growth_outside || [];
   const tick = {
     objectId: "",
@@ -2986,7 +2802,7 @@ function buildClmmPositionName(pool_index, position_index) {
 }
 
 // src/utils/tick.ts
-import BN14 from "bn.js";
+import BN13 from "bn.js";
 var TickUtil = class {
   /**
    * Get min tick index.
@@ -3026,22 +2842,22 @@ function getRewardInTickRange(pool, tickLower, tickUpper, tickLowerIndex, tickUp
     let rewarder_growth_below = growthGlobal[i];
     if (tickLower !== null) {
       if (pool.current_tick_index < tickLowerIndex) {
-        rewarder_growth_below = growthGlobal[i].sub(new BN14(tickLower.rewardersGrowthOutside[i]));
+        rewarder_growth_below = growthGlobal[i].sub(new BN13(tickLower.rewardersGrowthOutside[i]));
       } else {
         rewarder_growth_below = tickLower.rewardersGrowthOutside[i];
       }
     }
-    let rewarder_growth_above = new BN14(0);
+    let rewarder_growth_above = new BN13(0);
     if (tickUpper !== null) {
       if (pool.current_tick_index >= tickUpperIndex) {
-        rewarder_growth_above = growthGlobal[i].sub(new BN14(tickUpper.rewardersGrowthOutside[i]));
+        rewarder_growth_above = growthGlobal[i].sub(new BN13(tickUpper.rewardersGrowthOutside[i]));
       } else {
         rewarder_growth_above = tickUpper.rewardersGrowthOutside[i];
       }
     }
     const rewGrowthInside = MathUtil.subUnderflowU128(
-      MathUtil.subUnderflowU128(new BN14(growthGlobal[i]), new BN14(rewarder_growth_below)),
-      new BN14(rewarder_growth_above)
+      MathUtil.subUnderflowU128(new BN13(growthGlobal[i]), new BN13(rewarder_growth_below)),
+      new BN13(rewarder_growth_above)
     );
     rewarderGrowthInside.push(rewGrowthInside);
   }
@@ -3049,7 +2865,7 @@ function getRewardInTickRange(pool, tickLower, tickUpper, tickLowerIndex, tickUp
 }
 
 // src/utils/transaction-util.ts
-import BN15 from "bn.js";
+import BN14 from "bn.js";
 import Decimal7 from "decimal.js";
 import { Transaction } from "@mysten/sui/transactions";
 function findAdjustCoin(coinPair) {
@@ -3358,7 +3174,7 @@ var _TransactionUtil = class {
     const liquidityInput = ClmmPoolUtil.estLiquidityAndcoinAmountFromOneAmounts(
       Number(params.tick_lower),
       Number(params.tick_upper),
-      new BN15(coinAmount),
+      new BN14(coinAmount),
       params.fix_amount_a,
       true,
       slippage,
@@ -4426,7 +4242,7 @@ var _TransactionUtil = class {
           const basePath = splitPath.basePaths[i];
           a2b.push(basePath.direction);
           poolAddress.push(basePath.poolAddress);
-          rawAmountLimit.push(new BN15(basePath.inputAmount.toString()));
+          rawAmountLimit.push(new BN14(basePath.inputAmount.toString()));
           if (i === 0) {
             coinType.push(basePath.fromCoin, basePath.toCoin);
           } else {
@@ -4434,8 +4250,8 @@ var _TransactionUtil = class {
           }
         }
         const onePath = {
-          amountIn: new BN15(splitPath.inputAmount.toString()),
-          amountOut: new BN15(splitPath.outputAmount.toString()),
+          amountIn: new BN14(splitPath.inputAmount.toString()),
+          amountOut: new BN14(splitPath.outputAmount.toString()),
           poolAddress,
           a2b,
           rawAmountLimit,
@@ -4792,9 +4608,9 @@ var TxBlock = class {
 };
 
 // src/utils/deepbook-utils.ts
-import BN16 from "bn.js";
+import BN15 from "bn.js";
 import { Transaction as Transaction3 } from "@mysten/sui/transactions";
-var FLOAT_SCALING = new BN16(1e9);
+var FLOAT_SCALING = new BN15(1e9);
 var DeepbookUtils = class {
   static createAccountCap(senderAddress, sdkOptions, tx, isTransfer = false) {
     if (senderAddress.length === 0) {
@@ -4940,9 +4756,9 @@ var DeepbookUtils = class {
   static async preSwap(sdk, pool, a2b, amountIn) {
     let isExceed = false;
     let amountOut = ZERO;
-    let remainAmount = new BN16(amountIn);
+    let remainAmount = new BN15(amountIn);
     let feeAmount = ZERO;
-    const initAmountIn = new BN16(amountIn);
+    const initAmountIn = new BN15(amountIn);
     if (a2b) {
       let bids = await this.getPoolBids(sdk, pool.poolID, pool.baseAsset, pool.quoteAsset);
       if (bids === null) {
@@ -4952,16 +4768,16 @@ var DeepbookUtils = class {
         return b.price - a.price;
       });
       for (let i = 0; i < bids.length; i += 1) {
-        const curBidAmount = new BN16(bids[i].quantity);
-        const curBidPrice = new BN16(bids[i].price);
-        const fee = curBidAmount.mul(new BN16(curBidPrice)).mul(new BN16(pool.takerFeeRate)).div(FLOAT_SCALING).div(FLOAT_SCALING);
+        const curBidAmount = new BN15(bids[i].quantity);
+        const curBidPrice = new BN15(bids[i].price);
+        const fee = curBidAmount.mul(new BN15(curBidPrice)).mul(new BN15(pool.takerFeeRate)).div(FLOAT_SCALING).div(FLOAT_SCALING);
         if (remainAmount.gt(curBidAmount)) {
           remainAmount = remainAmount.sub(curBidAmount);
           amountOut = amountOut.add(curBidAmount.mul(curBidPrice).div(FLOAT_SCALING).sub(fee));
           feeAmount = feeAmount.add(fee);
         } else {
-          const curOut = remainAmount.mul(new BN16(bids[i].price)).div(FLOAT_SCALING);
-          const curFee = curOut.mul(new BN16(pool.takerFeeRate)).div(FLOAT_SCALING);
+          const curOut = remainAmount.mul(new BN15(bids[i].price)).div(FLOAT_SCALING);
+          const curFee = curOut.mul(new BN15(pool.takerFeeRate)).div(FLOAT_SCALING);
           amountOut = amountOut.add(curOut.sub(curFee));
           remainAmount = remainAmount.sub(remainAmount);
           feeAmount = feeAmount.add(curFee);
@@ -4976,15 +4792,15 @@ var DeepbookUtils = class {
         isExceed = true;
       }
       for (let i = 0; i < asks.length; i += 1) {
-        const curAskAmount = new BN16(asks[i].price).mul(new BN16(asks[i].quantity)).div(new BN16(1e9));
-        const fee = curAskAmount.mul(new BN16(pool.takerFeeRate)).div(FLOAT_SCALING);
+        const curAskAmount = new BN15(asks[i].price).mul(new BN15(asks[i].quantity)).div(new BN15(1e9));
+        const fee = curAskAmount.mul(new BN15(pool.takerFeeRate)).div(FLOAT_SCALING);
         const curAskAmountWithFee = curAskAmount.add(fee);
         if (remainAmount.gt(curAskAmount)) {
-          amountOut = amountOut.add(new BN16(asks[i].quantity));
+          amountOut = amountOut.add(new BN15(asks[i].quantity));
           remainAmount = remainAmount.sub(curAskAmountWithFee);
           feeAmount = feeAmount.add(fee);
         } else {
-          const splitNums = new BN16(asks[i].quantity).div(new BN16(pool.lotSize));
+          const splitNums = new BN15(asks[i].quantity).div(new BN15(pool.lotSize));
           const splitAmount = curAskAmountWithFee.div(splitNums);
           const swapSplitNum = remainAmount.div(splitAmount);
           amountOut = amountOut.add(swapSplitNum.muln(pool.lotSize));
@@ -5845,7 +5661,7 @@ var PoolModule = class {
 };
 
 // src/modules/positionModule.ts
-import BN17 from "bn.js";
+import BN16 from "bn.js";
 import { Transaction as Transaction5 } from "@mysten/sui/transactions";
 import { isValidSuiObjectId } from "@mysten/sui/utils";
 var PositionModule = class {
@@ -6067,8 +5883,8 @@ var PositionModule = class {
     for (let i = 0; i < valueData.length; i += 1) {
       const { parsedJson } = valueData[i];
       const posRrewarderResult = {
-        feeOwedA: new BN17(parsedJson.fee_owned_a),
-        feeOwedB: new BN17(parsedJson.fee_owned_b),
+        feeOwedA: new BN16(parsedJson.fee_owned_a),
+        feeOwedB: new BN16(parsedJson.fee_owned_b),
         position_id: parsedJson.position_id
       };
       result.push(posRrewarderResult);
@@ -6444,7 +6260,7 @@ var PositionModule = class {
 };
 
 // src/modules/rewarderModule.ts
-import BN18 from "bn.js";
+import BN17 from "bn.js";
 import { Transaction as Transaction6 } from "@mysten/sui/transactions";
 var RewarderModule = class {
   _sdk;
@@ -6470,7 +6286,7 @@ var RewarderModule = class {
     }
     const emissionsEveryDay = [];
     for (const rewarderInfo of rewarderInfos) {
-      const emissionSeconds = MathUtil.fromX64(new BN18(rewarderInfo.emissions_per_second));
+      const emissionSeconds = MathUtil.fromX64(new BN17(rewarderInfo.emissions_per_second));
       emissionsEveryDay.push({
         emissions: Math.floor(emissionSeconds.toNumber() * 60 * 60 * 24),
         coin_address: rewarderInfo.coinAddress
@@ -6489,20 +6305,20 @@ var RewarderModule = class {
     const currentPool = await this.sdk.Pool.getPool(poolID);
     const lastTime = currentPool.rewarder_last_updated_time;
     currentPool.rewarder_last_updated_time = currentTime.toString();
-    if (Number(currentPool.liquidity) === 0 || currentTime.eq(new BN18(lastTime))) {
+    if (Number(currentPool.liquidity) === 0 || currentTime.eq(new BN17(lastTime))) {
       return currentPool;
     }
-    const timeDelta = currentTime.div(new BN18(1e3)).sub(new BN18(lastTime)).add(new BN18(15));
+    const timeDelta = currentTime.div(new BN17(1e3)).sub(new BN17(lastTime)).add(new BN17(15));
     const rewarderInfos = currentPool.rewarder_infos;
     for (let i = 0; i < rewarderInfos.length; i += 1) {
       const rewarderInfo = rewarderInfos[i];
       const rewarderGrowthDelta = MathUtil.checkMulDivFloor(
         timeDelta,
-        new BN18(rewarderInfo.emissions_per_second),
-        new BN18(currentPool.liquidity),
+        new BN17(rewarderInfo.emissions_per_second),
+        new BN17(currentPool.liquidity),
         128
       );
-      this.growthGlobal[i] = new BN18(rewarderInfo.growth_global).add(new BN18(rewarderGrowthDelta));
+      this.growthGlobal[i] = new BN17(rewarderInfo.growth_global).add(new BN17(rewarderGrowthDelta));
     }
     return currentPool;
   }
@@ -6517,7 +6333,7 @@ var RewarderModule = class {
    */
   async posRewardersAmount(poolID, positionHandle, positionID) {
     const currentTime = Date.parse((/* @__PURE__ */ new Date()).toString());
-    const pool = await this.updatePoolRewarder(poolID, new BN18(currentTime));
+    const pool = await this.updatePoolRewarder(poolID, new BN17(currentTime));
     const position = await this.sdk.Position.getPositionRewarders(positionHandle, positionID);
     if (position === void 0) {
       return [];
@@ -6538,7 +6354,7 @@ var RewarderModule = class {
    */
   async poolRewardersAmount(accountAddress, poolID) {
     const currentTime = Date.parse((/* @__PURE__ */ new Date()).toString());
-    const pool = await this.updatePoolRewarder(poolID, new BN18(currentTime));
+    const pool = await this.updatePoolRewarder(poolID, new BN17(currentTime));
     const positions = await this.sdk.Position.getPositionList(accountAddress, [poolID]);
     const tickDatas = await this.getPoolLowerAndUpperTicks(pool.ticks_handle, positions);
     const rewarderAmount = [ZERO, ZERO, ZERO];
@@ -6565,38 +6381,38 @@ var RewarderModule = class {
     const growthInside = [];
     const AmountOwed = [];
     if (rewardersInside.length > 0) {
-      let growthDelta0 = MathUtil.subUnderflowU128(rewardersInside[0], new BN18(position.reward_growth_inside_0));
-      if (growthDelta0.gt(new BN18("3402823669209384634633745948738404"))) {
+      let growthDelta0 = MathUtil.subUnderflowU128(rewardersInside[0], new BN17(position.reward_growth_inside_0));
+      if (growthDelta0.gt(new BN17("3402823669209384634633745948738404"))) {
         growthDelta0 = ONE;
       }
-      const amountOwed_0 = MathUtil.checkMulShiftRight(new BN18(position.liquidity), growthDelta0, 64, 128);
+      const amountOwed_0 = MathUtil.checkMulShiftRight(new BN17(position.liquidity), growthDelta0, 64, 128);
       growthInside.push(rewardersInside[0]);
       AmountOwed.push({
-        amount_owed: new BN18(position.reward_amount_owed_0).add(amountOwed_0),
+        amount_owed: new BN17(position.reward_amount_owed_0).add(amountOwed_0),
         coin_address: pool.rewarder_infos[0].coinAddress
       });
     }
     if (rewardersInside.length > 1) {
-      let growthDelta_1 = MathUtil.subUnderflowU128(rewardersInside[1], new BN18(position.reward_growth_inside_1));
-      if (growthDelta_1.gt(new BN18("3402823669209384634633745948738404"))) {
+      let growthDelta_1 = MathUtil.subUnderflowU128(rewardersInside[1], new BN17(position.reward_growth_inside_1));
+      if (growthDelta_1.gt(new BN17("3402823669209384634633745948738404"))) {
         growthDelta_1 = ONE;
       }
-      const amountOwed_1 = MathUtil.checkMulShiftRight(new BN18(position.liquidity), growthDelta_1, 64, 128);
+      const amountOwed_1 = MathUtil.checkMulShiftRight(new BN17(position.liquidity), growthDelta_1, 64, 128);
       growthInside.push(rewardersInside[1]);
       AmountOwed.push({
-        amount_owed: new BN18(position.reward_amount_owed_1).add(amountOwed_1),
+        amount_owed: new BN17(position.reward_amount_owed_1).add(amountOwed_1),
         coin_address: pool.rewarder_infos[1].coinAddress
       });
     }
     if (rewardersInside.length > 2) {
-      let growthDelta_2 = MathUtil.subUnderflowU128(rewardersInside[2], new BN18(position.reward_growth_inside_2));
-      if (growthDelta_2.gt(new BN18("3402823669209384634633745948738404"))) {
+      let growthDelta_2 = MathUtil.subUnderflowU128(rewardersInside[2], new BN17(position.reward_growth_inside_2));
+      if (growthDelta_2.gt(new BN17("3402823669209384634633745948738404"))) {
         growthDelta_2 = ONE;
       }
-      const amountOwed_2 = MathUtil.checkMulShiftRight(new BN18(position.liquidity), growthDelta_2, 64, 128);
+      const amountOwed_2 = MathUtil.checkMulShiftRight(new BN17(position.liquidity), growthDelta_2, 64, 128);
       growthInside.push(rewardersInside[2]);
       AmountOwed.push({
-        amount_owed: new BN18(position.reward_amount_owed_2).add(amountOwed_2),
+        amount_owed: new BN17(position.reward_amount_owed_2).add(amountOwed_2),
         coin_address: pool.rewarder_infos[2].coinAddress
       });
     }
@@ -6710,8 +6526,8 @@ var RewarderModule = class {
     for (let i = 0; i < valueData.length; i += 1) {
       const { parsedJson } = valueData[i];
       const posRrewarderResult = {
-        feeOwedA: new BN18(parsedJson.fee_owned_a),
-        feeOwedB: new BN18(parsedJson.fee_owned_b),
+        feeOwedA: new BN17(parsedJson.fee_owned_a),
+        feeOwedB: new BN17(parsedJson.fee_owned_b),
         position_id: parsedJson.position_id
       };
       result.push(posRrewarderResult);
@@ -6774,7 +6590,7 @@ var RewarderModule = class {
       };
       for (let j = 0; j < params[i].rewarderInfo.length; j += 1) {
         posRrewarderResult.rewarderAmountOwed.push({
-          amount_owed: new BN18(valueData[i].parsedJson.data[j]),
+          amount_owed: new BN17(valueData[i].parsedJson.data[j]),
           coin_address: params[i].rewarderInfo[j].coinAddress
         });
       }
@@ -6963,7 +6779,7 @@ var RewarderModule = class {
 };
 
 // src/modules/routerModule.ts
-import BN19 from "bn.js";
+import BN18 from "bn.js";
 import { Graph, GraphEdge, GraphVertex } from "@syntsugar/cc-graph";
 import { Transaction as Transaction7 } from "@mysten/sui/transactions";
 function _pairSymbol(base, quote) {
@@ -7245,8 +7061,8 @@ var RouterModule = class {
       if (swapWithMultiPoolParams != null) {
         const preSwapResult2 = await this.sdk.Swap.preSwapWithMultiPool(swapWithMultiPoolParams);
         const onePath2 = {
-          amountIn: new BN19(preSwapResult2.estimatedAmountIn),
-          amountOut: new BN19(preSwapResult2.estimatedAmountOut),
+          amountIn: new BN18(preSwapResult2.estimatedAmountIn),
+          amountOut: new BN18(preSwapResult2.estimatedAmountOut),
           poolAddress: [preSwapResult2.poolAddress],
           a2b: [preSwapResult2.aToB],
           rawAmountLimit: byAmountIn ? [preSwapResult2.estimatedAmountOut] : [preSwapResult2.estimatedAmountIn],
@@ -7259,8 +7075,8 @@ var RouterModule = class {
           priceSlippagePoint
         };
         const result2 = {
-          amountIn: new BN19(preSwapResult2.estimatedAmountIn),
-          amountOut: new BN19(preSwapResult2.estimatedAmountOut),
+          amountIn: new BN18(preSwapResult2.estimatedAmountIn),
+          amountOut: new BN18(preSwapResult2.estimatedAmountOut),
           paths: [onePath2],
           a2b: preSwapResult2.aToB,
           b2c: void 0,
@@ -7282,8 +7098,8 @@ var RouterModule = class {
       if (swapWithMultiPoolParams != null) {
         const preSwapResult2 = await this.sdk.Swap.preSwapWithMultiPool(swapWithMultiPoolParams);
         const onePath2 = {
-          amountIn: new BN19(preSwapResult2.estimatedAmountIn),
-          amountOut: new BN19(preSwapResult2.estimatedAmountOut),
+          amountIn: new BN18(preSwapResult2.estimatedAmountIn),
+          amountOut: new BN18(preSwapResult2.estimatedAmountOut),
           poolAddress: [preSwapResult2.poolAddress],
           a2b: [preSwapResult2.aToB],
           rawAmountLimit: byAmountIn ? [preSwapResult2.estimatedAmountOut] : [preSwapResult2.estimatedAmountIn],
@@ -7296,8 +7112,8 @@ var RouterModule = class {
           priceSlippagePoint
         };
         const result3 = {
-          amountIn: new BN19(preSwapResult2.estimatedAmountIn),
-          amountOut: new BN19(preSwapResult2.estimatedAmountOut),
+          amountIn: new BN18(preSwapResult2.estimatedAmountIn),
+          amountOut: new BN18(preSwapResult2.estimatedAmountOut),
           paths: [onePath2],
           a2b: preSwapResult2.aToB,
           b2c: void 0,
@@ -7378,8 +7194,8 @@ var RouterModule = class {
     if (swapWithMultiPoolParams != null) {
       const preSwapResult = await this.sdk.Swap.preSwapWithMultiPool(swapWithMultiPoolParams);
       const onePath = {
-        amountIn: new BN19(preSwapResult.estimatedAmountIn),
-        amountOut: new BN19(preSwapResult.estimatedAmountOut),
+        amountIn: new BN18(preSwapResult.estimatedAmountIn),
+        amountOut: new BN18(preSwapResult.estimatedAmountOut),
         poolAddress: [preSwapResult.poolAddress],
         a2b: [preSwapResult.aToB],
         rawAmountLimit: byAmountIn ? [preSwapResult.estimatedAmountOut] : [preSwapResult.estimatedAmountIn],
@@ -7392,8 +7208,8 @@ var RouterModule = class {
         priceSlippagePoint
       };
       const result = {
-        amountIn: new BN19(preSwapResult.estimatedAmountIn),
-        amountOut: new BN19(preSwapResult.estimatedAmountOut),
+        amountIn: new BN18(preSwapResult.estimatedAmountIn),
+        amountOut: new BN18(preSwapResult.estimatedAmountOut),
         paths: [onePath],
         a2b: preSwapResult.aToB,
         b2c: void 0,
@@ -7477,13 +7293,13 @@ var RouterModule = class {
         continue;
       }
       if (params[0].byAmountIn) {
-        const amount = new BN19(valueData[i].parsedJson.data.amount_out);
+        const amount = new BN18(valueData[i].parsedJson.data.amount_out);
         if (amount.gt(tempMaxAmount)) {
           tempIndex = i;
           tempMaxAmount = amount;
         }
       } else {
-        const amount = params[i].stepNums > 1 ? new BN19(valueData[i].parsedJson.data.amount_in) : new BN19(valueData[i].parsedJson.data.amount_in).add(new BN19(valueData[i].parsedJson.data.fee_amount));
+        const amount = params[i].stepNums > 1 ? new BN18(valueData[i].parsedJson.data.amount_in) : new BN18(valueData[i].parsedJson.data.amount_in).add(new BN18(valueData[i].parsedJson.data.fee_amount));
         if (amount.lt(tempMaxAmount)) {
           tempIndex = i;
           tempMaxAmount = amount;
@@ -7553,7 +7369,7 @@ var RouterModule = class {
 };
 
 // src/modules/swapModule.ts
-import BN20 from "bn.js";
+import BN19 from "bn.js";
 import Decimal8 from "decimal.js";
 import { Transaction as Transaction8 } from "@mysten/sui/transactions";
 var AMM_SWAP_MODULE = "amm_swap";
@@ -7669,13 +7485,13 @@ var SwapModule = class {
         continue;
       }
       if (params.byAmountIn) {
-        const amount = new BN20(valueData[i].parsedJson.data.amount_out);
+        const amount = new BN19(valueData[i].parsedJson.data.amount_out);
         if (amount.gt(tempMaxAmount)) {
           tempIndex = i;
           tempMaxAmount = amount;
         }
       } else {
-        const amount = new BN20(valueData[i].parsedJson.data.amount_out);
+        const amount = new BN19(valueData[i].parsedJson.data.amount_out);
         if (amount.lt(tempMaxAmount)) {
           tempIndex = i;
           tempMaxAmount = amount;
@@ -7739,7 +7555,7 @@ var SwapModule = class {
     return this.transformSwapData(params, valueData[0].parsedJson.data);
   }
   transformSwapData(params, data) {
-    const estimatedAmountIn = data.amount_in && data.fee_amount ? new BN20(data.amount_in).add(new BN20(data.fee_amount)).toString() : "";
+    const estimatedAmountIn = data.amount_in && data.fee_amount ? new BN19(data.amount_in).add(new BN19(data.fee_amount)).toString() : "";
     return {
       poolAddress: params.pool.poolAddress,
       currentSqrtPrice: params.currentSqrtPrice,
@@ -7756,7 +7572,7 @@ var SwapModule = class {
   transformSwapWithMultiPoolData(params, jsonData) {
     const { data } = jsonData;
     console.log("json data. ", data);
-    const estimatedAmountIn = data.amount_in && data.fee_amount ? new BN20(data.amount_in).add(new BN20(data.fee_amount)).toString() : "";
+    const estimatedAmountIn = data.amount_in && data.fee_amount ? new BN19(data.amount_in).add(new BN19(data.fee_amount)).toString() : "";
     return {
       poolAddress: params.poolAddress,
       estimatedAmountIn,
@@ -9269,7 +9085,7 @@ var TokenModule = class {
 };
 
 // src/modules/routerModuleV2.ts
-import BN21 from "bn.js";
+import BN20 from "bn.js";
 import Decimal9 from "decimal.js";
 import { v4 as uuidv4 } from "uuid";
 import axios from "axios";
@@ -9313,12 +9129,12 @@ var RouterModuleV2 = class {
               outputAmount: basePath.output_amount,
               inputAmount: basePath.input_amount,
               feeRate: basePath.fee_rate,
-              currentSqrtPrice: new BN21(basePath.current_sqrt_price.toString()),
-              afterSqrtPrice: basePath.label === "Magma" ? new BN21(basePath.after_sqrt_price.toString()) : ZERO,
+              currentSqrtPrice: new BN20(basePath.current_sqrt_price.toString()),
+              afterSqrtPrice: basePath.label === "Magma" ? new BN20(basePath.after_sqrt_price.toString()) : ZERO,
               fromDecimal: basePath.from_decimal,
               toDecimal: basePath.to_decimal,
               currentPrice: this.calculatePrice(
-                new BN21(basePath.current_sqrt_price.toString()),
+                new BN20(basePath.current_sqrt_price.toString()),
                 basePath.from_decimal,
                 basePath.to_decimal,
                 basePath.direction,
@@ -9401,7 +9217,7 @@ var RouterModuleV2 = class {
       const priceResult = await this.sdk.Router.priceUseV1(
         from,
         to,
-        new BN21(amount),
+        new BN20(amount),
         byAmountIn,
         priceSplitPoint,
         partner,
@@ -9413,7 +9229,7 @@ var RouterModuleV2 = class {
         if (path.poolAddress.length > 1) {
           const fromDecimal0 = this.sdk.Router.tokenInfo(path.coinType[0]).decimals;
           const toDecimal0 = this.sdk.Router.tokenInfo(path.coinType[1]).decimals;
-          const currentPrice = path.a2b[0] ? TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[0]), fromDecimal0, toDecimal0) : TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[0]), toDecimal0, fromDecimal0);
+          const currentPrice = path.a2b[0] ? TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[0]), fromDecimal0, toDecimal0) : TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[0]), toDecimal0, fromDecimal0);
           const path0 = {
             direction: path.a2b[0],
             label: "Magma",
@@ -9430,7 +9246,7 @@ var RouterModuleV2 = class {
           };
           const fromDecimal1 = this.sdk.Router.tokenInfo(path.coinType[1]).decimals;
           const toDecimal1 = this.sdk.Router.tokenInfo(path.coinType[2]).decimals;
-          const currentPrice1 = path.a2b[1] ? TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[1]), fromDecimal1, toDecimal1) : TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[1]), toDecimal1, fromDecimal1);
+          const currentPrice1 = path.a2b[1] ? TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[1]), fromDecimal1, toDecimal1) : TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[1]), toDecimal1, fromDecimal1);
           const path1 = {
             direction: path.a2b[1],
             label: "Magma",
@@ -9449,7 +9265,7 @@ var RouterModuleV2 = class {
         } else {
           const fromDecimal = this.sdk.Router.tokenInfo(path.coinType[0]).decimals;
           const toDecimal = this.sdk.Router.tokenInfo(path.coinType[1]).decimals;
-          const currentPrice = path.a2b[0] ? TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[0]), fromDecimal, toDecimal) : TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[0]), toDecimal, fromDecimal);
+          const currentPrice = path.a2b[0] ? TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[0]), fromDecimal, toDecimal) : TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[0]), toDecimal, fromDecimal);
           const path0 = {
             direction: path.a2b[0],
             label: "Magma",
@@ -9534,7 +9350,7 @@ var RouterModuleV2 = class {
     const priceResult = await this.sdk.Router.priceUseV1(
       from,
       to,
-      new BN21(amount),
+      new BN20(amount),
       byAmountIn,
       priceSplitPoint,
       partner,
@@ -9546,7 +9362,7 @@ var RouterModuleV2 = class {
       if (path.poolAddress.length > 1) {
         const fromDecimal0 = this.sdk.Router.tokenInfo(path.coinType[0]).decimals;
         const toDecimal0 = this.sdk.Router.tokenInfo(path.coinType[1]).decimals;
-        const currentPrice = path.a2b[0] ? TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[0]), fromDecimal0, toDecimal0) : TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[0]), toDecimal0, fromDecimal0);
+        const currentPrice = path.a2b[0] ? TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[0]), fromDecimal0, toDecimal0) : TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[0]), toDecimal0, fromDecimal0);
         const path0 = {
           direction: path.a2b[0],
           label: "Magma",
@@ -9563,7 +9379,7 @@ var RouterModuleV2 = class {
         };
         const fromDecimal1 = this.sdk.Router.tokenInfo(path.coinType[1]).decimals;
         const toDecimal1 = this.sdk.Router.tokenInfo(path.coinType[2]).decimals;
-        const currentPrice1 = path.a2b[1] ? TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[1]), fromDecimal1, toDecimal1) : TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[1]), toDecimal1, fromDecimal1);
+        const currentPrice1 = path.a2b[1] ? TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[1]), fromDecimal1, toDecimal1) : TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[1]), toDecimal1, fromDecimal1);
         const path1 = {
           direction: path.a2b[1],
           label: "Magma",
@@ -9582,7 +9398,7 @@ var RouterModuleV2 = class {
       } else {
         const fromDecimal = this.sdk.Router.tokenInfo(path.coinType[0]).decimals;
         const toDecimal = this.sdk.Router.tokenInfo(path.coinType[1]).decimals;
-        const currentPrice = path.a2b[0] ? TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[0]), fromDecimal, toDecimal) : TickMath.sqrtPriceX64ToPrice(new BN21(priceResult.currentSqrtPrice[0]), toDecimal, fromDecimal);
+        const currentPrice = path.a2b[0] ? TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[0]), fromDecimal, toDecimal) : TickMath.sqrtPriceX64ToPrice(new BN20(priceResult.currentSqrtPrice[0]), toDecimal, fromDecimal);
         const path0 = {
           direction: path.a2b[0],
           label: "Magma",
@@ -10610,10 +10426,11 @@ var DlmmModule = class {
     });
     return tx;
   }
+  // async mintByStrategySingle(params: MintByStrategySingleParams): Promise<Transaction> {}
   async mintByStrategy(params) {
     const tx = new Transaction12();
     const slippage = new Decimal10(params.slippage);
-    const lower_slippage = new Decimal10(1).plus(slippage.div(new Decimal10(1e4)));
+    const lower_slippage = new Decimal10(1).sub(slippage.div(new Decimal10(1e4)));
     const upper_slippage = new Decimal10(1).plus(slippage.div(new Decimal10(1e4)));
     tx.setSender(this.sdk.senderAddress);
     const { dlmm_pool, integrate } = this.sdk.sdkOptions;
@@ -10630,13 +10447,13 @@ var DlmmModule = class {
     let amount_min = 0;
     let amount_max = 0;
     if (params.fixCoinA) {
-      amount_min = new Decimal10(params.amountATotal).mul(lower_slippage).toDecimalPlaces(0).toNumber();
-      amount_max = new Decimal10(params.amountATotal).mul(upper_slippage).toDecimalPlaces(0).toNumber();
+      amount_min = new Decimal10(params.amountBTotal).mul(lower_slippage).toDecimalPlaces(0).toNumber();
+      amount_max = new Decimal10(params.amountBTotal).mul(upper_slippage).toDecimalPlaces(0).toNumber();
       primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(amount_max), params.coinTypeB, false, true);
     }
     if (params.fixCoinB) {
-      amount_min = new Decimal10(params.amountBTotal).mul(lower_slippage).toDecimalPlaces(0).toNumber();
-      amount_max = new Decimal10(params.amountBTotal).mul(upper_slippage).toDecimalPlaces(0).toNumber();
+      amount_min = new Decimal10(params.amountATotal).mul(lower_slippage).toDecimalPlaces(0).toNumber();
+      amount_max = new Decimal10(params.amountATotal).mul(upper_slippage).toDecimalPlaces(0).toNumber();
       primaryCoinAInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(amount_max), params.coinTypeB, false, true);
     }
     if (params.fixCoinA && params.fixCoinB) {
@@ -10653,8 +10470,8 @@ var DlmmModule = class {
       tx.pure.u64(params.amountATotal),
       tx.pure.u64(params.amountBTotal),
       tx.pure.u8(params.strategy),
-      tx.pure.u32(params.min_bin),
-      tx.pure.u32(params.max_bin),
+      tx.pure.u32(get_storage_id_from_real_id(params.min_bin)),
+      tx.pure.u32(get_storage_id_from_real_id(params.max_bin)),
       tx.pure.u32(active_min),
       tx.pure.u32(active_max),
       tx.pure.u64(amount_min),
@@ -10662,7 +10479,7 @@ var DlmmModule = class {
       tx.object(CLOCK_ADDRESS)
     ];
     tx.moveCall({
-      target: `${integrate.published_at}::${DlmmScript}::mint_percent`,
+      target: `${integrate.published_at}::${DlmmScript}::mint_by_strategy`,
       typeArguments,
       arguments: args
     });
@@ -10884,7 +10701,8 @@ var DlmmModule = class {
   async createPairAddLiquidity(params) {
     const tx = new Transaction12();
     tx.setSender(this.sdk.senderAddress);
-    const { dlmm_pool, integrate } = this.sdk.sdkOptions;
+    const { clmm_pool, dlmm_pool, integrate } = this.sdk.sdkOptions;
+    const { global_config_id } = getPackagerConfigs(clmm_pool);
     const dlmmConfig = getPackagerConfigs(dlmm_pool);
     const typeArguments = [params.coinTypeA, params.coinTypeB];
     const allCoins = await this._sdk.getOwnerCoinAssets(this._sdk.senderAddress);
@@ -10892,14 +10710,19 @@ var DlmmModule = class {
     const amountBTotal = params.amountsY.reduce((accumulator, currentValue) => accumulator + currentValue, 0);
     const primaryCoinAInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(amountATotal), params.coinTypeA, false, true);
     const primaryCoinBInputs = TransactionUtil.buildCoinForAmount(tx, allCoins, BigInt(amountBTotal), params.coinTypeB, false, true);
+    const storageIds = [];
+    params.realIds.forEach((i) => {
+      storageIds.push(get_storage_id_from_real_id(i));
+    });
     const args = [
       tx.object(dlmmConfig.factory),
+      tx.object(global_config_id),
       tx.pure.u64(params.baseFee),
       tx.pure.u16(params.binStep),
-      tx.pure.u32(params.activeId),
+      tx.pure.u32(get_storage_id_from_real_id(params.activeId)),
       primaryCoinAInputs.targetCoin,
       primaryCoinBInputs.targetCoin,
-      tx.pure.vector("u32", params.storageIds),
+      tx.pure.vector("u32", storageIds),
       tx.pure.vector("u64", params.amountsX),
       tx.pure.vector("u64", params.amountsY),
       tx.pure.address(params.to),
@@ -11011,8 +10834,8 @@ var DlmmModule = class {
     const positionLiquidity = await this.getPositionLiquidity({
       pair: position.pool,
       positionId: position.pos_object_id,
-      coinTypeA: pool?.coin_a,
-      coinTypeB: pool?.coin_b
+      coinTypeA: pool.coin_a,
+      coinTypeB: pool.coin_b
     });
     const rewards_token = pool_reward_coins.get(position.pool) || [];
     let positionRewards = { position_id: position.pos_object_id, reward: [], amount: [] };
@@ -11020,16 +10843,16 @@ var DlmmModule = class {
       positionRewards = await this.getEarnedRewards({
         pool_id: position.pool,
         position_id: position.pos_object_id,
-        coin_a: pool?.coin_a,
-        coin_b: pool?.coin_b,
+        coin_a: pool.coin_a,
+        coin_b: pool.coin_b,
         rewards_token: pool_reward_coins.get(position.pool) || []
       });
     }
     const positionFees = await this.getEarnedFees({
       pool_id: position.pool,
       position_id: position.pos_object_id,
-      coin_a: pool?.coin_a,
-      coin_b: pool?.coin_b
+      coin_a: pool.coin_a,
+      coin_b: pool.coin_b
     });
     return {
       position,
@@ -11088,8 +10911,8 @@ var DlmmModule = class {
       const positionLiquidity = await this.getPositionLiquidity({
         pair: item.pool,
         positionId: item.pos_object_id,
-        coinTypeA: pool?.coin_a,
-        coinTypeB: pool?.coin_b
+        coinTypeA: pool.coin_a,
+        coinTypeB: pool.coin_b
       });
       const rewards_token = pool_reward_coins.get(item.pool) || [];
       let positionRewards = { position_id: item.pos_object_id, reward: [], amount: [] };
@@ -11097,16 +10920,16 @@ var DlmmModule = class {
         positionRewards = await this.getEarnedRewards({
           pool_id: item.pool,
           position_id: item.pos_object_id,
-          coin_a: pool?.coin_a,
-          coin_b: pool?.coin_b,
+          coin_a: pool.coin_a,
+          coin_b: pool.coin_b,
           rewards_token: pool_reward_coins.get(item.pool) || []
         });
       }
       const positionFees = await this.getEarnedFees({
         pool_id: item.pool,
         position_id: item.pos_object_id,
-        coin_a: pool?.coin_a,
-        coin_b: pool?.coin_b
+        coin_a: pool.coin_a,
+        coin_b: pool.coin_b
       });
       out.push({
         position: item,