@jup-ag/plugin 1.0.12 → 1.0.13

package/dist/index.js

@@ -9,7 +9,6 @@ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __pow = Math.pow;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
@@ -85,7 +84,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@jup-ag/plugin",
-      version: "1.0.12",
+      version: "1.0.13",
       private: false,
       license: "MIT",
       scripts: {
@@ -722,11 +721,30 @@ var formatNumber = {
 function shortenAddress(address, chars = 4) {
   return `${address.slice(0, chars)}...${address.slice(-chars)}`;
 }
-function readableValue(lamportsAmount, decimals) {
-  return new import_decimal.default(lamportsAmount.toString()).div(__pow(10, decimals)).toDP(decimals, import_decimal.default.ROUND_DOWN).toFixed();
+function getEffectiveMultiplier(config) {
+  var _a2;
+  const { scaledUiConfig } = config;
+  if (!scaledUiConfig) return 1;
+  if (scaledUiConfig.newMultiplier && scaledUiConfig.newMultiplierEffectiveAt) {
+    const effectiveDate = new Date(scaledUiConfig.newMultiplierEffectiveAt);
+    if (/* @__PURE__ */ new Date() >= effectiveDate) {
+      return scaledUiConfig.newMultiplier;
+    }
+  }
+  return (_a2 = scaledUiConfig.multiplier) != null ? _a2 : 1;
+}
+function parseUiAmount(value, asset) {
+  if (!value || !hasNumericValue(value)) {
+    return void 0;
+  }
+  const multiplier = getEffectiveMultiplier(asset);
+  return BigInt(
+    new import_decimal.default(value).div(multiplier).mul(Math.pow(10, asset.decimals)).floor().toFixed()
+  );
 }
-function fromLamports(lamportsAmount, decimals) {
-  return new import_decimal.default(lamportsAmount.toString()).div(__pow(10, decimals)).toDP(decimals, import_decimal.default.ROUND_DOWN).toNumber();
+function formatUiAmount(rawAmount, asset) {
+  const multiplier = getEffectiveMultiplier(asset);
+  return new import_decimal.default(rawAmount.toString()).div(Math.pow(10, asset.decimals)).mul(multiplier).toFixed();
 }
 var detectedSeparator = formatNumber.format("1.1").substring(1, 2);
 function useDebounce(value, delay) {
@@ -1212,21 +1230,14 @@ var SwapContextProvider = (props) => {
     [form, debouncedForm]
   );
   const amount = (0, import_react7.useMemo)(() => {
+    var _a3, _b2;
     if (!fromTokenInfo || !toTokenInfo) {
       return BigInt(0);
     }
     if (isToPairFocused.current === true) {
-      if (!debouncedForm.toValue || !hasNumericValue(debouncedForm.toValue)) {
-        return BigInt(0);
-      }
-      return BigInt(new import_decimal2.default(debouncedForm.toValue).mul(Math.pow(10, toTokenInfo.decimals)).floor().toFixed());
+      return (_a3 = parseUiAmount(debouncedForm.toValue, toTokenInfo)) != null ? _a3 : BigInt(0);
     } else {
-      if (!debouncedForm.fromValue || !hasNumericValue(debouncedForm.fromValue)) {
-        return BigInt(0);
-      }
-      return BigInt(
-        new import_decimal2.default(debouncedForm.fromValue).mul(Math.pow(10, fromTokenInfo.decimals)).floor().toFixed()
-      );
+      return (_b2 = parseUiAmount(debouncedForm.fromValue, fromTokenInfo)) != null ? _b2 : BigInt(0);
     }
   }, [debouncedForm.fromValue, debouncedForm.toValue, fromTokenInfo, toTokenInfo]);
   const [txStatus, setTxStatus] = (0, import_react7.useState)(void 0);
@@ -1309,9 +1320,9 @@ var SwapContextProvider = (props) => {
       if (!fromTokenInfo || !toTokenInfo) return prev;
       const { outAmount, inAmount } = (quoteResponseMeta == null ? void 0 : quoteResponseMeta.quoteResponse) || {};
       if (!isToPairFocused.current) {
-        newValue.toValue = outAmount ? new import_decimal2.default(outAmount.toString()).div(__pow(10, toTokenInfo.decimals)).toFixed() : "";
+        newValue.toValue = outAmount ? formatUiAmount(outAmount, toTokenInfo) : "";
       } else {
-        newValue.fromValue = inAmount ? new import_decimal2.default(inAmount.toString()).div(__pow(10, fromTokenInfo.decimals)).toFixed() : "";
+        newValue.fromValue = inAmount ? formatUiAmount(inAmount, fromTokenInfo) : "";
       }
       return newValue;
     });
@@ -1815,9 +1826,9 @@ var PrecisionTickSize_default = PrecisionTickSize;
 
 // src/components/ExchangeRate.tsx
 var import_jsx_runtime21 = require("react/jsx-runtime");
-var calculateRate = ({ inAmount, inputDecimal, outAmount, outputDecimal }, reverse) => {
-  const input = fromLamports(inAmount, inputDecimal);
-  const output = fromLamports(outAmount, outputDecimal);
+var calculateRate = ({ inAmount, inputAsset, outAmount, outputAsset }, reverse) => {
+  const input = new import_decimal5.default(formatUiAmount(inAmount, inputAsset));
+  const output = new import_decimal5.default(formatUiAmount(outAmount, outputAsset));
   const rate = !reverse ? new import_decimal5.default(input).div(output) : new import_decimal5.default(output).div(input);
   if (Number.isNaN(rate.toNumber())) {
     return new import_decimal5.default(0);
@@ -1947,10 +1958,10 @@ var Index = ({
   const rateParams = {
     inAmount: (quoteResponse == null ? void 0 : quoteResponse.quoteResponse.inAmount) || BigInt(0),
     // If there's no selectedRoute, we will use first route value to temporarily calculate
-    inputDecimal: fromTokenInfo.decimals,
+    inputAsset: fromTokenInfo,
     outAmount: (quoteResponse == null ? void 0 : quoteResponse.quoteResponse.outAmount) || BigInt(0),
     // If there's no selectedRoute, we will use first route value to temporarily calculate
-    outputDecimal: toTokenInfo.decimals
+    outputAsset: toTokenInfo
   };
   const priceImpact = formatNumber.format(
     new import_decimal6.default((quoteResponse == null ? void 0 : quoteResponse.quoteResponse.priceImpactPct) || 0).mul(100).toDP(2)
@@ -3398,13 +3409,13 @@ var SwappingScreen = () => {
         /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("div", { className: "mt-2 flex flex-col items-center justify-center text-center px-4", children: [
           /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("p", { className: "text-xs font-semibold text-primary-text", children: [
             "Swapped ",
-            readableValue(inputAmount, fromTokenInfo.decimals),
+            formatUiAmount(inputAmount, fromTokenInfo),
             " ",
             fromTokenInfo.symbol,
             " to"
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("p", { className: "text-2xl font-semibold text-primary-text", children: [
-            readableValue(outputAmount, toTokenInfo.decimals),
+            formatUiAmount(outputAmount, toTokenInfo),
             " ",
             toTokenInfo.symbol
           ] })