@stableflow/wallet-evm 3.1.3 → 3.1.4

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { Csl, OpenAPI, erc20Abi, numberRemoveEndZero, getPrice, ExecTime, Service, SendType, usdtTokens } from '@stableflow/core';
-import { LZ_RECEIVE_VALUE, addressToBytes32, getHopMsgFee, USDT0_LEGACY_MESH_TRANSFTER_FEE, quoteSignature, FRAXZERO_MIDDLE_TOKEN_USDC, FRAXZERO_MIDDLE_TOKEN_FRXUSD, USDT0_CONFIG, OFT_ABI } from '@stableflow/bridges';
+import { removeOftDust, LZ_RECEIVE_VALUE, addressToBytes32, getHopMsgFee, USDT0_LEGACY_MESH_TRANSFTER_FEE, quoteSignature, OFT_ABI, FRAXZERO_MIDDLE_TOKEN_USDC, FRAXZERO_MIDDLE_TOKEN_FRXUSD, USDT0_CONFIG } from '@stableflow/bridges';
 import { evmRpcFallbackProvider, NATIVE_MSG_FEE_BUFFER, buildEndpointV2LzComposePayload } from '@stableflow/utils-evm';
 import { getDestinationAssociatedTokenAddress } from '@stableflow/utils-solana';
 import Big from 'big.js';
@@ -304,6 +304,7 @@ var EVMWallet = class {
       originLayerzero,
       destinationLayerzero
     } = params;
