@stableflow/bridges 3.1.1 → 3.1.3-rc-45fcf7f0b6-20260730

package/dist/index.mjs

@@ -84,7 +84,7 @@ var OneClickService = class {
   }
   async formatQuoteData(res) {
     const { params } = res;
-    const { isProxy = true, prices } = params;
+    const { isProxy = true, prices, forceCalculateFee = true } = params;
     const isExactOutput = params.swapType === OneClickSwapType.Output;
     getPrice(prices, params.fromToken.nativeToken.symbol);
     params.fromToken.nativeToken.decimals;
@@ -129,7 +129,7 @@ var OneClickService = class {
         }
         let destinationGasFee = Big(netFee).minus(bridgeFeeValue);
         destinationGasFee = Big(destinationGasFee).lt(0) ? Big(0) : destinationGasFee;
-        if (fromTokenSymbol !== toTokenSymbol) {
+        if (!forceCalculateFee && fromTokenSymbol !== toTokenSymbol) {
           destinationGasFee = Big(0);
         }
         res.data.fees = {
@@ -728,46 +728,6 @@ function parseUserFriendlyTonAddress(address) {
     isTestOnly
   };
 }
-var formatQuoteError = (error, options) => {
-  const { service, fromToken } = options;
-  const defaultErrorMessage = "Failed to get quote, please try again later";
-  if (service === Service.OneClick) {
-    const getQuoteErrorMessage = () => {
-      const _messageResult = {
-        message: error?.message || defaultErrorMessage,
-        sourceMessage: error?.response?.data?.message || defaultErrorMessage
-      };
-      if (error?.response?.data?.message && error?.response?.data?.message !== "Internal server error") {
-        if (error?.response?.data?.message === "Failed to get quote") {
-          _messageResult.message = "Amount exceeds max";
-          return _messageResult;
-        }
-        if (error?.response?.data?.message?.includes("Amount is too low for bridge, try at least")) {
-          const match = error.response.data.message.match(/try at least\s+(\d+(?:\.\d+)?)/i);
-          let minimumAmount = match ? match[1] : Big(1).times(10 ** fromToken.decimals).toFixed(0);
-          minimumAmount = Big(minimumAmount).div(10 ** fromToken.decimals).toFixed(fromToken.decimals);
-          _messageResult.message = `Amount is too low, at least ${minimumAmount}`;
-          return _messageResult;
-        }
-        return _messageResult;
-      }
-      return _messageResult;
-    };
-    const onclickErrMsg = getQuoteErrorMessage();
-    return {
-      serviceType: service,
-      error: onclickErrMsg.message
-    };
-  }
-  return {
-    serviceType: service,
-    error: error?.message || defaultErrorMessage
-  };
-};
-async function quoteSignature(params) {
-  const response = await postRequest("/v0/cctp/sign", params);
-  return response.data ?? {};
-}
 var addThousandSeparator = (numberString) => {
   if (!numberString) return "0";
   const parts = String(numberString).split(".");
@@ -871,6 +831,54 @@ var formatNumber = (value, precision, isSimple, options) => {
   };
 };
 
+// src/utils/error.ts
+var formatQuoteError = (error, options) => {
+  const { service, fromToken } = options;
+  const defaultErrorMessage = "Failed to get quote, please try again later";
+  if ([Service.OneClick, Service.OneClickUsdt0, Service.Usdt0OneClick, Service.CCTPOneClick, Service.OneClickCCTP, Service.FraxZeroOneClick, Service.OneClickFraxZero].includes(service)) {
+    const getQuoteErrorMessage = () => {
+      const apiMessage = error?.body?.message || error?.response?.data?.message;
+      const _messageResult = {
+        message: error?.message || defaultErrorMessage,
+        sourceMessage: apiMessage || defaultErrorMessage
+      };
+      if (apiMessage && apiMessage !== "Internal server error") {
+        if (apiMessage === "Failed to get quote") {
+          _messageResult.message = "Amount exceeds max";
+          return _messageResult;
+        }
+        if (apiMessage.includes("Amount is too low for bridge, try at least")) {
+          const match = apiMessage.match(/try at least\s+(\d+(?:\.\d+)?)/i);
+          const minWei = match ? match[1] : Big(1).times(10 ** fromToken.decimals).toFixed(0);
+          const minAmount = Big(minWei).div(10 ** fromToken.decimals);
+          const readableAmount = formatNumber(minAmount, fromToken.decimals, true);
+          _messageResult.message = `Amount is too low, at least ${readableAmount} ${fromToken.symbol}`;
+          return _messageResult;
+        }
+        if (apiMessage.includes("Cannot convert undefined or null to object")) {
+          _messageResult.message = "app fees exceeds 5% of amount";
+          return _messageResult;
+        }
+        return _messageResult;
+      }
+      return _messageResult;
+    };
+    const onclickErrMsg = getQuoteErrorMessage();
+    return {
+      serviceType: service,
+      error: onclickErrMsg.message
+    };
+  }
+  return {
+    serviceType: service,
+    error: error?.message || defaultErrorMessage
+  };
+};
+async function quoteSignature(params) {
+  const response = await postRequest("/v0/cctp/sign", params);
+  return response.data ?? {};
+}
+
 // src/usdt0/config.ts
 var USDT0_CONFIG = {
   Ethereum: {
@@ -5570,55 +5578,24 @@ var CCTPOneClickService = class {
       refundTo: evmAddress,
       wallet: evmWallet
     };
-    let cctpResult;
-    let oneClickResult;
-    if (!dry) {
-      execTime.breakpoint();
-      oneClickResult = await oneclick_default.quote({
-        ...oneClickParams,
-        amountWei: Big(0.01).times(10 ** MIDDLE_TOKEN_CHAIN2.decimals).toFixed(0, 0)
-      });
-      execTime.log("CCTPOneClickService.quote", "oneClickService.quote: %o", oneClickResult);
-      if (oneClickResult.errMsg) {
-        return oneClickResult;
-      }
-      cctpParams.recipient = oneClickResult.quote.depositAddress;
-      execTime.breakpoint();
-      cctpResult = await cctp_default.quote(cctpParams);
-      execTime.log("CCTPOneClickService.quote", "cctpService.quote: %o", cctpResult);
-      execTime.breakpoint();
-      try {
-        const oneClickResult2 = await oneclick_default.quote({
-          ...oneClickParams,
-          dry: true,
-          amountWei: Big(cctpResult.outputAmount || 0).times(10 ** MIDDLE_TOKEN_CHAIN2.decimals).toFixed(0, 0)
-        });
-        oneClickResult.fees = oneClickResult2.fees;
-        oneClickResult.outputAmount = oneClickResult2.outputAmount;
-        oneClickResult.estimateTime = oneClickResult2.estimateTime;
-        oneClickResult.priceImpact = oneClickResult2.priceImpact;
-        oneClickResult.exchangeRate = oneClickResult2.exchangeRate;
-        execTime.log("CCTPOneClickService.quote", "confirm get actual output amount result: %o", oneClickResult2);
-      } catch (err) {
-        execTime.log("CCTPOneClickService.quote", "confirm get actual output amount error: %o", err);
-      }
-    } else {
-      execTime.breakpoint();
-      cctpResult = await cctp_default.quote(cctpParams);
-      execTime.log("CCTPOneClickService.quote", "cctpService.quote dry: %o", cctpResult);
-      if (cctpResult.errMsg) {
-        return cctpResult;
-      }
-      oneClickParams.amountWei = Big(cctpResult.outputAmount || 0).times(10 ** MIDDLE_TOKEN_CHAIN2.decimals).toFixed(0, 0);
-      execTime.breakpoint();
-      oneClickResult = await oneclick_default.quote(oneClickParams);
-      execTime.log("CCTPOneClickService.quote", "oneClickService.quote: %o", oneClickResult);
+    execTime.breakpoint();
+    let cctpResult = await cctp_default.quote(cctpParams);
+    execTime.log("cctpService.quote: %o", cctpResult);
+    if (cctpResult.errMsg) {
+      return cctpResult;
     }
+    oneClickParams.amountWei = Big(cctpResult.outputAmount || 0).times(10 ** MIDDLE_TOKEN_CHAIN2.decimals).toFixed(0, 0);
+    execTime.breakpoint();
+    const oneClickResult = await oneclick_default.quote(oneClickParams);
+    execTime.log("oneClickService.quote: %o", oneClickResult);
     if (oneClickResult.errMsg) {
       return oneClickResult;
     }
-    if (cctpResult.errMsg) {
-      return cctpResult;
+    if (!dry) {
+      cctpParams.recipient = oneClickResult.quote.depositAddress;
+      execTime.breakpoint();
+      cctpResult = await cctp_default.quote(cctpParams);
+      execTime.log("cctpService.quote again: %o", cctpResult);
     }
     csl("CCTPOneClickService quote", "rose-600", "oneClickResult: %o", oneClickResult);
     csl("CCTPOneClickService quote", "rose-600", "cctpResult: %o", cctpResult);
@@ -6241,6 +6218,7 @@ var BridgeSFA = class _BridgeSFA {
         _params.appFees = params.oneclickParams?.appFees || params.appFees;
         _params.swapType = params.oneclickParams?.swapType;
         _params.isProxy = params.oneclickParams?.isProxy;
+        _params.forceCalculateFee = params.oneclickParams?.forceCalculateFee;
       }
       if ([
         Service.Usdt0,