@meteora-ag/dlmm 1.9.13 → 1.9.14-rc.1

package/dist/index.mjs

@@ -19,7 +19,7 @@ import {
   SystemProgram as SystemProgram2,
   Transaction
 } from "@solana/web3.js";
-import Decimal11 from "decimal.js";
+import Decimal13 from "decimal.js";
 
 // src/dlmm/constants/index.ts
 import { LAMPORTS_PER_SOL, PublicKey } from "@solana/web3.js";
@@ -10323,13 +10323,17 @@ var LIMIT_ORDER_MIN_SIZE = 112;
 var LIMIT_ORDER_BIN_DATA_SIZE = 32;
 var BinLiquidity;
 ((BinLiquidity2) => {
-  function fromBin(bin, binId, binStep, baseTokenDecimal, quoteTokenDecimal, version, lbPair) {
+  function fromBin(bin, binId, binStep, baseTokenDecimal, quoteTokenDecimal, version, lbPair, baseMultiplier = new Decimal2(1), quoteMultiplier = new Decimal2(1)) {
     const pricePerLamport = getPriceOfBinByBinId(binId, binStep).toString();
     const supportLimitOrder = isSupportLimitOrder(lbPair);
-    const xAmount = bin.amountX;
-    const yAmount = bin.amountY;
+    const xAmount = scaleAmountByMultiplier(bin.amountX, baseMultiplier);
+    const yAmount = scaleAmountByMultiplier(bin.amountY, quoteMultiplier);
     const supply = bin.liquiditySupply;
-    const pricePerToken = new Decimal2(pricePerLamport).mul(new Decimal2(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString();
+    const pricePerToken = scalePricePerToken(
+      new Decimal2(pricePerLamport).mul(new Decimal2(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString(),
+      baseMultiplier,
+      quoteMultiplier
+    );
     const feeAmountXPerTokenStored = bin.feeAmountXPerTokenStored;
     const feeAmountYPerTokenStored = bin.feeAmountYPerTokenStored;
     if (supportLimitOrder) {
@@ -10379,7 +10383,7 @@ var BinLiquidity;
     }
   }
   BinLiquidity2.fromBin = fromBin;
-  function empty(binId, binStep, baseTokenDecimal, quoteTokenDecimal, version) {
+  function empty(binId, binStep, baseTokenDecimal, quoteTokenDecimal, version, baseMultiplier = new Decimal2(1), quoteMultiplier = new Decimal2(1)) {
     const pricePerLamport = getPriceOfBinByBinId(binId, binStep).toString();
     return {
       binId,
@@ -10388,7 +10392,11 @@ var BinLiquidity;
       supply: new BN2(0),
       price: pricePerLamport,
       version,
-      pricePerToken: new Decimal2(pricePerLamport).mul(new Decimal2(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString(),
+      pricePerToken: scalePricePerToken(
+        new Decimal2(pricePerLamport).mul(new Decimal2(10 ** (baseTokenDecimal - quoteTokenDecimal))).toString(),
+        baseMultiplier,
+        quoteMultiplier
+      ),
       feeAmountXPerTokenStored: new BN2(0),
       feeAmountYPerTokenStored: new BN2(0),
       rewardPerTokenStored: [new BN2(0), new BN2(0)],
@@ -10450,6 +10458,7 @@ var LimitOrderStatus = /* @__PURE__ */ ((LimitOrderStatus2) => {
 // src/dlmm/helpers/binArray.ts
 import { BN as BN8 } from "@coral-xyz/anchor";
 import { PublicKey as PublicKey5 } from "@solana/web3.js";
+import Decimal7 from "decimal.js";
 
 // src/dlmm/helpers/derive.ts
 import { PublicKey as PublicKey3 } from "@solana/web3.js";
@@ -10614,7 +10623,7 @@ function deriveOperator(whitelistedSigner, programId) {
 
 // src/dlmm/helpers/math.ts
 import { BN as BN7 } from "@coral-xyz/anchor";
-import Decimal5 from "decimal.js";
+import Decimal6 from "decimal.js";
 
 // src/dlmm/helpers/u64xu64_math.ts
 import BN3 from "bn.js";
@@ -10723,11 +10732,11 @@ function pow(base, exp) {
 // src/dlmm/helpers/weight.ts
 import { BN as BN6 } from "@coral-xyz/anchor";
 import gaussian from "gaussian";
-import Decimal4 from "decimal.js";
+import Decimal5 from "decimal.js";
 
 // src/dlmm/helpers/weightToAmounts.ts
 import { BN as BN5 } from "@coral-xyz/anchor";
-import Decimal3 from "decimal.js";
+import Decimal4 from "decimal.js";
 
 // src/dlmm/helpers/token_2022.ts
 import {
@@ -10746,6 +10755,7 @@ import {
   PublicKey as PublicKey4
 } from "@solana/web3.js";
 import BN4 from "bn.js";
+import Decimal3 from "decimal.js";
 async function getMultipleMintsExtraAccountMetasForTransferHook(connection, mintAddressesWithAccountInfo) {
   const extraAccountMetas = await Promise.all(
     mintAddressesWithAccountInfo.map(
@@ -10886,6 +10896,45 @@ function calculateTransferFeeExcludedAmount(transferFeeIncludedAmount, mint, cur
     transferFee: new BN4(transferFee.toString())
   };
 }
+var SCALED_UI_AMOUNT_CONFIG_EXTENSION_TYPE = 25;
+var SCALED_UI_AMOUNT_CONFIG_SIZE = 56;
+function getScaledUiAmountMultiplier(mint, unixTimestamp) {
+  const tlvData = mint.tlvData;
+  if (!tlvData || tlvData.length === 0) {
+    return new Decimal3(1);
+  }
+  let offset = 0;
+  while (offset + 4 <= tlvData.length) {
+    const extensionType = tlvData.readUInt16LE(offset);
+    const length = tlvData.readUInt16LE(offset + 2);
+    const dataStart = offset + 4;
+    if (extensionType === SCALED_UI_AMOUNT_CONFIG_EXTENSION_TYPE && dataStart + SCALED_UI_AMOUNT_CONFIG_SIZE <= tlvData.length) {
+      const multiplier = tlvData.readDoubleLE(dataStart + 32);
+      const newMultiplierEffectiveTimestamp = tlvData.readBigUInt64LE(
+        dataStart + 40
+      );
+      const newMultiplier = tlvData.readDoubleLE(dataStart + 48);
+      const effectiveMultiplier = BigInt(unixTimestamp) >= newMultiplierEffectiveTimestamp ? newMultiplier : multiplier;
+      return new Decimal3(effectiveMultiplier);
+    }
+    offset = dataStart + length;
+  }
+  return new Decimal3(1);
+}
+function scaleAmountByMultiplier(amount, multiplier) {
+  if (multiplier.eq(1)) {
+    return amount;
+  }
+  return new BN4(
+    new Decimal3(amount.toString()).mul(multiplier).floor().toString()
+  );
+}
+function scalePricePerToken(pricePerToken, baseMultiplier, quoteMultiplier) {
+  if (baseMultiplier.isZero()) {
+    return pricePerToken;
+  }
+  return new Decimal3(pricePerToken).mul(quoteMultiplier).div(baseMultiplier).toString();
+}
 
 // src/dlmm/helpers/weightToAmounts.ts
 function toAmountBidSide(activeId, totalAmount, distributions, mintY, clock) {
@@ -10896,8 +10945,8 @@ function toAmountBidSide(activeId, totalAmount, distributions, mintY, clock) {
   ).amount;
   const totalWeight = distributions.reduce(function(sum, el) {
     return el.binId > activeId ? sum : sum.add(el.weight);
-  }, new Decimal3(0));
-  if (totalWeight.cmp(new Decimal3(0)) != 1) {
+  }, new Decimal4(0));
+  if (totalWeight.cmp(new Decimal4(0)) != 1) {
     throw Error("Invalid parameteres");
   }
   return distributions.map((bin) => {
@@ -10910,7 +10959,7 @@ function toAmountBidSide(activeId, totalAmount, distributions, mintY, clock) {
       return {
         binId: bin.binId,
         amount: new BN5(
-          new Decimal3(totalAmount.toString()).mul(new Decimal3(bin.weight).div(totalWeight)).floor().toString()
+          new Decimal4(totalAmount.toString()).mul(new Decimal4(bin.weight).div(totalWeight)).floor().toString()
         )
       };
     }
@@ -10927,11 +10976,11 @@ function toAmountAskSide(activeId, binStep, totalAmount, distributions, mintX, c
       return sum;
     } else {
       const price = getPriceOfBinByBinId(el.binId, binStep);
-      const weightPerPrice = new Decimal3(el.weight).div(price);
+      const weightPerPrice = new Decimal4(el.weight).div(price);
       return sum.add(weightPerPrice);
     }
-  }, new Decimal3(0));
-  if (totalWeight.cmp(new Decimal3(0)) != 1) {
+  }, new Decimal4(0));
+  if (totalWeight.cmp(new Decimal4(0)) != 1) {
     throw Error("Invalid parameteres");
   }
   return distributions.map((bin) => {
@@ -10942,11 +10991,11 @@ function toAmountAskSide(activeId, binStep, totalAmount, distributions, mintX, c
       };
     } else {
       const price = getPriceOfBinByBinId(bin.binId, binStep);
-      const weightPerPrice = new Decimal3(bin.weight).div(price);
+      const weightPerPrice = new Decimal4(bin.weight).div(price);
       return {
         binId: bin.binId,
         amount: new BN5(
-          new Decimal3(totalAmount.toString()).mul(weightPerPrice).div(totalWeight).floor().toString()
+          new Decimal4(totalAmount.toString()).mul(weightPerPrice).div(totalWeight).floor().toString()
         )
       };
     }
@@ -11001,23 +11050,23 @@ function toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBi
   });
   if (activeBins.length === 1) {
     const p0 = getPriceOfBinByBinId(activeId, binStep);
-    let wx0 = new Decimal3(0);
-    let wy0 = new Decimal3(0);
+    let wx0 = new Decimal4(0);
+    let wy0 = new Decimal4(0);
     const activeBin = activeBins[0];
     if (amountXInActiveBin.isZero() && amountYInActiveBin.isZero()) {
-      wx0 = new Decimal3(activeBin.weight).div(p0.mul(new Decimal3(2)));
-      wy0 = new Decimal3(activeBin.weight).div(new Decimal3(2));
+      wx0 = new Decimal4(activeBin.weight).div(p0.mul(new Decimal4(2)));
+      wy0 = new Decimal4(activeBin.weight).div(new Decimal4(2));
     } else {
-      let amountXInActiveBinDec = new Decimal3(amountXInActiveBin.toString());
-      let amountYInActiveBinDec = new Decimal3(amountYInActiveBin.toString());
+      let amountXInActiveBinDec = new Decimal4(amountXInActiveBin.toString());
+      let amountYInActiveBinDec = new Decimal4(amountYInActiveBin.toString());
       if (!amountXInActiveBin.isZero()) {
-        wx0 = new Decimal3(activeBin.weight).div(
+        wx0 = new Decimal4(activeBin.weight).div(
           p0.add(amountYInActiveBinDec.div(amountXInActiveBinDec))
         );
       }
       if (!amountYInActiveBin.isZero()) {
-        wy0 = new Decimal3(activeBin.weight).div(
-          new Decimal3(1).add(
+        wy0 = new Decimal4(activeBin.weight).div(
+          new Decimal4(1).add(
             p0.mul(amountXInActiveBinDec).div(amountYInActiveBinDec)
           )
         );
@@ -11027,20 +11076,20 @@ function toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBi
     let totalWeightY = wy0;
     distributions.forEach((element) => {
       if (element.binId < activeId) {
-        totalWeightY = totalWeightY.add(new Decimal3(element.weight));
+        totalWeightY = totalWeightY.add(new Decimal4(element.weight));
       }
       if (element.binId > activeId) {
         let price = getPriceOfBinByBinId(element.binId, binStep);
-        let weighPerPrice = new Decimal3(element.weight).div(price);
+        let weighPerPrice = new Decimal4(element.weight).div(price);
         totalWeightX = totalWeightX.add(weighPerPrice);
       }
     });
-    const kx = new Decimal3(amountX.toString()).div(totalWeightX);
-    const ky = new Decimal3(amountY.toString()).div(totalWeightY);
+    const kx = new Decimal4(amountX.toString()).div(totalWeightX);
+    const ky = new Decimal4(amountY.toString()).div(totalWeightY);
     let k = kx.lessThan(ky) ? kx : ky;
     return distributions.map((bin) => {
       if (bin.binId < activeId) {
-        const amount = k.mul(new Decimal3(bin.weight));
+        const amount = k.mul(new Decimal4(bin.weight));
         return {
           binId: bin.binId,
           amountX: new BN5(0),
@@ -11049,7 +11098,7 @@ function toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBi
       }
       if (bin.binId > activeId) {
         const price = getPriceOfBinByBinId(bin.binId, binStep);
-        const weighPerPrice = new Decimal3(bin.weight).div(price);
+        const weighPerPrice = new Decimal4(bin.weight).div(price);
         const amount = k.mul(weighPerPrice);
         return {
           binId: bin.binId,
@@ -11066,23 +11115,23 @@ function toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBi
       };
     });
   } else {
-    let totalWeightX = new Decimal3(0);
-    let totalWeightY = new Decimal3(0);
+    let totalWeightX = new Decimal4(0);
+    let totalWeightY = new Decimal4(0);
     distributions.forEach((element) => {
       if (element.binId < activeId) {
-        totalWeightY = totalWeightY.add(new Decimal3(element.weight));
+        totalWeightY = totalWeightY.add(new Decimal4(element.weight));
       } else {
         let price = getPriceOfBinByBinId(element.binId, binStep);
-        let weighPerPrice = new Decimal3(element.weight).div(price);
+        let weighPerPrice = new Decimal4(element.weight).div(price);
         totalWeightX = totalWeightX.add(weighPerPrice);
       }
     });
-    let kx = new Decimal3(amountX.toString()).div(totalWeightX);
-    let ky = new Decimal3(amountY.toString()).div(totalWeightY);
+    let kx = new Decimal4(amountX.toString()).div(totalWeightX);
+    let ky = new Decimal4(amountY.toString()).div(totalWeightY);
     let k = kx.lessThan(ky) ? kx : ky;
     return distributions.map((bin) => {
       if (bin.binId < activeId) {
-        const amount = k.mul(new Decimal3(bin.weight));
+        const amount = k.mul(new Decimal4(bin.weight));
         return {
           binId: bin.binId,
           amountX: new BN5(0),
@@ -11090,7 +11139,7 @@ function toAmountBothSide(activeId, binStep, amountX, amountY, amountXInActiveBi
         };
       } else {
         let price = getPriceOfBinByBinId(bin.binId, binStep);
-        let weighPerPrice = new Decimal3(bin.weight).div(price);
+        let weighPerPrice = new Decimal4(bin.weight).div(price);
         const amount = k.mul(weighPerPrice);
         return {
           binId: bin.binId,
@@ -11107,23 +11156,23 @@ function autoFillYByWeight(activeId, binStep, amountX, amountXInActiveBin, amoun
   });
   if (activeBins.length === 1) {
     const p0 = getPriceOfBinByBinId(activeId, binStep);
-    let wx0 = new Decimal3(0);
-    let wy0 = new Decimal3(0);
+    let wx0 = new Decimal4(0);
+    let wy0 = new Decimal4(0);
     const activeBin = activeBins[0];
     if (amountXInActiveBin.isZero() && amountYInActiveBin.isZero()) {
-      wx0 = new Decimal3(activeBin.weight).div(p0.mul(new Decimal3(2)));
-      wy0 = new Decimal3(activeBin.weight).div(new Decimal3(2));
+      wx0 = new Decimal4(activeBin.weight).div(p0.mul(new Decimal4(2)));
+      wy0 = new Decimal4(activeBin.weight).div(new Decimal4(2));
     } else {
-      let amountXInActiveBinDec = new Decimal3(amountXInActiveBin.toString());
-      let amountYInActiveBinDec = new Decimal3(amountYInActiveBin.toString());
+      let amountXInActiveBinDec = new Decimal4(amountXInActiveBin.toString());
+      let amountYInActiveBinDec = new Decimal4(amountYInActiveBin.toString());
       if (!amountXInActiveBin.isZero()) {
-        wx0 = new Decimal3(activeBin.weight).div(
+        wx0 = new Decimal4(activeBin.weight).div(
           p0.add(amountYInActiveBinDec.div(amountXInActiveBinDec))
         );
       }
       if (!amountYInActiveBin.isZero()) {
-        wy0 = new Decimal3(activeBin.weight).div(
-          new Decimal3(1).add(
+        wy0 = new Decimal4(activeBin.weight).div(
+          new Decimal4(1).add(
             p0.mul(amountXInActiveBinDec).div(amountYInActiveBinDec)
           )
         );
@@ -11133,30 +11182,30 @@ function autoFillYByWeight(activeId, binStep, amountX, amountXInActiveBin, amoun
     let totalWeightY = wy0;
     distributions.forEach((element) => {
       if (element.binId < activeId) {
-        totalWeightY = totalWeightY.add(new Decimal3(element.weight));
+        totalWeightY = totalWeightY.add(new Decimal4(element.weight));
       }
       if (element.binId > activeId) {
         const price = getPriceOfBinByBinId(element.binId, binStep);
-        const weighPerPrice = new Decimal3(element.weight).div(price);
+        const weighPerPrice = new Decimal4(element.weight).div(price);
         totalWeightX = totalWeightX.add(weighPerPrice);
       }
     });
-    const kx = totalWeightX.isZero() ? new Decimal3(1) : new Decimal3(amountX.toString()).div(totalWeightX);
+    const kx = totalWeightX.isZero() ? new Decimal4(1) : new Decimal4(amountX.toString()).div(totalWeightX);
     const amountY = kx.mul(totalWeightY);
     return new BN5(amountY.floor().toString());
   } else {
-    let totalWeightX = new Decimal3(0);
-    let totalWeightY = new Decimal3(0);
+    let totalWeightX = new Decimal4(0);
+    let totalWeightY = new Decimal4(0);
     distributions.forEach((element) => {
       if (element.binId < activeId) {
-        totalWeightY = totalWeightY.add(new Decimal3(element.weight));
+        totalWeightY = totalWeightY.add(new Decimal4(element.weight));
       } else {
         const price = getPriceOfBinByBinId(element.binId, binStep);
-        const weighPerPrice = new Decimal3(element.weight).div(price);
+        const weighPerPrice = new Decimal4(element.weight).div(price);
         totalWeightX = totalWeightX.add(weighPerPrice);
       }
     });
-    const kx = totalWeightX.isZero() ? new Decimal3(1) : new Decimal3(amountX.toString()).div(totalWeightX);
+    const kx = totalWeightX.isZero() ? new Decimal4(1) : new Decimal4(amountX.toString()).div(totalWeightX);
     const amountY = kx.mul(totalWeightY);
     return new BN5(amountY.floor().toString());
   }
@@ -11167,23 +11216,23 @@ function autoFillXByWeight(activeId, binStep, amountY, amountXInActiveBin, amoun
   });
   if (activeBins.length === 1) {
     const p0 = getPriceOfBinByBinId(activeId, binStep);
-    let wx0 = new Decimal3(0);
-    let wy0 = new Decimal3(0);
+    let wx0 = new Decimal4(0);
+    let wy0 = new Decimal4(0);
     const activeBin = activeBins[0];
     if (amountXInActiveBin.isZero() && amountYInActiveBin.isZero()) {
-      wx0 = new Decimal3(activeBin.weight).div(p0.mul(new Decimal3(2)));
-      wy0 = new Decimal3(activeBin.weight).div(new Decimal3(2));
+      wx0 = new Decimal4(activeBin.weight).div(p0.mul(new Decimal4(2)));
+      wy0 = new Decimal4(activeBin.weight).div(new Decimal4(2));
     } else {
-      let amountXInActiveBinDec = new Decimal3(amountXInActiveBin.toString());
-      let amountYInActiveBinDec = new Decimal3(amountYInActiveBin.toString());
+      let amountXInActiveBinDec = new Decimal4(amountXInActiveBin.toString());
+      let amountYInActiveBinDec = new Decimal4(amountYInActiveBin.toString());
       if (!amountXInActiveBin.isZero()) {
-        wx0 = new Decimal3(activeBin.weight).div(
+        wx0 = new Decimal4(activeBin.weight).div(
           p0.add(amountYInActiveBinDec.div(amountXInActiveBinDec))
         );
       }
       if (!amountYInActiveBin.isZero()) {
-        wy0 = new Decimal3(activeBin.weight).div(
-          new Decimal3(1).add(
+        wy0 = new Decimal4(activeBin.weight).div(
+          new Decimal4(1).add(
             p0.mul(amountXInActiveBinDec).div(amountYInActiveBinDec)
           )
         );
@@ -11193,30 +11242,30 @@ function autoFillXByWeight(activeId, binStep, amountY, amountXInActiveBin, amoun
     let totalWeightY = wy0;
     distributions.forEach((element) => {
       if (element.binId < activeId) {
-        totalWeightY = totalWeightY.add(new Decimal3(element.weight));
+        totalWeightY = totalWeightY.add(new Decimal4(element.weight));
       }
       if (element.binId > activeId) {
         const price = getPriceOfBinByBinId(element.binId, binStep);
-        const weighPerPrice = new Decimal3(element.weight).div(price);
+        const weighPerPrice = new Decimal4(element.weight).div(price);
         totalWeightX = totalWeightX.add(weighPerPrice);
       }
     });
-    const ky = totalWeightY.isZero() ? new Decimal3(1) : new Decimal3(amountY.toString()).div(totalWeightY);
+    const ky = totalWeightY.isZero() ? new Decimal4(1) : new Decimal4(amountY.toString()).div(totalWeightY);
     const amountX = ky.mul(totalWeightX);
     return new BN5(amountX.floor().toString());
   } else {
-    let totalWeightX = new Decimal3(0);
-    let totalWeightY = new Decimal3(0);
+    let totalWeightX = new Decimal4(0);
+    let totalWeightY = new Decimal4(0);
     distributions.forEach((element) => {
       if (element.binId < activeId) {
-        totalWeightY = totalWeightY.add(new Decimal3(element.weight));
+        totalWeightY = totalWeightY.add(new Decimal4(element.weight));
       } else {
         const price = getPriceOfBinByBinId(element.binId, binStep);
-        const weighPerPrice = new Decimal3(element.weight).div(price);
+        const weighPerPrice = new Decimal4(element.weight).div(price);
         totalWeightX = totalWeightX.add(weighPerPrice);
       }
     });
-    const ky = totalWeightY.isZero() ? new Decimal3(1) : new Decimal3(amountY.toString()).div(totalWeightY);
+    const ky = totalWeightY.isZero() ? new Decimal4(1) : new Decimal4(amountY.toString()).div(totalWeightY);
     const amountX = ky.mul(totalWeightX);
     return new BN5(amountX.floor().toString());
   }
@@ -11224,8 +11273,8 @@ function autoFillXByWeight(activeId, binStep, amountY, amountXInActiveBin, amoun
 
 // src/dlmm/helpers/weight.ts
 function getPriceOfBinByBinId(binId, binStep) {
-  const binStepNum = new Decimal4(binStep).div(new Decimal4(BASIS_POINT_MAX));
-  return new Decimal4(1).add(new Decimal4(binStepNum)).pow(new Decimal4(binId));
+  const binStepNum = new Decimal5(binStep).div(new Decimal5(BASIS_POINT_MAX));
+  return new Decimal5(1).add(new Decimal5(binStepNum)).pow(new Decimal5(binId));
 }
 function buildGaussianFromBins(activeBin, binIds) {
   const smallestBin = Math.min(...binIds);
@@ -11678,17 +11727,17 @@ function getQPriceBaseFactor(binStep) {
   return base;
 }
 function getC(amount, binStep, binId, baseTokenDecimal, quoteTokenDecimal, minPrice, maxPrice, k) {
-  const currentPricePerLamport = new Decimal5(1 + binStep / 1e4).pow(
+  const currentPricePerLamport = new Decimal6(1 + binStep / 1e4).pow(
     binId.toNumber()
   );
   const currentPricePerToken = currentPricePerLamport.mul(
-    new Decimal5(10 ** (baseTokenDecimal - quoteTokenDecimal))
+    new Decimal6(10 ** (baseTokenDecimal - quoteTokenDecimal))
   );
   const priceRange = maxPrice.sub(minPrice);
   const currentPriceDeltaFromMin = currentPricePerToken.sub(
-    new Decimal5(minPrice)
+    new Decimal6(minPrice)
   );
-  const c = new Decimal5(amount.toString()).mul(
+  const c = new Decimal6(amount.toString()).mul(
     currentPriceDeltaFromMin.div(priceRange).pow(k)
   );
   return c.floor();
@@ -11761,7 +11810,7 @@ function compressBinAmount(binAmount, multiplier) {
   };
 }
 function generateAmountForBinRange(amount, binStep, tokenXDecimal, tokenYDecimal, minBinId, maxBinId, k) {
-  const toTokenMultiplier = new Decimal5(10 ** (tokenXDecimal - tokenYDecimal));
+  const toTokenMultiplier = new Decimal6(10 ** (tokenXDecimal - tokenYDecimal));
   const minPrice = getPriceOfBinByBinId(minBinId.toNumber(), binStep).mul(
     toTokenMultiplier
   );
@@ -12059,7 +12108,7 @@ function getBinArraysRequiredByPositionRange(pair, fromBinId, toBinId, programId
     index
   }));
 }
-function* enumerateBins(binsById, lowerBinId, upperBinId, binStep, baseTokenDecimal, quoteTokenDecimal, version, lbPair) {
+function* enumerateBins(binsById, lowerBinId, upperBinId, binStep, baseTokenDecimal, quoteTokenDecimal, version, lbPair, baseMultiplier = new Decimal7(1), quoteMultiplier = new Decimal7(1)) {
   for (let currentBinId = lowerBinId; currentBinId <= upperBinId; currentBinId++) {
     const bin = binsById.get(currentBinId);
     if (bin != null) {
@@ -12070,7 +12119,9 @@ function* enumerateBins(binsById, lowerBinId, upperBinId, binStep, baseTokenDeci
         baseTokenDecimal,
         quoteTokenDecimal,
         version,
-        lbPair
+        lbPair,
+        baseMultiplier,
+        quoteMultiplier
       );
     } else {
       yield BinLiquidity.empty(
@@ -12078,7 +12129,9 @@ function* enumerateBins(binsById, lowerBinId, upperBinId, binStep, baseTokenDeci
         binStep,
         baseTokenDecimal,
         quoteTokenDecimal,
-        version
+        version,
+        baseMultiplier,
+        quoteMultiplier
       );
     }
   }
@@ -12501,7 +12554,7 @@ function decodeExtendedPosition(base, program, bytes) {
 // src/dlmm/helpers/rebalance/rebalancePosition.ts
 import { SYSVAR_CLOCK_PUBKEY } from "@solana/web3.js";
 import BN12 from "bn.js";
-import Decimal6 from "decimal.js";
+import Decimal8 from "decimal.js";
 
 // src/dlmm/helpers/fee.ts
 import { BN as BN11 } from "@coral-xyz/anchor";
@@ -13005,8 +13058,8 @@ var RebalancePosition = class {
     };
   }
   _simulateResize(depositMinBinId, depositMaxBinId, binStep, tokenXDecimal, tokenYDecimal) {
-    const tokenXMultiplier = new Decimal6(10 ** tokenXDecimal.toNumber());
-    const tokenYMultiplier = new Decimal6(10 ** tokenYDecimal.toNumber());
+    const tokenXMultiplier = new Decimal8(10 ** tokenXDecimal.toNumber());
+    const tokenYMultiplier = new Decimal8(10 ** tokenYDecimal.toNumber());
     const [minBinId, maxBinId] = findMinMaxBinIdWithLiquidity(
       this.rebalancePositionBinData
     );
@@ -13759,7 +13812,7 @@ var SpotStrategyParameterBuilder = class {
 };
 
 // src/dlmm/helpers/rebalance/liquidity_strategy/index.ts
-import Decimal7 from "decimal.js";
+import Decimal9 from "decimal.js";
 function getLiquidityStrategyParameterBuilder(strategyType) {
   switch (strategyType) {
     case 0 /* Spot */:
@@ -13819,7 +13872,7 @@ function getAutoFillAmountByRebalancedPosition(rebalancePosition, strategyType)
     binData
   ] of rebalancePosition.rebalancePositionBinData.entries()) {
     const liquidityBid = binData.amountY;
-    const liquidityAsk = new Decimal7(binData.price).mul(new Decimal7(binData.amountX.toString())).floor().toString();
+    const liquidityAsk = new Decimal9(binData.price).mul(new Decimal9(binData.amountX.toString())).floor().toString();
     liquidityInBidSide = liquidityInBidSide.add(liquidityBid);
     liquidityInAskSide = liquidityInAskSide.add(new BN16(liquidityAsk));
     if (binData.binId == lbPair.activeId) {
@@ -13907,8 +13960,8 @@ function suggestBalancedYParametersFromX(x0, deltaX, minDeltaId, maxDeltaId, act
       bin.binId.toNumber(),
       binStep.toNumber()
     );
-    return acc.add(price.mul(new Decimal7(bin.amountX.toString())));
-  }, new Decimal7(0));
+    return acc.add(price.mul(new Decimal9(bin.amountX.toString())));
+  }, new Decimal9(0));
   const totalAmountXInQuoteBN = new BN16(totalAmountXInQuote.floor().toString());
   const minYDeltaId = minDeltaId;
   const maxYDeltaId = startDeltaIdAskSide.subn(1);
@@ -13985,7 +14038,7 @@ function buildLiquidityStrategyParameters(amountX, amountY, minDeltaId, maxDelta
 }
 
 // src/dlmm/helpers/index.ts
-import Decimal9 from "decimal.js";
+import Decimal11 from "decimal.js";
 
 // src/dlmm/helpers/lbPair.ts
 import { PublicKey as PublicKey8 } from "@solana/web3.js";
@@ -14839,7 +14892,7 @@ function getBinMaxAmountOut(bin, swapForY, supportLimitOrder) {
 
 // src/dlmm/helpers/oracle/wrapper.ts
 import BN19 from "bn.js";
-import Decimal8 from "decimal.js";
+import Decimal10 from "decimal.js";
 var ORACLE_METADATA_SIZE = 8 + 24;
 var OBSERVATION_SIZE = 32;
 var Observation = class {
@@ -14852,7 +14905,7 @@ var Observation = class {
     return !this.createdAt.isZero() && !this.lastUpdatedAt.isZero();
   }
 };
-function wrapOracle(oracleAddress, data, binStep, currentActiveBinId, baseTokenDecimals, quoteTokenDecimals, program) {
+function wrapOracle(oracleAddress, data, binStep, currentActiveBinId, baseTokenDecimals, quoteTokenDecimals, program, baseMultiplier = new Decimal10(1), quoteMultiplier = new Decimal10(1)) {
   const oracleBaseData = data.subarray(0, ORACLE_METADATA_SIZE);
   const oracleState = decodeAccount(program, "oracle", oracleBaseData);
   const observationSlice = data.subarray(ORACLE_METADATA_SIZE);
@@ -14884,11 +14937,13 @@ function wrapOracle(oracleAddress, data, binStep, currentActiveBinId, baseTokenD
     binStep,
     currentActiveBinId,
     baseTokenDecimals,
-    quoteTokenDecimals
+    quoteTokenDecimals,
+    baseMultiplier,
+    quoteMultiplier
   );
 }
 var DynamicOracle = class {
-  constructor(oracleAddress, metadata, observations, binStep, currentActiveBinId, baseTokenDecimals, quoteTokenDecimals) {
+  constructor(oracleAddress, metadata, observations, binStep, currentActiveBinId, baseTokenDecimals, quoteTokenDecimals, baseMultiplier = new Decimal10(1), quoteMultiplier = new Decimal10(1)) {
     this.oracleAddress = oracleAddress;
     this.metadata = metadata;
     this.observations = observations;
@@ -14896,6 +14951,8 @@ var DynamicOracle = class {
     this.currentActiveBinId = currentActiveBinId;
     this.baseTokenDecimals = baseTokenDecimals;
     this.quoteTokenDecimals = quoteTokenDecimals;
+    this.baseMultiplier = baseMultiplier;
+    this.quoteMultiplier = quoteMultiplier;
   }
   nextIndex() {
     const currentIndex = this.metadata.idx.toNumber();
@@ -14998,12 +15055,13 @@ var DynamicOracle = class {
     if (result === null) {
       return null;
     }
-    const uiMultiplier = new Decimal8(10).pow(
+    const uiMultiplier = new Decimal10(10).pow(
       this.baseTokenDecimals - this.quoteTokenDecimals
     );
-    const quoteAdjustment = new Decimal8(10).pow(this.quoteTokenDecimals);
+    const quoteAdjustment = new Decimal10(10).pow(this.quoteTokenDecimals);
+    const priceScaleFactor = this.baseMultiplier.isZero() ? new Decimal10(1) : this.quoteMultiplier.div(this.baseMultiplier);
     return {
-      value: result.value.mul(uiMultiplier).mul(quoteAdjustment).floor().div(quoteAdjustment),
+      value: result.value.mul(uiMultiplier).mul(quoteAdjustment).floor().div(quoteAdjustment).mul(priceScaleFactor),
       duration: result.duration
     };
   }
@@ -15278,16 +15336,16 @@ function getSlippageMaxAmount(amount, slippage) {
   if (slippage == 100) {
     return U64_MAX;
   }
-  const amountDecimal = new Decimal9(amount.toString());
+  const amountDecimal = new Decimal11(amount.toString());
   const slippageAppliedAmount = new BN20(
-    amountDecimal.mul(new Decimal9(100 + slippage)).div(new Decimal9(100)).floor().toString()
+    amountDecimal.mul(new Decimal11(100 + slippage)).div(new Decimal11(100)).floor().toString()
   );
   return slippageAppliedAmount;
 }
 function getSlippageMinAmount(amount, slippage) {
-  const amountDecimal = new Decimal9(amount.toString());
+  const amountDecimal = new Decimal11(amount.toString());
   return new BN20(
-    amountDecimal.mul(new Decimal9(100 - slippage)).div(new Decimal9(100)).ceil().toString()
+    amountDecimal.mul(new Decimal11(100 - slippage)).div(new Decimal11(100)).ceil().toString()
   );
 }
 function getPositionCountByBinCount(binCount) {
@@ -15743,7 +15801,7 @@ var BalancedStrategyBuilder = class {
 
 // src/dlmm/helpers/limitOrders/wrapper.ts
 import BN23 from "bn.js";
-import Decimal10 from "decimal.js";
+import Decimal12 from "decimal.js";
 var LimitOrderBinDataWrapper = class {
   constructor(inner) {
     this.inner = inner;
@@ -15811,11 +15869,11 @@ var LimitOrderV1Wrapper = class {
     let totalFeeAmountY = new BN23(0);
     const collectFeeMode = lbPair.parameters.collectFeeMode;
     const parsedLimitOrderBinData = [];
-    const tokenXUiMultiplier = new Decimal10(10).pow(
-      new Decimal10(baseMint.decimals)
+    const tokenXUiMultiplier = new Decimal12(10).pow(
+      new Decimal12(baseMint.decimals)
     );
-    const tokenYUiMultiplier = new Decimal10(10).pow(
-      new Decimal10(quoteMint.decimals)
+    const tokenYUiMultiplier = new Decimal12(10).pow(
+      new Decimal12(quoteMint.decimals)
     );
     for (const loBin of this.limitOrderBinData) {
       const binArrayIndex = binIdToBinArrayIndex(new BN23(loBin.binId()));
@@ -15875,17 +15933,17 @@ var LimitOrderV1Wrapper = class {
       parsedLimitOrderBinData.push({
         binId: loBin.binId(),
         empty: loBin.isEmpty(),
-        depositAmountX: new Decimal10(depositAmountX.toString()).div(tokenXUiMultiplier).toString(),
-        depositAmountY: new Decimal10(depositAmountY.toString()).div(tokenYUiMultiplier).toString(),
-        unfilledAmountX: new Decimal10(unFilledAmountX.toString()).div(tokenXUiMultiplier).toString(),
-        unfilledAmountY: new Decimal10(unFilledAmountY.toString()).div(tokenYUiMultiplier).toString(),
-        swappedAmountX: new Decimal10(swappedAmountX.toString()).div(tokenXUiMultiplier).toString(),
-        swappedAmountY: new Decimal10(swappedAmountY.toString()).div(tokenYUiMultiplier).toString(),
+        depositAmountX: new Decimal12(depositAmountX.toString()).div(tokenXUiMultiplier).toString(),
+        depositAmountY: new Decimal12(depositAmountY.toString()).div(tokenYUiMultiplier).toString(),
+        unfilledAmountX: new Decimal12(unFilledAmountX.toString()).div(tokenXUiMultiplier).toString(),
+        unfilledAmountY: new Decimal12(unFilledAmountY.toString()).div(tokenYUiMultiplier).toString(),
+        swappedAmountX: new Decimal12(swappedAmountX.toString()).div(tokenXUiMultiplier).toString(),
+        swappedAmountY: new Decimal12(swappedAmountY.toString()).div(tokenYUiMultiplier).toString(),
         isAskSide: loBin.isAsk(),
-        filledAmountX: new Decimal10(filledAmountX.toString()).div(tokenXUiMultiplier).toString(),
-        filledAmountY: new Decimal10(filledAmountY.toString()).div(tokenYUiMultiplier).toString(),
-        feeAmountX: new Decimal10(feeAmountX.toString()).div(tokenXUiMultiplier).toString(),
-        feeAmountY: new Decimal10(feeAmountY.toString()).div(tokenYUiMultiplier).toString(),
+        filledAmountX: new Decimal12(filledAmountX.toString()).div(tokenXUiMultiplier).toString(),
+        filledAmountY: new Decimal12(filledAmountY.toString()).div(tokenYUiMultiplier).toString(),
+        feeAmountX: new Decimal12(feeAmountX.toString()).div(tokenXUiMultiplier).toString(),
+        feeAmountY: new Decimal12(feeAmountY.toString()).div(tokenYUiMultiplier).toString(),
         status: limitOrderStatus
       });
     }
@@ -15902,21 +15960,21 @@ var LimitOrderV1Wrapper = class {
       clock.epoch.toNumber()
     ).amount;
     return {
-      totalDepositAmountX: new Decimal10(totalAmountXDeposited.toString()).div(tokenXUiMultiplier).toString(),
-      totalDepositAmountY: new Decimal10(totalAmountYDeposited.toString()).div(tokenYUiMultiplier).toString(),
+      totalDepositAmountX: new Decimal12(totalAmountXDeposited.toString()).div(tokenXUiMultiplier).toString(),
+      totalDepositAmountY: new Decimal12(totalAmountYDeposited.toString()).div(tokenYUiMultiplier).toString(),
       limitOrderBinData: parsedLimitOrderBinData,
-      totalUnfilledAmountX: new Decimal10(totalUnfilledAmountX.toString()).div(tokenXUiMultiplier).toString(),
-      totalUnfilledAmountY: new Decimal10(totalUnfilledAmountY.toString()).div(tokenYUiMultiplier).toString(),
-      totalFilledAmountX: new Decimal10(totalFilledAmountX.toString()).div(tokenXUiMultiplier).toString(),
-      totalFilledAmountY: new Decimal10(totalFilledAmountY.toString()).div(tokenYUiMultiplier).toString(),
-      totalSwappedAmountX: new Decimal10(totalSwappedAmountX.toString()).div(tokenXUiMultiplier).toString(),
-      totalSwappedAmountY: new Decimal10(totalSwappedAmountY.toString()).div(tokenYUiMultiplier).toString(),
-      totalFeeAmountX: new Decimal10(totalFeeAmountX.toString()).div(tokenXUiMultiplier).toString(),
-      totalFeeAmountY: new Decimal10(totalFeeAmountY.toString()).div(tokenYUiMultiplier).toString(),
-      transferFeeExcludedWithdrawableAmountX: new Decimal10(
+      totalUnfilledAmountX: new Decimal12(totalUnfilledAmountX.toString()).div(tokenXUiMultiplier).toString(),
+      totalUnfilledAmountY: new Decimal12(totalUnfilledAmountY.toString()).div(tokenYUiMultiplier).toString(),
+      totalFilledAmountX: new Decimal12(totalFilledAmountX.toString()).div(tokenXUiMultiplier).toString(),
+      totalFilledAmountY: new Decimal12(totalFilledAmountY.toString()).div(tokenYUiMultiplier).toString(),
+      totalSwappedAmountX: new Decimal12(totalSwappedAmountX.toString()).div(tokenXUiMultiplier).toString(),
+      totalSwappedAmountY: new Decimal12(totalSwappedAmountY.toString()).div(tokenYUiMultiplier).toString(),
+      totalFeeAmountX: new Decimal12(totalFeeAmountX.toString()).div(tokenXUiMultiplier).toString(),
+      totalFeeAmountY: new Decimal12(totalFeeAmountY.toString()).div(tokenYUiMultiplier).toString(),
+      transferFeeExcludedWithdrawableAmountX: new Decimal12(
         transferFeeExcludedWithdrawableAmountX.toString()
       ).div(tokenXUiMultiplier).toString(),
-      transferFeeExcludedWithdrawableAmountY: new Decimal10(
+      transferFeeExcludedWithdrawableAmountY: new Decimal12(
         transferFeeExcludedWithdrawableAmountY.toString()
       ).div(tokenYUiMultiplier).toString()
     };
@@ -16985,11 +17043,11 @@ var DLMM = class {
     return limitOrdersMap;
   }
   static getPricePerLamport(tokenXDecimal, tokenYDecimal, price) {
-    return new Decimal11(price).mul(new Decimal11(10 ** (tokenYDecimal - tokenXDecimal))).toString();
+    return new Decimal13(price).mul(new Decimal13(10 ** (tokenYDecimal - tokenXDecimal))).toString();
   }
   static getBinIdFromPrice(price, binStep, min) {
-    const binStepNum = new Decimal11(binStep).div(new Decimal11(BASIS_POINT_MAX));
-    const binId = new Decimal11(price).log().dividedBy(new Decimal11(1).add(binStepNum).log());
+    const binStepNum = new Decimal13(binStep).div(new Decimal13(BASIS_POINT_MAX));
+    const binId = new Decimal13(price).log().dividedBy(new Decimal13(1).add(binStepNum).log());
     return (min ? binId.floor() : binId.ceil()).toNumber();
   }
   /**
@@ -17711,8 +17769,8 @@ var DLMM = class {
    */
   static calculateFeeInfo(baseFactor, binStep, baseFeePowerFactor) {
     const baseFeeRate = new BN24(baseFactor).mul(new BN24(binStep)).mul(new BN24(10)).mul(new BN24(10).pow(new BN24(baseFeePowerFactor ?? 0)));
-    const baseFeeRatePercentage = new Decimal11(baseFeeRate.toString()).mul(new Decimal11(100)).div(new Decimal11(FEE_PRECISION.toString()));
-    const maxFeeRatePercentage = new Decimal11(MAX_FEE_RATE.toString()).mul(new Decimal11(100)).div(new Decimal11(FEE_PRECISION.toString()));
+    const baseFeeRatePercentage = new Decimal13(baseFeeRate.toString()).mul(new Decimal13(100)).div(new Decimal13(FEE_PRECISION.toString()));
+    const maxFeeRatePercentage = new Decimal13(MAX_FEE_RATE.toString()).mul(new Decimal13(100)).div(new Decimal13(FEE_PRECISION.toString()));
     return {
       baseFeeRatePercentage,
       maxFeeRatePercentage
@@ -17730,7 +17788,7 @@ var DLMM = class {
       this.lbPair.binStep,
       this.lbPair.parameters.baseFeePowerFactor
     );
-    const protocolFeePercentage = new Decimal11(protocolShare.toString()).mul(new Decimal11(100)).div(new Decimal11(BASIS_POINT_MAX));
+    const protocolFeePercentage = new Decimal13(protocolShare.toString()).mul(new Decimal13(100)).div(new Decimal13(BASIS_POINT_MAX));
     return {
       baseFeeRatePercentage,
       maxFeeRatePercentage,
@@ -17762,7 +17820,7 @@ var DLMM = class {
       sParameters3,
       vParameterClone
     );
-    return new Decimal11(totalFee.toString()).div(new Decimal11(FEE_PRECISION.toString())).mul(100);
+    return new Decimal13(totalFee.toString()).div(new Decimal13(FEE_PRECISION.toString())).mul(100);
   }
   /**
    * The function `getEmissionRate` returns the emission rates for two rewards.
@@ -17775,8 +17833,8 @@ var DLMM = class {
       ({ rewardRate, rewardDurationEnd }) => now > rewardDurationEnd.toNumber() ? void 0 : rewardRate
     );
     return {
-      rewardOne: rewardOneEmissionRate ? new Decimal11(rewardOneEmissionRate.toString()).div(PRECISION) : void 0,
-      rewardTwo: rewardTwoEmissionRate ? new Decimal11(rewardTwoEmissionRate.toString()).div(PRECISION) : void 0
+      rewardOne: rewardOneEmissionRate ? new Decimal13(rewardOneEmissionRate.toString()).div(PRECISION) : void 0,
+      rewardTwo: rewardTwoEmissionRate ? new Decimal13(rewardTwoEmissionRate.toString()).div(PRECISION) : void 0
     };
   }
   /**
@@ -17869,11 +17927,15 @@ var DLMM = class {
    * @returns {string} real price of bin
    */
   fromPricePerLamport(pricePerLamport) {
-    return new Decimal11(pricePerLamport).div(
-      new Decimal11(
+    const nowTs = this.clock.unixTimestamp.toNumber();
+    const baseMultiplier = getScaledUiAmountMultiplier(this.tokenX.mint, nowTs);
+    const quoteMultiplier = getScaledUiAmountMultiplier(this.tokenY.mint, nowTs);
+    const priceScaleFactor = baseMultiplier.isZero() ? new Decimal13(1) : quoteMultiplier.div(baseMultiplier);
+    return new Decimal13(pricePerLamport).div(
+      new Decimal13(
         10 ** (this.tokenY.mint.decimals - this.tokenX.mint.decimals)
       )
-    ).toString();
+    ).mul(priceScaleFactor).toString();
   }
   /**
    * The function retrieves the active bin ID and its corresponding price.
@@ -18157,12 +18219,12 @@ var DLMM = class {
     const lowerBinArrayIndex = binIdToBinArrayIndex(currentMinBinId);
     const upperBinArrayIndex = binIdToBinArrayIndex(currentMaxBinId);
     const binArraysCount = (await this.binArraysToBeCreate(lowerBinArrayIndex, upperBinArrayIndex)).length;
-    const binArrayCost = new Decimal11(binArraysCount).mul(
-      new Decimal11(BIN_ARRAY_FEE)
+    const binArrayCost = new Decimal13(binArraysCount).mul(
+      new Decimal13(BIN_ARRAY_FEE)
     );
     return {
-      positionExtendCost: new Decimal11(positionExtendCost).div(
-        new Decimal11(LAMPORTS_PER_SOL2)
+      positionExtendCost: new Decimal13(positionExtendCost).div(
+        new Decimal13(LAMPORTS_PER_SOL2)
       ),
       binArrayCost
     };
@@ -19960,7 +20022,7 @@ var DLMM = class {
       activeId.toNumber(),
       this.lbPair.binStep
     );
-    const priceImpact = startPrice.sub(endPrice).abs().div(startPrice).mul(new Decimal11(100));
+    const priceImpact = startPrice.sub(endPrice).abs().div(startPrice).mul(new Decimal13(100));
     actualInAmount = calculateTransferFeeIncludedAmount(
       actualInAmount,
       inMint,
@@ -20158,7 +20220,7 @@ var DLMM = class {
       ),
       swapForY
     );
-    const priceImpact = new Decimal11(totalOutAmount.toString()).sub(new Decimal11(outAmountWithoutSlippage.toString())).div(new Decimal11(outAmountWithoutSlippage.toString())).mul(new Decimal11(100)).abs();
+    const priceImpact = new Decimal13(totalOutAmount.toString()).sub(new Decimal13(outAmountWithoutSlippage.toString())).div(new Decimal13(outAmountWithoutSlippage.toString())).mul(new Decimal13(100)).abs();
     const endPrice = getPriceOfBinByBinId(
       lastFilledActiveBinId.toNumber(),
       this.lbPair.binStep
@@ -20208,6 +20270,16 @@ var DLMM = class {
       this.clock.epoch.toNumber()
     ).amount;
     const minOutAmount = transferFeeExcludedAmountOut.mul(new BN24(BASIS_POINT_MAX).sub(allowedSlippage)).div(new BN24(BASIS_POINT_MAX));
+    const nowTs = this.clock.unixTimestamp.toNumber();
+    const endPriceBaseMultiplier = getScaledUiAmountMultiplier(
+      this.tokenX.mint,
+      nowTs
+    );
+    const endPriceQuoteMultiplier = getScaledUiAmountMultiplier(
+      this.tokenY.mint,
+      nowTs
+    );
+    const scaledEndPrice = endPriceBaseMultiplier.isZero() ? endPrice : endPrice.mul(endPriceQuoteMultiplier).div(endPriceBaseMultiplier);
     return {
       consumedInAmount: transferFeeIncludedInAmount,
       outAmount: transferFeeExcludedAmountOut,
@@ -20216,7 +20288,7 @@ var DLMM = class {
       minOutAmount,
       priceImpact,
       binArraysPubkey,
-      endPrice,
+      endPrice: scaledEndPrice,
       feeOnInput
     };
   }
@@ -20771,11 +20843,11 @@ var DLMM = class {
     let totalBinArraysCount = new BN24(0);
     let totalBinArraysLamports = new BN24(0);
     let binArrayBitmapLamports = new BN24(0);
-    const toLamportMultiplier = new Decimal11(
+    const toLamportMultiplier = new Decimal13(
       10 ** (this.tokenY.mint.decimals - this.tokenX.mint.decimals)
     );
-    const minPricePerLamport = new Decimal11(minPrice).mul(toLamportMultiplier);
-    const maxPricePerLamport = new Decimal11(maxPrice).mul(toLamportMultiplier);
+    const minPricePerLamport = new Decimal13(minPrice).mul(toLamportMultiplier);
+    const maxPricePerLamport = new Decimal13(maxPrice).mul(toLamportMultiplier);
     const minBinId = new BN24(
       DLMM.getBinIdFromPrice(minPricePerLamport, this.lbPair.binStep, false)
     );
@@ -22542,6 +22614,11 @@ var DLMM = class {
     const totalClaimedFeeYAmount = position.totalClaimedFeeYAmount();
     const positionRewardInfos = position.rewardInfos();
     const feeOwner = position.feeOwner();
+    const nowTs = clock.unixTimestamp.toNumber();
+    const baseMultiplier = getScaledUiAmountMultiplier(baseMint, nowTs);
+    const quoteMultiplier = getScaledUiAmountMultiplier(quoteMint, nowTs);
+    const rewardOneMultiplier = rewardMint0 ? getScaledUiAmountMultiplier(rewardMint0, nowTs) : new Decimal13(1);
+    const rewardTwoMultiplier = rewardMint1 ? getScaledUiAmountMultiplier(rewardMint1, nowTs) : new Decimal13(1);
     const bins = this.getBinsBetweenLowerAndUpperBound(
       lbPairKey,
       lbPair,
@@ -22550,13 +22627,15 @@ var DLMM = class {
       baseMint.decimals,
       quoteMint.decimals,
       binArrayMap,
-      program.programId
+      program.programId,
+      baseMultiplier,
+      quoteMultiplier
     );
     if (!bins.length)
       return null;
     const positionData = [];
-    let totalXAmount = new Decimal11(0);
-    let totalYAmount = new Decimal11(0);
+    let totalXAmount = new Decimal13(0);
+    let totalYAmount = new Decimal13(0);
     const ZERO = new BN24(0);
     let feeX = ZERO;
     let feeY = ZERO;
@@ -22567,8 +22646,8 @@ var DLMM = class {
       const posBinRewardInfo = positionRewardInfos[idx];
       const positionXAmount = binSupply.eq(ZERO) ? ZERO : posShare.mul(bin.xAmount).div(binSupply);
       const positionYAmount = binSupply.eq(ZERO) ? ZERO : posShare.mul(bin.yAmount).div(binSupply);
-      totalXAmount = totalXAmount.add(new Decimal11(positionXAmount.toString()));
-      totalYAmount = totalYAmount.add(new Decimal11(positionYAmount.toString()));
+      totalXAmount = totalXAmount.add(new Decimal13(positionXAmount.toString()));
+      totalYAmount = totalYAmount.add(new Decimal13(positionYAmount.toString()));
       const feeInfo = feeInfos[idx];
       const newFeeX = posShare.isZero() ? new BN24(0) : mulShr(
         posShares[idx].shrn(SCALE_OFFSET),
@@ -22633,10 +22712,19 @@ var DLMM = class {
         positionLiquidity: posShare.toString(),
         positionXAmount: positionXAmount.toString(),
         positionYAmount: positionYAmount.toString(),
-        positionFeeXAmount: claimableFeeX.toString(),
-        positionFeeYAmount: claimableFeeY.toString(),
+        positionFeeXAmount: scaleAmountByMultiplier(
+          claimableFeeX,
+          baseMultiplier
+        ).toString(),
+        positionFeeYAmount: scaleAmountByMultiplier(
+          claimableFeeY,
+          quoteMultiplier
+        ).toString(),
         positionRewardAmount: claimableRewardsInBin.map(
-          (amount) => amount.toString()
+          (amount, j) => scaleAmountByMultiplier(
+            amount,
+            j === 0 ? rewardOneMultiplier : rewardTwoMultiplier
+          ).toString()
         )
       });
     });
@@ -22680,29 +22768,48 @@ var DLMM = class {
       currentEpoch
     ).amount;
     return {
+      // totals inherit the scale from the already-scaled bin amounts
       totalXAmount: totalXAmount.toString(),
       totalYAmount: totalYAmount.toString(),
       positionBinData: positionData,
       lastUpdatedAt,
       lowerBinId: lowerBinId.toNumber(),
       upperBinId: upperBinId.toNumber(),
-      feeX,
-      feeY,
-      rewardOne,
-      rewardTwo,
+      feeX: scaleAmountByMultiplier(feeX, baseMultiplier),
+      feeY: scaleAmountByMultiplier(feeY, quoteMultiplier),
+      rewardOne: scaleAmountByMultiplier(rewardOne, rewardOneMultiplier),
+      rewardTwo: scaleAmountByMultiplier(rewardTwo, rewardTwoMultiplier),
       feeOwner,
-      totalClaimedFeeXAmount,
-      totalClaimedFeeYAmount,
+      totalClaimedFeeXAmount: scaleAmountByMultiplier(
+        totalClaimedFeeXAmount,
+        baseMultiplier
+      ),
+      totalClaimedFeeYAmount: scaleAmountByMultiplier(
+        totalClaimedFeeYAmount,
+        quoteMultiplier
+      ),
       totalXAmountExcludeTransferFee,
       totalYAmountExcludeTransferFee,
-      rewardOneExcludeTransferFee,
-      rewardTwoExcludeTransferFee,
-      feeXExcludeTransferFee,
-      feeYExcludeTransferFee,
+      rewardOneExcludeTransferFee: scaleAmountByMultiplier(
+        rewardOneExcludeTransferFee,
+        rewardOneMultiplier
+      ),
+      rewardTwoExcludeTransferFee: scaleAmountByMultiplier(
+        rewardTwoExcludeTransferFee,
+        rewardTwoMultiplier
+      ),
+      feeXExcludeTransferFee: scaleAmountByMultiplier(
+        feeXExcludeTransferFee,
+        baseMultiplier
+      ),
+      feeYExcludeTransferFee: scaleAmountByMultiplier(
+        feeYExcludeTransferFee,
+        quoteMultiplier
+      ),
       owner: position.owner()
     };
   }
-  static getBinsBetweenLowerAndUpperBound(lbPairKey, lbPair, lowerBinId, upperBinId, baseTokenDecimal, quoteTokenDecimal, binArrayMap, programId) {
+  static getBinsBetweenLowerAndUpperBound(lbPairKey, lbPair, lowerBinId, upperBinId, baseTokenDecimal, quoteTokenDecimal, binArrayMap, programId, baseMultiplier = new Decimal13(1), quoteMultiplier = new Decimal13(1)) {
     const lowerBinArrayIndex = binIdToBinArrayIndex(new BN24(lowerBinId));
     const upperBinArrayIndex = binIdToBinArrayIndex(new BN24(upperBinId));
     let bins = [];
@@ -22725,7 +22832,9 @@ var DLMM = class {
                 lbPair.binStep,
                 baseTokenDecimal,
                 quoteTokenDecimal,
-                BIN_ARRAY_DEFAULT_VERSION
+                BIN_ARRAY_DEFAULT_VERSION,
+                baseMultiplier,
+                quoteMultiplier
               )
             );
           } else {
@@ -22738,7 +22847,9 @@ var DLMM = class {
                 baseTokenDecimal,
                 quoteTokenDecimal,
                 binArray.version,
-                lbPair
+                lbPair,
+                baseMultiplier,
+                quoteMultiplier
               )
             );
           }
@@ -22799,6 +22910,15 @@ var DLMM = class {
       })
     );
     const version = binArrays.find((binArray) => binArray != null)?.version ?? 1;
+    const nowTs = this.clock.unixTimestamp.toNumber();
+    const baseMultiplier = getScaledUiAmountMultiplier(
+      this.tokenX.mint,
+      nowTs
+    );
+    const quoteMultiplier = getScaledUiAmountMultiplier(
+      this.tokenY.mint,
+      nowTs
+    );
     return Array.from(
       enumerateBins(
         binsById,
@@ -22808,7 +22928,9 @@ var DLMM = class {
         baseTokenDecimal,
         quoteTokenDecimal,
         version,
-        this.lbPair
+        this.lbPair,
+        baseMultiplier,
+        quoteMultiplier
       )
     );
   }
@@ -23071,6 +23193,7 @@ var DLMM = class {
       "lbPair",
       lbPairAccountInfo.data
     );
+    const nowTs = this.clock.unixTimestamp.toNumber();
     return wrapOracle(
       oracleAddress,
       oracleAccountInfo.data,
@@ -23078,7 +23201,9 @@ var DLMM = class {
       new BN24(lbPairState.activeId),
       this.tokenX.mint.decimals,
       this.tokenY.mint.decimals,
-      this.program
+      this.program,
+      getScaledUiAmountMultiplier(this.tokenX.mint, nowTs),
+      getScaledUiAmountMultiplier(this.tokenY.mint, nowTs)
     );
   }
   /**
@@ -23279,6 +23404,7 @@ export {
   getQPriceBaseFactor,
   getQPriceFromId,
   getRebalanceBinArrayIndexesAndBitmapCoverage,
+  getScaledUiAmountMultiplier,
   getSlippageMaxAmount,
   getSlippageMinAmount,
   getTokenBalance,
@@ -23306,6 +23432,8 @@ export {
   presetParameter2BinStepFilter,
   range,
   resetUninvolvedLiquidityParams,
+  scaleAmountByMultiplier,
+  scalePricePerToken,
   shlDiv,
   splitFee,
   suggestBalancedXParametersFromY,