+    const amountLdClean = removeOftDust(amountWei || 0, fromToken.decimals);
     const result = {
       needApprove: false,
       approveSpender: originLayerzeroAddress,
@@ -320,8 +321,12 @@ var EVMWallet = class {
       estimateSourceGasUsd: "0",
       estimateTime: 0,
       // seconds - dynamically calculated using LayerZero formula
-      outputAmount: numberRemoveEndZero(Big(amountWei || 0).div(10 ** params.fromToken.decimals).toFixed(params.fromToken.decimals, 0))
+      outputAmount: numberRemoveEndZero(Big(amountLdClean || 0).div(10 ** params.fromToken.decimals).toFixed(params.fromToken.decimals, 0))
     };
+    if (BigInt(amountLdClean) === 0n) {
+      result.errMsg = "Amount below minimum cross-chain unit";
+      return result;
+    }
     const execTime = new ExecTime({ type: `Usdt0 EVM ${fromToken.chainName}->${toToken.chainName}`, logStyle: "stone-100", isDebug: OpenAPI.DEBUG });
     const provider = evmRpcFallbackProvider(fromToken);
     const oftContract = new ethers.Contract(originLayerzeroAddress, abi, this.signer);
@@ -348,7 +353,7 @@ var EVMWallet = class {
     const sendParam = {
       dstEid,
       to: addressToBytes32(toToken.chainType, recipient),
-      amountLD: amountWei,
+      amountLD: amountLdClean,
       minAmountLD: 0n,
       extraOptions: unMultiHopExtraOptions,
       composeMsg: "0x",
@@ -384,21 +389,22 @@ var EVMWallet = class {
       );
     }
     if (isOriginLegacy || isDestinationLegacy) {
-      result.fees.legacyMeshFeeUsd = numberRemoveEndZero(Big(amountWei || 0).div(10 ** params.fromToken.decimals).times(USDT0_LEGACY_MESH_TRANSFTER_FEE).toFixed(params.fromToken.decimals));
-      result.outputAmount = numberRemoveEndZero(Big(Big(amountWei || 0).div(10 ** params.fromToken.decimals)).minus(result.fees.legacyMeshFeeUsd || 0).toFixed(params.fromToken.decimals, 0));
+      result.fees.legacyMeshFeeUsd = numberRemoveEndZero(Big(amountLdClean || 0).div(10 ** params.fromToken.decimals).times(USDT0_LEGACY_MESH_TRANSFTER_FEE).toFixed(params.fromToken.decimals));
+      result.outputAmount = numberRemoveEndZero(Big(Big(amountLdClean || 0).div(10 ** params.fromToken.decimals)).minus(result.fees.legacyMeshFeeUsd || 0).toFixed(params.fromToken.decimals, 0));
     }
     if (!dry) {
       execTime.breakpoint();
       const oftData = await oftContractRead.quoteOFT.staticCall(sendParam);
       const [, , oftReceipt] = oftData;
-      sendParam.minAmountLD = Big(amountWei).times(Big(1).minus(Big(slippageTolerance || 0).div(100))).toFixed(0);
+      sendParam.amountLD = oftReceipt[0].toString();
+      sendParam.minAmountLD = Big(sendParam.amountLD).times(Big(1).minus(Big(slippageTolerance || 0).div(100))).toFixed(0);
       result.outputAmount = numberRemoveEndZero(Big(oftReceipt[1].toString()).div(10 ** params.toToken.decimals).toFixed(params.toToken.decimals, 0));
       execTime.log("quoteOFT.staticCall");
     }
     this.csl("EVMWallet quoteOFT", "red-600", "result.outputAmount: %o", result.outputAmount);
     this.csl("EVMWallet quoteOFT", "red-600", "slippageTolerance: %o", slippageTolerance + "%");
-    this.csl("EVMWallet quoteOFT", "red-600", "Minimum received amount: %o", Big(amountWei).div(10 ** fromToken.decimals).times(Big(1).minus(Big(slippageTolerance || 0).div(100))).toFixed(6, 0));
-    if (Big(result.outputAmount).lt(Big(amountWei).div(10 ** fromToken.decimals).times(Big(1).minus(Big(slippageTolerance || 0).div(100))))) {
+    this.csl("EVMWallet quoteOFT", "red-600", "Minimum received amount: %o", Big(amountLdClean).div(10 ** fromToken.decimals).times(Big(1).minus(Big(slippageTolerance || 0).div(100))).toFixed(6, 0));
+    if (Big(result.outputAmount).lt(Big(amountLdClean).div(10 ** fromToken.decimals).times(Big(1).minus(Big(slippageTolerance || 0).div(100))))) {
       result.errMsg = "Slippage limit exceeded";
       return result;
     }
@@ -413,7 +419,7 @@ var EVMWallet = class {
           contractAddress: fromToken.contractAddress,
           spender: originLayerzeroAddress,
           address: refundTo,
-          amountWei,
+          amountWei: amountLdClean,
           provider
         })
       );
@@ -878,6 +884,18 @@ var EVMWallet = class {
       eid: dstEid
     } = destinationLayerzero;
     const isFromEthereum = fromToken.chainId === 1;
+    const oftAddress = isFromEthereum ? lockbox : fromToken.contractAddress;
+    const provider = evmRpcFallbackProvider(fromToken);
+    let amountLdClean = removeOftDust(amountWei || 0, fromToken.decimals);
+    if (!dry) {
+      try {
+        const oftContractRead = new ethers.Contract(oftAddress, OFT_ABI, provider);
+        amountLdClean = (await oftContractRead.removeDust.staticCall(amountWei)).toString();
+      } catch (error) {
+        this.csl("EVM quoteFraxZero", "yellow-500", "removeDust failed, use local: %o", error);
+        amountLdClean = removeOftDust(amountWei || 0, fromToken.decimals);
+      }
+    }
     const result = {
       needApprove: false,
       approveSpender: remoteHop,
@@ -891,21 +909,24 @@ var EVMWallet = class {
       totalEstimateSourceGas: 0n,
       estimateSourceGasUsd: 0,
       estimateTime: 0,
-      outputAmount: numberRemoveEndZero(Big(amountWei || 0).div(10 ** params.fromToken.decimals).toFixed(params.fromToken.decimals, 0))
+      outputAmount: numberRemoveEndZero(Big(amountLdClean || 0).div(10 ** params.fromToken.decimals).toFixed(params.fromToken.decimals, 0))
     };
-    const provider = evmRpcFallbackProvider(fromToken);
+    if (BigInt(amountLdClean) === 0n) {
+      result.errMsg = "Amount below minimum cross-chain unit";
+      return result;
+    }
     const execTime = new ExecTime({ type: `FraxZero EVM ${fromToken.chainName}->${toToken.chainName}`, logStyle: "stone-500", isDebug: OpenAPI.DEBUG });
     const remoteHopContract = new ethers.Contract(remoteHop, abi, this.signer);
     const remoteHopContractRead = new ethers.Contract(remoteHop, abi, provider);
     const sendParams = [
       // _oft
-      isFromEthereum ? lockbox : fromToken.contractAddress,
+      oftAddress,
       // _dstEid
       dstEid,
       // _to
       addressToBytes32(toToken.chainType, recipient),
-      // _amountLD
-      amountWei
+      // _amountLD (OFT sharedDecimals dust removed)
+      amountLdClean
     ];
     execTime.breakpoint();
     const mergedCalls = [
@@ -914,7 +935,7 @@ var EVMWallet = class {
         contractAddress: fromToken.contractAddress,
         spender: remoteHop,
         address: refundTo,
-        amountWei,
+        amountWei: amountLdClean,
         provider
       }),
       remoteHopContractRead.quote.staticCall(...sendParams)
@@ -932,6 +953,7 @@ var EVMWallet = class {
     result.fees.nativeFeeUsd = numberRemoveEndZero(Big(nativeFeeUsd).toFixed(20));
     result.fees.lzTokenFeeUsd = numberRemoveEndZero(Big(msgFee[1]?.toString() || 0).div(10 ** fromToken.decimals).toFixed(20));
     this.csl("EVM quoteFraxZero", "blue-700", "msgFee: %o", msgFee);
+    this.csl("EVM quoteFraxZero", "blue-700", "amountLdClean: %o", amountLdClean);
     execTime.breakpoint();
     const finalSendParam = [...sendParams, { value: nativeMsgFee }];
     const ett = await this.estimateTransaction({