@rash2x/bridge-widget 0.6.10 → 0.6.12

package/dist/evaa-bridge.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index-Nq5DhIqK.cjs");
+const index = require("./index-BaoPDmAJ.cjs");
 exports.DEFAULT_SLIPPAGE_BPS = index.DEFAULT_SLIPPAGE_BPS;
 exports.EvaaBridge = index.EvaaBridge;
 exports.RoutePriority = index.RoutePriority;

package/dist/evaa-bridge.mjs

@@ -1,4 +1,4 @@
-import { U, d, f, e, H, B, F, X, N, z, $, G, A, D, Z, w, s, v, r, p, q, L, a2, a9, a4, a6, x, I, y, a5, J, a3, a7, a8, Y, W, P, _, a1, aa, Q, S, a0, K, V, t, o, i, u, l, m, j, n, h, k } from "./index-TVRvbmLN.js";
+import { U, d, f, e, H, B, F, X, N, z, $, G, A, D, Z, w, s, v, r, p, q, L, a2, a9, a4, a6, x, I, y, a5, J, a3, a7, a8, Y, W, P, _, a1, aa, Q, S, a0, K, V, t, o, i, u, l, m, j, n, h, k } from "./index-Tq5ST0yd.js";
 export {
   U as DEFAULT_SLIPPAGE_BPS,
   d as EvaaBridge,

package/dist/{index-Nq5DhIqK.cjs → index-BaoPDmAJ.cjs}

@@ -718,7 +718,7 @@ function selectQuoteByPriority(routes, priority) {
     });
   }
   return routes.reduce(
-    (best, cur) => BigInt(cur.dstAmount) > BigInt(best.dstAmount) ? cur : best
+    (best, cur) => BigInt(cur?.dstAmount ?? "0") > BigInt(best?.dstAmount ?? "0") ? cur : best
   );
 }
 async function getQuotesByPriority(req) {
@@ -806,13 +806,19 @@ function lookupTokenMeta(tokens, chains, chainKey, tokenAddr) {
   return { decimals: chainKey === "ton" ? 9 : 18, priceUsd: void 0 };
 }
 function computeFeesUsdFromArray(fees, tokens, chains) {
-  if (!fees?.length) return { totalUsd: 0 };
-  let total = 0;
-  let protocolFeeUsd = 0;
-  let messageFeeUsd = 0;
-  const byType = /* @__PURE__ */ new Map();
+  const emptyResult = {
+    usd: /* @__PURE__ */ new Map(),
+    human: /* @__PURE__ */ new Map(),
+    original: void 0
+  };
+  if (!fees?.length) return emptyResult;
+  let totalUsd = 0;
+  const byTypeUsd = /* @__PURE__ */ new Map();
+  const byTypeHuman = /* @__PURE__ */ new Map();
   for (const f4 of fees) {
     let usd = Number(f4.usd ?? 0);
+    let human = 0;
+    const amount = String(f4.amount ?? "0");
     if (!usd) {
       const { decimals, priceUsd } = lookupTokenMeta(
         tokens,
@@ -820,26 +826,28 @@ function computeFeesUsdFromArray(fees, tokens, chains) {
         f4.chainKey,
         f4.token
       );
-      const human = fromLD(String(f4.amount ?? "0"), decimals);
+      human = fromLD(amount, decimals);
       usd = (priceUsd ?? 0) * human;
     }
-    total += usd;
+    totalUsd += usd;
     const type = (f4.type ?? "other").toLowerCase();
-    byType.set(type, (byType.get(type) ?? 0) + usd);
-    if (type === "protocol" || type === "service") {
-      protocolFeeUsd += usd;
-    } else if (type === "message" || type === "gas" || type === "network") {
-      messageFeeUsd += usd;
+    byTypeUsd.set(type, (byTypeUsd.get(type) ?? 0) + usd);
+    const existing = byTypeHuman.get(type);
+    if (existing) {
+      existing.amount += human;
+    } else {
+      byTypeHuman.set(type, {
+        amount: human,
+        token: f4.token,
+        chainKey: f4.chainKey
+      });
     }
   }
-  const serviceUsd = byType.get("protocol") ?? byType.get("service") ?? void 0;
-  const blockchainUsd = byType.get("gas") ?? byType.get("network") ?? byType.get("message") ?? void 0;
+  byTypeUsd.set("total", totalUsd);
   return {
-    totalUsd: total,
-    protocolFeeUsd: protocolFeeUsd > 0 ? protocolFeeUsd : void 0,
-    messageFeeUsd: messageFeeUsd > 0 ? messageFeeUsd : void 0,
-    serviceUsd,
-    blockchainUsd
+    usd: byTypeUsd,
+    human: byTypeHuman,
+    original: fees
   };
 }
 function sumFeeByTokenLD(fees, dstTokenAddr, dstChainKey) {
@@ -998,10 +1006,7 @@ function getQuoteAmounts(quote, srcToken, dstToken) {
   const inputHuman = fromLD(quote.srcAmount, srcToken.decimals);
   const outputHuman = fromLD(quote.dstAmount, dstToken.decimals);
   const outputHumanRounded = truncateToDecimals(outputHuman, 2);
-  const minReceivedHuman = fromLD(
-    quote.dstAmountMin || "0",
-    dstToken.decimals
-  );
+  const minReceivedHuman = fromLD(quote.dstAmountMin || "0", dstToken.decimals);
   return {
     inputHuman,
     outputHuman,
@@ -1012,11 +1017,7 @@ function getQuoteAmounts(quote, srcToken, dstToken) {
 function getQuoteFees(quote, tokens, chains, srcToken, dstToken) {
   if (!quote || !tokens || !chains) {
     return {
-      totalUsd: 0,
-      protocolFeeUsd: void 0,
-      messageFeeUsd: void 0,
-      serviceUsd: void 0,
-      blockchainUsd: void 0,
+      fees: { usd: /* @__PURE__ */ new Map(), original: /* @__PURE__ */ new Map(), formatted: /* @__PURE__ */ new Map() },
       inSrcToken: void 0,
       inDstToken: void 0
     };
@@ -1033,8 +1034,8 @@ function getQuoteFees(quote, tokens, chains, srcToken, dstToken) {
     const feeInSrcHuman = fromLD(feeInSrcLD, srcToken.decimals);
     if (feeInSrcHuman > 0) {
       inSrcToken = Number(truncateToDecimals(feeInSrcHuman, 8));
-    } else if (feeData.totalUsd > 0 && srcToken.price?.usd) {
-      const feeInSrcApprox = feeData.totalUsd / srcToken.price.usd;
+    } else if ((feeData.usd.get("total") || 0) > 0 && srcToken.price?.usd) {
+      const feeInSrcApprox = (feeData.usd.get("total") || 0) / srcToken.price.usd;
       inSrcToken = Number(truncateToDecimals(feeInSrcApprox, 8));
     }
   }
@@ -1050,11 +1051,7 @@ function getQuoteFees(quote, tokens, chains, srcToken, dstToken) {
     }
   }
   return {
-    totalUsd: feeData.totalUsd,
-    protocolFeeUsd: feeData.protocolFeeUsd,
-    messageFeeUsd: feeData.messageFeeUsd,
-    serviceUsd: feeData.serviceUsd,
-    blockchainUsd: feeData.blockchainUsd,
+    fees: feeData,
     inSrcToken,
     inDstToken
   };
@@ -1113,9 +1110,7 @@ function addTonNetworkFee(quote, chains, estimatedFee) {
   if (!quote || quote.srcChainKey.toLowerCase() !== "ton") {
     return quote;
   }
-  const tonChain = chains?.find(
-    (c2) => c2.chainKey.toLowerCase() === "ton"
-  );
+  const tonChain = chains?.find((c2) => c2.chainKey.toLowerCase() === "ton");
   if (!tonChain?.nativeCurrency?.address) {
     console.warn("Could not find TON native currency address");
     return quote;
@@ -1181,9 +1176,7 @@ function addTronNetworkFee(quote, chains, estimatedFee) {
   if (!quote || quote.srcChainKey.toLowerCase() !== "tron") {
     return quote;
   }
-  const tronChain = chains?.find(
-    (c2) => c2.chainKey.toLowerCase() === "tron"
-  );
+  const tronChain = chains?.find((c2) => c2.chainKey.toLowerCase() === "tron");
   if (!tronChain?.nativeCurrency?.address) {
     console.warn("Could not find TRON native currency address");
     return quote;
@@ -1222,9 +1215,6 @@ async function estimateEvmNetworkFee(publicClient, quote, chainKey) {
     totalGasLimit = totalGasLimit * BigInt(Math.floor(EVM_CONFIG.gasBuffer * 100)) / 100n;
     const gasPrice = await publicClient.getGasPrice();
     const totalCostWei = totalGasLimit * gasPrice;
-    console.log(
-      `EVM gas estimate: ${totalGasLimit} gas × ${gasPrice} Wei/gas = ${totalCostWei} Wei`
-    );
     return totalCostWei.toString();
   } catch (error) {
     console.warn("Failed to estimate EVM gas fee:", error);
@@ -1253,7 +1243,6 @@ function addEvmNetworkFee(quote, chains, estimatedFee) {
     token: srcChain.nativeCurrency.address,
     chainKey: quote.srcChainKey,
     amount: estimatedFee || "10000000000000000",
-    // 0.01 ETH fallback
     type: "network"
   };
   return {
@@ -1392,7 +1381,6 @@ function useBridgeQuote() {
           try {
             const estimatedFee = estimateTonNetworkFee(quoteRoute);
             quoteWithFees = addTonNetworkFee(quoteRoute, chains, estimatedFee);
-            console.log("TON network fee estimated for quote:", estimatedFee);
           } catch (error) {
             console.warn("Failed to estimate TON fee, using fallback:", error);
             quoteWithFees = addTonNetworkFee(quoteRoute, chains);
@@ -1415,10 +1403,6 @@ function useBridgeQuote() {
                   chains,
                   estimatedFee
                 );
-                console.log(
-                  "TRON network fee estimated for quote:",
-                  estimatedFee
-                );
               } catch (error) {
                 console.warn(
                   "Failed to estimate TRON fee, using fallback:",
@@ -1456,7 +1440,6 @@ function useBridgeQuote() {
                 chains,
                 estimatedFee
               );
-              console.log("EVM network fee estimated for quote:", estimatedFee);
             } catch (error) {
               console.warn(
                 "Failed to estimate EVM fee, using fallback:",
@@ -3095,7 +3078,7 @@ function useGasEstimate(amountNum) {
   const nativeCurrencySymbol = fromChain?.nativeCurrency?.symbol;
   const nativeCurrencyAddress = fromChain?.nativeCurrency?.address;
   const nativeCurrencyDecimals = fromChain?.nativeCurrency?.decimals;
-  const quoteFees = quote?.fees ? JSON.stringify(quote.fees) : null;
+  const quoteFees = quote?.fees;
   const quoteSrcChainKey = quote?.srcChainKey;
   const nativeBalanceValue = nativeCurrencySymbol ? Number(balances[nativeCurrencySymbol.toUpperCase()]?.balance ?? 0) : 0;
   const result = react.useMemo(() => {
@@ -3114,7 +3097,7 @@ function useGasEstimate(amountNum) {
     const isNativeSelected = nativeSym === (selectedAssetSymbol || "").toUpperCase();
     let requiredNative = 0;
     if (quoteFees && quoteSrcChainKey === chainKey) {
-      const fees = JSON.parse(quoteFees);
+      const fees = quoteFees;
       const feesInNative = fees.filter(
         (f4) => f4.chainKey === chainKey && f4.token === nativeCurrencyAddress
       ).reduce(
@@ -3154,35 +3137,153 @@ function useGasEstimate(amountNum) {
   ]);
   return result;
 }
-const Details = () => {
-  const { t: t2 } = useBridgeTranslation();
-  const { selectedAssetSymbol, assetMatrix, tokens } = useTokensStore();
-  const { toChain, fromChain, chains } = useChainsStore();
-  const { quote, status } = useBridgeQuoteStore();
-  const { slippageBps } = useSettingsStore();
-  const gas = useGasEstimate();
-  const dstToken = resolveTokenOnChainFromMatrix$2(
+function useBridgeExternalData(options) {
+  const selectedAssetSymbol = useTokensStore(
+    (state2) => state2.selectedAssetSymbol
+  );
+  const assetMatrix = useTokensStore((state2) => state2.assetMatrix);
+  const tokens = useTokensStore((state2) => state2.tokens);
+  const fromChain = useChainsStore((state2) => state2.fromChain);
+  const toChain = useChainsStore((state2) => state2.toChain);
+  const chains = useChainsStore((state2) => state2.chains);
+  const inputAmount = useBridgeQuoteStore((state2) => state2.inputAmount);
+  const quote = useBridgeQuoteStore((state2) => state2.quote);
+  const slippageBps = useSettingsStore((state2) => state2.slippageBps);
+  const data = react.useMemo(
+    () => buildBridgeExternalData({
+      amount: inputAmount,
+      selectedAssetSymbol,
+      srcChain: fromChain,
+      dstChain: toChain,
+      assetMatrix,
+      chains,
+      tokens,
+      quote,
+      slippageBps
+    }),
+    [
+      inputAmount,
+      selectedAssetSymbol,
+      fromChain,
+      toChain,
+      assetMatrix,
+      chains,
+      tokens,
+      quote,
+      slippageBps
+    ]
+  );
+  const lastSerializedRef = react.useRef(void 0);
+  react.useEffect(() => {
+    const callback = options?.onDataUpdate;
+    if (!callback) return;
+    const serialized = serializeBridgeDataForCache(data);
+    if (serialized === lastSerializedRef.current) {
+      return;
+    }
+    lastSerializedRef.current = serialized;
+    callback(data);
+  }, [data, options?.onDataUpdate]);
+  return data;
+}
+function buildBridgeExternalData({
+  amount,
+  selectedAssetSymbol,
+  srcChain: fromChain,
+  dstChain: toChain,
+  assetMatrix,
+  chains,
+  tokens,
+  quote,
+  slippageBps
+}) {
+  const normalizedAmount = amount?.trim() || "";
+  const urlParams = {
+    srcToken: selectedAssetSymbol || void 0,
+    srcChain: fromChain?.chainKey,
+    dstChain: toChain?.chainKey,
+    amount: normalizedAmount || void 0
+  };
+  const sourceToken = resolveTokenOnChainFromMatrix$2(
     assetMatrix,
     selectedAssetSymbol,
-    toChain?.chainKey
+    fromChain?.chainKey
   );
-  const srcToken = resolveTokenOnChainFromMatrix$2(
+  const destinationToken = resolveTokenOnChainFromMatrix$2(
     assetMatrix,
     selectedAssetSymbol,
-    fromChain?.chainKey
+    toChain?.chainKey
   );
   const quoteDetails = getQuoteDetails(
     quote,
-    srcToken,
-    dstToken,
+    sourceToken,
+    destinationToken,
     tokens,
     chains,
     slippageBps
   );
-  const symbol = (selectedAssetSymbol ?? dstToken?.symbol ?? "—").toUpperCase();
-  const isLoading = status === "loading";
-  const receiveText = quoteDetails.outputAmount != null ? Number(quoteDetails.outputAmount).toFixed(quote ? 6 : 2) : "0.00";
   const etaText = quoteDetails.etaSeconds != null ? `≈ ${Math.max(1, Math.round(quoteDetails.etaSeconds / 60))}m` : "—";
+  const currentSlippageText = !quote ? "—" : formatPercentage(slippageBps);
+  const routeText = getRouteDisplayName(quote?.route);
+  return {
+    amount: normalizedAmount || void 0,
+    urlParams,
+    srcChain: fromChain,
+    dstChain: toChain,
+    tokenSymbol: selectedAssetSymbol,
+    srcToken: sourceToken,
+    dstToken: destinationToken,
+    quoteDetails,
+    quote,
+    eta: etaText,
+    currentSlippageText,
+    routeText
+  };
+}
+function serializeBridgeDataForCache(data) {
+  return JSON.stringify({
+    amount: data.amount ?? "",
+    urlParams: {
+      amount: data.urlParams.amount ?? "",
+      srcToken: data.urlParams.srcToken ?? "",
+      srcChain: data.urlParams.srcChain ?? "",
+      dstChain: data.urlParams.dstChain ?? ""
+    },
+    srcChain: data.srcChain?.chainKey ?? "",
+    dstChain: data.dstChain?.chainKey ?? "",
+    tokenSymbol: data.tokenSymbol ?? "",
+    srcToken: data.srcToken ? {
+      chainKey: data.srcToken.chainKey,
+      address: data.srcToken.address
+    } : null,
+    dstToken: data.dstToken ? {
+      chainKey: data.dstToken.chainKey,
+      address: data.dstToken.address
+    } : null,
+    quoteDetails: data.quoteDetails ? {
+      inputAmount: data.quoteDetails.inputAmount,
+      outputAmount: data.quoteDetails.outputAmount,
+      outputAmountRounded: data.quoteDetails.outputAmountRounded,
+      minimumReceived: data.quoteDetails.minimumReceived,
+      etaSeconds: data.quoteDetails.etaSeconds,
+      fees: data.quoteDetails.fees
+    } : null
+  });
+}
+const Details = () => {
+  const { t: t2 } = useBridgeTranslation();
+  const { selectedAssetSymbol } = useTokensStore();
+  const { quote, status } = useBridgeQuoteStore();
+  const { slippageBps } = useSettingsStore();
+  const gas = useGasEstimate();
+  const bridgeData = useBridgeExternalData();
+  const symbol = (selectedAssetSymbol ?? bridgeData.dstToken?.symbol ?? "—").toUpperCase();
+  const isLoading = status === "loading";
+  const receiveText = bridgeData.quoteDetails?.outputAmount != null ? Number(bridgeData.quoteDetails?.outputAmount).toFixed(quote ? 6 : 2) : "0.00";
+  const etaText = bridgeData.quoteDetails?.etaSeconds != null ? `≈ ${Math.max(
+    1,
+    Math.round(bridgeData.quoteDetails?.etaSeconds / 60)
+  )}m` : "—";
   const totalFeeDisplay = !quote ? "—" : gas.requiredNative > 0 ? `${gas.requiredNative.toFixed(6)} ${gas.nativeSym}` : "—";
   const currentSlippageText = !quote ? "—" : formatPercentage(slippageBps);
   const routeText = getRouteDisplayName(quote?.route);
@@ -25818,7 +25919,7 @@ class WalletConnectModal {
   }
   async initUi() {
     if (typeof window !== "undefined") {
-      await Promise.resolve().then(() => require("./index-DJC9_woN.cjs"));
+      await Promise.resolve().then(() => require("./index-OkGSl_M4.cjs"));
       const modal = document.createElement("wcm-modal");
       document.body.insertAdjacentElement("beforeend", modal);
       OptionsCtrl.setIsUiLoaded(true);
@@ -26069,148 +26170,6 @@ function updateBridgeUrlNative(params) {
   const newUrl = `${window.location.pathname}${queryString}${window.location.hash}`;
   window.history.replaceState(null, "", newUrl);
 }
-function useBridgeExternalData(options) {
-  const selectedAssetSymbol = useTokensStore(
-    (state2) => state2.selectedAssetSymbol
-  );
-  const assetMatrix = useTokensStore((state2) => state2.assetMatrix);
-  const tokens = useTokensStore((state2) => state2.tokens);
-  const fromChain = useChainsStore((state2) => state2.fromChain);
-  const toChain = useChainsStore((state2) => state2.toChain);
-  const chains = useChainsStore((state2) => state2.chains);
-  const inputAmount = useBridgeQuoteStore((state2) => state2.inputAmount);
-  const quote = useBridgeQuoteStore((state2) => state2.quote);
-  const slippageBps = useSettingsStore((state2) => state2.slippageBps);
-  const data = react.useMemo(
-    () => buildBridgeExternalData({
-      amount: inputAmount,
-      selectedAssetSymbol,
-      srcChain: fromChain,
-      dstChain: toChain,
-      assetMatrix,
-      chains,
-      tokens,
-      quote,
-      slippageBps
-      // gas,
-    }),
-    [
-      inputAmount,
-      selectedAssetSymbol,
-      fromChain,
-      toChain,
-      assetMatrix,
-      chains,
-      tokens,
-      quote,
-      slippageBps
-      // gas,
-    ]
-  );
-  const lastSerializedRef = react.useRef(void 0);
-  react.useEffect(() => {
-    const callback = options?.onDataUpdate;
-    if (!callback) return;
-    const serialized = serializeBridgeDataForCache(data);
-    if (serialized === lastSerializedRef.current) {
-      return;
-    }
-    lastSerializedRef.current = serialized;
-    callback(data);
-  }, [data, options?.onDataUpdate]);
-  return data;
-}
-function buildBridgeExternalData({
-  amount,
-  selectedAssetSymbol,
-  srcChain: fromChain,
-  dstChain: toChain,
-  assetMatrix,
-  chains,
-  tokens,
-  quote,
-  slippageBps
-  // gas,
-}) {
-  const normalizedAmount = amount?.trim() || "";
-  const urlParams = {
-    srcToken: selectedAssetSymbol || void 0,
-    srcChain: fromChain?.chainKey,
-    dstChain: toChain?.chainKey,
-    amount: normalizedAmount || void 0
-  };
-  const sourceToken = resolveTokenOnChainFromMatrix$2(
-    assetMatrix,
-    selectedAssetSymbol,
-    fromChain?.chainKey
-  );
-  const destinationToken = resolveTokenOnChainFromMatrix$2(
-    assetMatrix,
-    selectedAssetSymbol,
-    toChain?.chainKey
-  );
-  const quoteDetails = getQuoteDetails(
-    quote,
-    sourceToken,
-    destinationToken,
-    tokens,
-    chains,
-    slippageBps
-  );
-  const etaText = quoteDetails.etaSeconds != null ? `≈ ${Math.max(1, Math.round(quoteDetails.etaSeconds / 60))}m` : "—";
-  const totalFeeDisplay = !quote ? "—" : (
-    // gas.requiredNative > 0
-    // ? `${gas.requiredNative.toFixed(6)} ${gas.nativeSym}`
-    // : "—";
-    "—"
-  );
-  const currentSlippageText = !quote ? "—" : formatPercentage(slippageBps);
-  const routeText = getRouteDisplayName(quote?.route);
-  return {
-    amount: normalizedAmount || void 0,
-    urlParams,
-    srcChain: fromChain,
-    dstChain: toChain,
-    tokenSymbol: selectedAssetSymbol,
-    srcToken: sourceToken,
-    dstToken: destinationToken,
-    quoteDetails,
-    eta: etaText,
-    totalFeeDisplay,
-    currentSlippageText,
-    routeText
-  };
-}
-function serializeBridgeDataForCache(data) {
-  return JSON.stringify({
-    amount: data.amount ?? "",
-    urlParams: {
-      amount: data.urlParams.amount ?? "",
-      srcToken: data.urlParams.srcToken ?? "",
-      srcChain: data.urlParams.srcChain ?? "",
-      dstChain: data.urlParams.dstChain ?? ""
-    },
-    srcChain: data.srcChain?.chainKey ?? "",
-    dstChain: data.dstChain?.chainKey ?? "",
-    tokenSymbol: data.tokenSymbol ?? "",
-    srcToken: data.srcToken ? {
-      chainKey: data.srcToken.chainKey,
-      address: data.srcToken.address
-    } : null,
-    dstToken: data.dstToken ? {
-      chainKey: data.dstToken.chainKey,
-      address: data.dstToken.address
-    } : null,
-    quoteDetails: data.quoteDetails ? {
-      inputAmount: data.quoteDetails.inputAmount,
-      outputAmount: data.quoteDetails.outputAmount,
-      outputAmountRounded: data.quoteDetails.outputAmountRounded,
-      minimumReceived: data.quoteDetails.minimumReceived,
-      etaSeconds: data.quoteDetails.etaSeconds,
-      fees: data.quoteDetails.fees
-    } : null
-  });
-}
 function useUrlSync(options) {
   const {
     enabled = true,
@@ -26709,4 +26668,4 @@ exports.useSettingsStore = useSettingsStore;
 exports.useSwapModel = useSwapModel;
 exports.useTokensStore = useTokensStore;
 exports.useTransactionStore = useTransactionStore;
-//# sourceMappingURL=index-Nq5DhIqK.cjs.map
+//# sourceMappingURL=index-BaoPDmAJ.cjs.map