hermes-swap 0.0.31 → 0.0.33

package/dist/cjs/index.d.ts

@@ -1,7 +1,8 @@
 import type { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts } from './types.js';
-import { ChainNameEnum, AddressConst, DexType, BridgeType, IEstimateType } from './types.js';
+import { ChainNameEnum, AddressConst, DexType, BridgeType, IEstimateType, LayerZeroV1ChainIdMap, LayerZeroV1ChainNameMap, LayerZeroV2ChainIdMap, LayerZeroV2ChainNameMap } from './types.js';
+import { TransactionRequest } from 'ethers';
 export type { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts };
-export { ChainNameEnum, AddressConst, DexType, BridgeType, IEstimateType };
+export { ChainNameEnum, AddressConst, DexType, BridgeType, IEstimateType, LayerZeroV1ChainIdMap, LayerZeroV1ChainNameMap, LayerZeroV2ChainIdMap, LayerZeroV2ChainNameMap };
 declare class Hermes {
     private config;
     private providerMap;
@@ -10,7 +11,7 @@ declare class Hermes {
     private aggregatorAddressMap;
     constructor(config: IConfig);
     expect(params: IExpectParams): Promise<bigint>;
-    swap(params: ISwapParams): Promise<IReceipt>;
+    swap(params: ISwapParams, txReq?: TransactionRequest): Promise<IReceipt>;
     /**
      * 生成 swap 的 calldata
      */
@@ -18,9 +19,9 @@ declare class Hermes {
         to: string;
         data: string;
     };
-    bridge(params: IBridgeParams): Promise<IReceipt>;
+    bridge(params: IBridgeParams, txReq?: TransactionRequest): Promise<IReceipt>;
     estimateBridgeFee(params: IBridgeParams): Promise<bigint>;
-    swapAndBridge(params: ISwapAndBridgeParams): Promise<IReceipt>;
+    swapAndBridge(params: ISwapAndBridgeParams, txReq?: TransactionRequest): Promise<IReceipt>;
     estimateGas(estimateType: IEstimateType, params: IBridgeParams | ISwapParams | ISwapAndBridgeParams): Promise<bigint>;
     getAggregatorSupportContracts(chain: ChainNameEnum): Promise<SupportContracts[]>;
     getQuoterSupportContracts(chain: ChainNameEnum): Promise<SupportContracts[]>;
@@ -32,6 +33,10 @@ declare class Hermes {
         data: string;
         value: bigint;
     };
+    private resolveGasLimit;
+    private resolveNonce;
+    private resolvePricing;
+    private sanitizePricing;
     private checkIsEnoughToken;
     private validateParams;
     private getQuoterAddress;

package/dist/cjs/index.js

@@ -35,12 +35,15 @@ __export(src_exports, {
   DexType: () => import_types.DexType,
   Hermes: () => Hermes,
   IEstimateType: () => import_types.IEstimateType,
+  LayerZeroV1ChainIdMap: () => import_types.LayerZeroV1ChainIdMap,
+  LayerZeroV1ChainNameMap: () => import_types.LayerZeroV1ChainNameMap,
+  LayerZeroV2ChainIdMap: () => import_types.LayerZeroV2ChainIdMap,
+  LayerZeroV2ChainNameMap: () => import_types.LayerZeroV2ChainNameMap,
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
 var import_types = require("./types.js");
 var import_ethers = require("ethers");
-var import_ethers2 = require("ethers");
 var import_quoter = __toESM(require("./abis/quoter.js"));
 var import_aggregator = __toESM(require("./abis/aggregator.js"));
 var Hermes = class {
@@ -73,7 +76,7 @@ var Hermes = class {
     if (!address) {
       throw new Error(`Quoter address not found for chain: ${params.chain}`);
     }
-    const quoter = new import_ethers2.Contract(address, import_quoter.default, wallet);
+    const quoter = new import_ethers.Contract(address, import_quoter.default, wallet);
     const quoteParams = params.path.map((p) => ({
       dexType: p.dexType,
       pool: p.poolAddress,
@@ -87,7 +90,7 @@ var Hermes = class {
     }
     return amountOutList[amountOutList.length - 1];
   }
-  async swap(params) {
+  async swap(params, txReq = {}) {
     this.validateParams(params);
     if (!params.path.length) {
       throw new Error("Swap path not provided");
@@ -99,7 +102,7 @@ var Hermes = class {
     if (!wallet) {
       throw new Error(`Wallet not configured for chain: ${params.chain}`);
     }
-    const aggregator = new import_ethers2.Contract(aggregatorAddress, import_aggregator.default, wallet);
+    const aggregator = new import_ethers.Contract(aggregatorAddress, import_aggregator.default, wallet);
     const swapParams = params.path.map((pathItem) => ({
       dexType: pathItem.dexType,
       pool: pathItem.poolAddress,
@@ -107,7 +110,7 @@ var Hermes = class {
       toCoin: pathItem.toCoinAddress,
       extra: pathItem.extra ?? "0x"
     }));
-    const erc20 = new import_ethers2.Contract(fromTokenAddress, ["function balanceOf(address) view returns (uint256)", "function allowance(address, address) view returns (uint256)"], wallet);
+    const erc20 = new import_ethers.Contract(fromTokenAddress, ["function balanceOf(address) view returns (uint256)", "function allowance(address, address) view returns (uint256)"], wallet);
     const userBalance = await erc20.balanceOf(params.user);
     if (userBalance < params.amountInWei) {
       throw new Error("Insufficient balance for swap");
@@ -116,22 +119,21 @@ var Hermes = class {
     if (currentAllowance < params.amountInWei) {
       throw new Error("Insufficient allowance token amount for swap");
     }
+    let estimateGas;
+    const { gasLimit: _ignore, ...estimationOverrides } = txReq;
     try {
-      const gas = await aggregator.getFunction("swap").estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, { from: wallet.address });
+      estimateGas = await aggregator.swap.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, estimationOverrides);
     } catch (error) {
       console.warn("Aggregator estimateGas.swap failed", error);
       throw error;
     }
-    let txResponse;
-    try {
-      txResponse = await aggregator.getFunction("swap")(params.user, params.amountInWei, swapParams, params.minAmountOutList, { from: wallet.address });
-    } catch (error) {
-      console.error("Aggregator swap transaction failed", error);
-      throw error;
-    }
+    txReq = this.resolveGasLimit(txReq, estimateGas);
+    txReq = await this.resolveNonce(wallet.provider, wallet.address, txReq);
+    txReq = await this.resolvePricing(wallet.provider, txReq);
+    let txResponse = await aggregator.swap(params.user, params.amountInWei, swapParams, params.minAmountOutList, txReq);
     const receipt = await txResponse.wait();
     const iface = new import_ethers.ethers.Interface(import_aggregator.default);
-    let amountOut = params.amountInWei;
+    let amountOut = null;
     for (const log of receipt.logs) {
       if (log.address.toLowerCase() === aggregatorAddress.toLowerCase()) {
         try {
@@ -144,6 +146,9 @@ var Hermes = class {
         }
       }
     }
+    if (!amountOut) {
+      throw new Error(`Swapped event not found: ${receipt.hash}`);
+    }
     return {
       fromToken: fromTokenAddress,
       toToken: toTokenAddress,
@@ -178,7 +183,7 @@ var Hermes = class {
       data: calldata
     };
   }
-  async bridge(params) {
+  async bridge(params, txReq = {}) {
     this.validateParams(params);
     const aggregatorAddress = this.getAggregatorAddress(params.chain);
     const wallet = this.walletMap.get(params.chain);
@@ -198,7 +203,7 @@ var Hermes = class {
         throw new Error("Insufficient native balance for bridge fee");
       }
     }
-    const aggregator = new import_ethers2.Contract(aggregatorAddress, import_aggregator.default, wallet);
+    const aggregator = new import_ethers.Contract(aggregatorAddress, import_aggregator.default, wallet);
     const bridgeArgs = {
       bridge: params.bridgeType,
       token: params.tokenAddress,
@@ -208,33 +213,31 @@ var Hermes = class {
       destUser: params.destUser,
       extra: params.extra ?? "0x"
     };
-    const txOverrides = {
-      from: wallet.address,
-      value: params.bridgeFee
-    };
-    try {
-      await aggregator.bridge.estimateGas(params.user, bridgeArgs, txOverrides);
-    } catch (error) {
-      console.error("Bridge gas estimation reverted", error);
-      throw error;
+    if (txReq.value == null) {
+      txReq = { ...txReq, value: params.bridgeFee };
     }
-    let txResponse;
+    let estimateGas;
+    const { gasLimit: _ignore, ...estimationOverrides } = txReq;
     try {
-      txResponse = await aggregator.bridge(params.user, bridgeArgs, txOverrides);
+      estimateGas = await aggregator.bridge.estimateGas(params.user, bridgeArgs, estimationOverrides);
     } catch (error) {
-      console.error("Aggregator swap transaction failed", error);
+      console.error("Bridge gas estimation reverted", error);
       throw error;
     }
-    const receipt = {
+    txReq = this.resolveGasLimit(txReq, estimateGas);
+    txReq = await this.resolveNonce(wallet.provider, wallet.address, txReq);
+    txReq = await this.resolvePricing(wallet.provider, txReq);
+    let response = await aggregator.bridge(params.user, bridgeArgs, txReq);
+    const txReceipt = await response.wait();
+    return {
       fromToken: params.tokenAddress,
       toToken: params.tokenAddress,
       amountOut: params.amountInWei,
-      hash: txResponse.hash,
-      from: txResponse.from,
-      to: txResponse.to,
-      logs: txResponse.logs
+      hash: txReceipt.hash,
+      from: txReceipt.from,
+      to: txReceipt.to,
+      logs: txReceipt.logs
     };
-    return Promise.resolve(receipt);
   }
   async estimateBridgeFee(params) {
     this.validateParams(params);
@@ -246,7 +249,7 @@ var Hermes = class {
     if (!address) {
       throw new Error(`Quoter address not found for chain: ${params.chain}`);
     }
-    const quoter = new import_ethers2.Contract(address, import_quoter.default, wallet);
+    const quoter = new import_ethers.Contract(address, import_quoter.default, wallet);
     const bridgeArgs = {
       bridge: params.bridgeType,
       token: params.tokenAddress,
@@ -259,7 +262,7 @@ var Hermes = class {
     const bridgeFee = await quoter.quoteBridge.staticCall(bridgeArgs, { from: wallet.address });
     return bridgeFee;
   }
-  async swapAndBridge(params) {
+  async swapAndBridge(params, txReq = {}) {
     this.validateParams(params);
     const aggregatorAddress = this.getAggregatorAddress(params.chain);
     const wallet = this.walletMap.get(params.chain);
@@ -286,40 +289,49 @@ var Hermes = class {
       destUser: params.destUser,
       extra: params.extra ?? "0x"
     };
-    const txOverrides = {
-      from: wallet.address,
-      value: params.bridgeFee
-    };
-    const aggregator = new import_ethers2.Contract(aggregatorAddress, import_aggregator.default, wallet);
-    try {
-      await aggregator.swapAndBridge.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, txOverrides);
-    } catch (error) {
-      console.error("Bridge gas estimation reverted", error);
-      throw error;
+    if (txReq.value == null) {
+      txReq = { ...txReq, value: params.bridgeFee };
+    }
+    const { gasLimit: _ignore, ...estimationOverrides } = txReq;
+    const aggregator = new import_ethers.Contract(aggregatorAddress, import_aggregator.default, wallet);
+    let estimateGas = await aggregator.swapAndBridge.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, estimationOverrides);
+    txReq = this.resolveGasLimit(txReq, estimateGas);
+    txReq = await this.resolveNonce(wallet.provider, wallet.address, txReq);
+    txReq = await this.resolvePricing(wallet.provider, txReq);
+    let response = await aggregator.swapAndBridge(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, txReq);
+    const txReceipt = await response.wait();
+    const iface = new import_ethers.ethers.Interface(import_aggregator.default);
+    let outputAmountWei = null;
+    for (const log of txReceipt.logs) {
+      if (log.address.toLowerCase() === aggregatorAddress.toLowerCase()) {
+        try {
+          const parsed = iface.parseLog(log);
+          if (parsed && parsed.name === "SwapAndBridge" && parsed.args && parsed.args.amountOut !== void 0) {
+            outputAmountWei = parsed.args.amountOut;
+            break;
+          }
+        } catch {
+        }
+      }
     }
-    let txResponse;
-    try {
-      txResponse = await aggregator.swapAndBridge(params.user, params.amountInWei, swapParams, params.minAmountOutList, bridgeArgs, txOverrides);
-    } catch (error) {
-      console.error("Aggregator swap and bridge transaction failed", error);
-      throw error;
+    if (!outputAmountWei) {
+      throw new Error(`SwapAndBridge event not found: ${txReceipt.hash}`);
     }
-    const receipt = {
+    return {
       fromToken: params.path[0].fromCoinAddress,
       toToken: params.path[params.path.length - 1].toCoinAddress,
-      amountOut: params.minAmountOutList[params.minAmountOutList.length - 1],
-      hash: txResponse.hash,
-      from: txResponse.from,
-      to: txResponse.to,
-      logs: txResponse.logs
+      amountOut: outputAmountWei,
+      hash: txReceipt.hash,
+      from: txReceipt.from,
+      to: txReceipt.to,
+      logs: txReceipt.logs
     };
-    return Promise.resolve(receipt);
   }
   async estimateGas(estimateType, params) {
     this.validateParams(params);
     const aggregatorAddress = this.getAggregatorAddress(params.chain);
     const wallet = this.walletMap.get(params.chain);
-    const aggregator = new import_ethers2.Contract(aggregatorAddress, import_aggregator.default, wallet);
+    const aggregator = new import_ethers.Contract(aggregatorAddress, import_aggregator.default, wallet);
     if (!wallet) {
       throw new Error(`Wallet not configured for chain: ${params.chain}`);
     }
@@ -396,7 +408,7 @@ var Hermes = class {
     if (!provider) {
       throw new Error(`Provider not configured for chain: ${chain}`);
     }
-    const aggregator = new import_ethers2.Contract(aggregatorAddress, import_aggregator.default, provider);
+    const aggregator = new import_ethers.Contract(aggregatorAddress, import_aggregator.default, provider);
     const addressList = await aggregator.getAddressList();
     if (!addressList.length) {
       return [];
@@ -418,7 +430,7 @@ var Hermes = class {
     if (!provider) {
       throw new Error(`Provider not configured for chain: ${chain}`);
     }
-    const quoter = new import_ethers2.Contract(quoterAddress, import_quoter.default, provider);
+    const quoter = new import_ethers.Contract(quoterAddress, import_quoter.default, provider);
     const addressList = await quoter.getAddressList();
     if (!addressList.length) {
       return [];
@@ -468,14 +480,54 @@ var Hermes = class {
       value: params.bridgeFee
     };
   }
+  resolveGasLimit(txReq, estimateGas) {
+    if (txReq.gasLimit != null) {
+      return txReq;
+    }
+    return {
+      ...txReq,
+      gasLimit: estimateGas * 130n / 100n
+      // 上浮30%
+    };
+  }
+  async resolveNonce(provider, from, tx) {
+    if (tx.nonce != null)
+      return tx;
+    const nonce = await provider.getTransactionCount(from, "latest");
+    return { ...tx, nonce };
+  }
+  async resolvePricing(provider, tx) {
+    if (tx.gasPrice != null || tx.maxFeePerGas != null || tx.maxPriorityFeePerGas != null) {
+      return this.sanitizePricing(tx);
+    }
+    const fd = await provider.getFeeData();
+    if (fd.maxFeePerGas != null && fd.maxPriorityFeePerGas != null) {
+      return {
+        ...tx,
+        maxFeePerGas: fd.maxFeePerGas * 150n / 100n,
+        // 上浮50%
+        maxPriorityFeePerGas: fd.maxPriorityFeePerGas
+      };
+    }
+    if (fd.gasPrice != null) {
+      return { ...tx, gasPrice: fd.gasPrice };
+    }
+    return tx;
+  }
+  sanitizePricing(tx) {
+    if (tx.maxFeePerGas != null || tx.maxPriorityFeePerGas != null) {
+      const { gasPrice, ...rest } = tx;
+      return rest;
+    }
+    return tx;
+  }
   async checkIsEnoughToken(fromTokenAddress, userAddress, amountInWei, aggregatorAddress, wallet) {
-    const erc20 = new import_ethers2.Contract(fromTokenAddress, ["function balanceOf(address) view returns (uint256)", "function allowance(address, address) view returns (uint256)"], wallet);
+    const erc20 = new import_ethers.Contract(fromTokenAddress, ["function balanceOf(address) view returns (uint256)", "function allowance(address, address) view returns (uint256)"], wallet);
     const userBalance = await erc20.balanceOf(userAddress);
     if (userBalance < amountInWei) {
       throw new Error("Insufficient balance token amount");
     }
     const currentAllowance = await erc20.allowance(userAddress, aggregatorAddress);
-    console.log(currentAllowance);
     if (currentAllowance < amountInWei) {
       throw new Error("Insufficient allowance token amount");
     }
@@ -510,5 +562,9 @@ var src_default = Hermes;
   ChainNameEnum,
   DexType,
   Hermes,
-  IEstimateType
+  IEstimateType,
+  LayerZeroV1ChainIdMap,
+  LayerZeroV1ChainNameMap,
+  LayerZeroV2ChainIdMap,
+  LayerZeroV2ChainNameMap
 });

package/dist/cjs/types.d.ts

@@ -109,7 +109,11 @@ export declare enum DexType {
     VSDCRVWITHDRAW = "vsdCRV_withdraw",
     VSDCRVDEPOSIT = "vsdCRV_deposit",
     ASDCRVWITHDRAW = "asdCRV_withdraw",
-    ASDCRVDEPOSIT = "asdCRV_deposit"
+    ASDCRVDEPOSIT = "asdCRV_deposit",
+    SHADOWV3 = "shadowv3",
+    FRAXSWAPV2 = "fraxswapv2",
+    AERODROMEV2 = "aerodromev2",
+    SHADOWV2 = "shadowv2"
 }
 export declare enum IEstimateType {
     BRIDGE = "bridge",
@@ -122,7 +126,13 @@ export declare enum BridgeType {
     LAYERZEROV1ADADEQEMPTY = "layerzero_v1_adapter_eq_empty",
     LAYERZEROV1PKG = "layerzero_v1_pkg",
     LAYERZEROV1PKGNOMIN = "layerzero_v1_pkg_no_min",
-    LAYERZEROV1OHM = "layerzero_v1_ohm"
+    LAYERZEROV1OHM = "layerzero_v1_ohm",
+    ARBETHBRIDGE = "arb_eth_bridge",
+    ETHARBBRIDGE = "eth_arb_bridge",
+    ORIGINALTOKENBRIDGE = "original_token_bridge",
+    WRAPPEDTOKENBRIDGE = "wrapped_token_bridge",
+    CCIPBRIDGE = "ccip_bridge",
+    WORMHOLEBRIDGE = "wormhole_bridge"
 }
 export declare enum ChainNameEnum {
     ETH = "ETH",// Ethereum Mainnet
@@ -288,23 +298,46 @@ export declare const AddressConst: {
         eth: string;
         arb: string;
         base: string;
+        etherlink: string;
+    };
+    wfrax: {
+        fraxtal: string;
+    };
+    frxusd: {
+        fraxtal: string;
     };
     seth: {
         eth: string;
     };
     wbtc: {
         eth: string;
+        etherlink: string;
+        arb: string;
+        base: string;
+    };
+    fluid: {
+        arb: string;
     };
     usdt: {
         eth: string;
+        base: string;
+    };
+    drv: {
+        eth: string;
     };
     feth: {
         eth: string;
         arb: string;
     };
+    msq: {
+        pol: string;
+    };
     sdcrv: {
         eth: string;
     };
+    tlos: {
+        eth: string;
+    };
     crv: {
         eth: string;
     };
@@ -318,20 +351,41 @@ export declare const AddressConst: {
     asdcrv: {
         eth: string;
     };
+    allo: {
+        base: string;
+    };
     emp: {
         base: string;
     };
+    order: {
+        base: string;
+    };
+    eul: {
+        sonic: string;
+    };
     arb: {
         arb: string;
     };
+    usde: {
+        eth: string;
+    };
     usdc: {
         arb: string;
         eth: string;
+        sonic: string;
+        etherlink: string;
+    };
+    link: {
+        eth: string;
     };
     ohm: {
         arb: string;
     };
 };
+export declare const LayerZeroV1ChainIdMap: Record<number, ChainNameEnum>;
+export declare const LayerZeroV1ChainNameMap: Record<ChainNameEnum, number>;
+export declare const LayerZeroV2ChainIdMap: Record<number, ChainNameEnum>;
+export declare const LayerZeroV2ChainNameMap: Record<ChainNameEnum, number>;
 export interface IExpectPayload {
 }
 export interface IRouterPath {