hermes-swap 0.0.22 → 0.0.24

package/dist/cjs/abis/quoter.d.ts

@@ -40,41 +40,22 @@ declare const QuoterAbi: ({
     inputs: {
         name: string;
         type: string;
-        internalType: string;
-        components: ({
-            name: string;
-            type: string;
-            internalType: string;
-            components?: undefined;
-        } | {
-            name: string;
-            type: string;
-            internalType: string;
-            components: {
-                name: string;
-                type: string;
-                internalType: string;
-            }[];
-        })[];
-    }[];
-    outputs: {
-        name: string;
-        type: string;
+        indexed: boolean;
         internalType: string;
     }[];
-    stateMutability: string;
-    anonymous?: undefined;
+    anonymous: boolean;
+    stateMutability?: undefined;
+    outputs?: undefined;
 } | {
     type: string;
     name: string;
     inputs: {
         name: string;
         type: string;
-        indexed: boolean;
         internalType: string;
     }[];
-    anonymous: boolean;
     stateMutability?: undefined;
     outputs?: undefined;
+    anonymous?: undefined;
 })[];
 export default QuoterAbi;

package/dist/cjs/abis/quoter.js

@@ -106,7 +106,7 @@ var QuoterAbi = [
         internalType: "uint256[][]"
       }
     ],
-    stateMutability: "view"
+    stateMutability: "nonpayable"
   },
   {
     type: "function",
@@ -194,7 +194,7 @@ var QuoterAbi = [
         internalType: "bool"
       }
     ],
-    stateMutability: "view"
+    stateMutability: "nonpayable"
   },
   {
     type: "function",
@@ -264,7 +264,7 @@ var QuoterAbi = [
         internalType: "uint256[]"
       }
     ],
-    stateMutability: "view"
+    stateMutability: "nonpayable"
   },
   {
     type: "function",
@@ -328,16 +328,16 @@ var QuoterAbi = [
         internalType: "uint256"
       }
     ],
-    stateMutability: "view"
+    stateMutability: "nonpayable"
   },
   {
     type: "function",
     name: "quoteBridge",
     inputs: [
       {
-        name: "bridgeParams",
+        name: "bridgeParam",
         type: "tuple",
-        internalType: "struct BridgeParams",
+        internalType: "struct BridgeParam",
         components: [
           {
             name: "bridge",
@@ -345,41 +345,34 @@ var QuoterAbi = [
             internalType: "string"
           },
           {
-            name: "bridgeParam",
-            type: "tuple",
-            internalType: "struct BridgeParam",
-            components: [
-              {
-                name: "token",
-                type: "address",
-                internalType: "address"
-              },
-              {
-                name: "amount",
-                type: "uint256",
-                internalType: "uint256"
-              },
-              {
-                name: "bridgeAddress",
-                type: "address",
-                internalType: "address"
-              },
-              {
-                name: "refundAddress",
-                type: "address",
-                internalType: "address"
-              },
-              {
-                name: "destinationChain",
-                type: "string",
-                internalType: "string"
-              },
-              {
-                name: "adapterParams",
-                type: "bytes",
-                internalType: "bytes"
-              }
-            ]
+            name: "token",
+            type: "address",
+            internalType: "address"
+          },
+          {
+            name: "amount",
+            type: "uint256",
+            internalType: "uint256"
+          },
+          {
+            name: "bridgeAddress",
+            type: "address",
+            internalType: "address"
+          },
+          {
+            name: "destChain",
+            type: "string",
+            internalType: "string"
+          },
+          {
+            name: "destUser",
+            type: "address",
+            internalType: "address"
+          },
+          {
+            name: "extra",
+            type: "bytes",
+            internalType: "bytes"
           }
         ]
       }
@@ -391,7 +384,7 @@ var QuoterAbi = [
         internalType: "uint256"
       }
     ],
-    stateMutability: "view"
+    stateMutability: "nonpayable"
   },
   {
     type: "function",
@@ -519,6 +512,38 @@ var QuoterAbi = [
       }
     ],
     anonymous: false
+  },
+  {
+    type: "error",
+    name: "NotExecutor",
+    inputs: [
+      {
+        name: "caller",
+        type: "address",
+        internalType: "address"
+      },
+      {
+        name: "executor",
+        type: "address",
+        internalType: "address"
+      }
+    ]
+  },
+  {
+    type: "error",
+    name: "NotOwner",
+    inputs: [
+      {
+        name: "caller",
+        type: "address",
+        internalType: "address"
+      },
+      {
+        name: "owner",
+        type: "address",
+        internalType: "address"
+      }
+    ]
   }
 ];
 var quoter_default = QuoterAbi;

package/dist/cjs/index.d.ts

@@ -12,7 +12,9 @@ declare class Hermes {
     expect(params: IExpectParams): Promise<bigint>;
     swap(params: ISwapParams): Promise<IReceipt>;
     bridge(params: IBridgeParams): Promise<IReceipt>;
+    estimateBridgeFee(params: IBridgeParams): Promise<bigint>;
     swapAndBridge(params: ISwapAndBridgeParams): Promise<IReceipt>;
+    private checkIsEnoughToken;
     private validateParams;
     private getQuoterAddress;
     private getAggregatorAddress;

package/dist/cjs/index.js

@@ -79,8 +79,11 @@ var Hermes = class {
       toCoin: p.toCoinAddress,
       extra: p.extra || "0x"
     }));
-    const amountOutList = await quoter.multiQuote(params.amountInWei, quoteParams);
-    return amountOutList.length ? amountOutList[amountOutList.length - 1] : BigInt(0);
+    const amountOutList = await quoter.multiQuote.staticCall(params.amountInWei, quoteParams, { from: wallet.address });
+    if (!amountOutList.length) {
+      throw new Error("No expect result return from smart contract");
+    }
+    return amountOutList[amountOutList.length - 1];
   }
   async swap(params) {
     this.validateParams(params);
@@ -108,13 +111,11 @@ var Hermes = class {
       throw new Error("Insufficient balance for swap");
     }
     const currentAllowance = await erc20.allowance(params.user, aggregatorAddress);
-    console.log(currentAllowance);
     if (currentAllowance < params.amountInWei) {
       throw new Error("Insufficient allowance token amount for swap");
     }
     try {
       const gas = await aggregator.getFunction("swap").estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, { from: wallet.address });
-      console.log(`Estimated gas for swap: ${BigInt(gas).toString()}`);
     } catch (error) {
       console.warn("Aggregator estimateGas.swap failed", error);
       throw error;
@@ -127,7 +128,6 @@ var Hermes = class {
       throw error;
     }
     const receipt = await txResponse.wait();
-    console.log(`Swap transaction mined in block ${receipt.blockNumber} (tx: ${receipt.hash})`);
     const iface = new import_ethers.ethers.Interface(import_aggregator.default);
     let amountOut = params.amountInWei;
     for (const log of receipt.logs) {
@@ -154,30 +154,153 @@ var Hermes = class {
   }
   async bridge(params) {
     this.validateParams(params);
+    const aggregatorAddress = this.getAggregatorAddress(params.chain);
+    const wallet = this.walletMap.get(params.chain);
+    if (!wallet) {
+      throw new Error(`Wallet not configured for chain: ${params.chain}`);
+    }
+    if (params.tokenAddress && params.tokenAddress !== import_ethers.ethers.ZeroAddress) {
+      await this.checkIsEnoughToken(params.tokenAddress, params.user, params.amountInWei, aggregatorAddress, wallet);
+    }
+    if (params.bridgeFee > 0n) {
+      const provider = this.providerMap.get(params.chain);
+      if (!provider) {
+        throw new Error(`Provider not configured for chain: ${params.chain}`);
+      }
+      const nativeBalance = await provider.getBalance(params.user);
+      if (nativeBalance < params.bridgeFee) {
+        throw new Error("Insufficient native balance for bridge fee");
+      }
+    }
+    const aggregator = new import_ethers2.Contract(aggregatorAddress, import_aggregator.default, wallet);
+    const bridgeArgs = {
+      bridge: params.bridgeType,
+      token: params.tokenAddress,
+      amount: params.amountInWei,
+      bridgeAddress: params.bridgeAddress,
+      destChain: params.destChain,
+      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;
+    }
+    let txResponse;
+    try {
+      txResponse = await aggregator.bridge(params.user, bridgeArgs, txOverrides);
+    } catch (error) {
+      console.error("Aggregator swap transaction failed", error);
+      throw error;
+    }
     const receipt = {
       fromToken: params.tokenAddress,
       toToken: params.tokenAddress,
       amountOut: params.amountInWei,
-      hash: "",
-      from: "",
-      to: "",
-      logs: []
+      hash: txResponse.hash,
+      from: txResponse.from,
+      to: txResponse.to,
+      logs: txResponse.logs
     };
     return Promise.resolve(receipt);
   }
+  async estimateBridgeFee(params) {
+    this.validateParams(params);
+    const wallet = this.walletMap.get(params.chain);
+    if (!wallet) {
+      throw new Error(`Wallet not configured for chain: ${params.chain}`);
+    }
+    const address = this.getQuoterAddress(params.chain);
+    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 bridgeArgs = {
+      bridge: params.bridgeType,
+      token: params.tokenAddress,
+      amount: params.amountInWei,
+      bridgeAddress: params.bridgeAddress,
+      destChain: params.destChain,
+      destUser: params.destUser,
+      extra: params.extra ?? "0x"
+    };
+    const bridgeFee = await quoter.quoteBridge.staticCall(bridgeArgs, { from: wallet.address });
+    return bridgeFee;
+  }
   async swapAndBridge(params) {
     this.validateParams(params);
+    const aggregatorAddress = this.getAggregatorAddress(params.chain);
+    const wallet = this.walletMap.get(params.chain);
+    if (!wallet) {
+      throw new Error(`Wallet not configured for chain: ${params.chain}`);
+    }
+    const fromCoinAddress = params.path[0].fromCoinAddress;
+    if (fromCoinAddress && fromCoinAddress !== import_ethers.ethers.ZeroAddress) {
+      await this.checkIsEnoughToken(fromCoinAddress, params.user, params.amountInWei, aggregatorAddress, wallet);
+    }
+    const swapParams = params.path.map((pathItem) => ({
+      dexType: pathItem.dexType,
+      pool: pathItem.poolAddress,
+      fromCoin: pathItem.fromCoinAddress,
+      toCoin: pathItem.toCoinAddress,
+      extra: pathItem.extra ?? "0x"
+    }));
+    const bridgeArgs = {
+      bridge: params.bridgeType,
+      token: params.tokenAddress,
+      amount: params.amountInWei,
+      bridgeAddress: params.bridgeAddress,
+      destChain: params.destChain,
+      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;
+    }
+    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;
+    }
     const receipt = {
       fromToken: params.path[0].fromCoinAddress,
       toToken: params.path[params.path.length - 1].toCoinAddress,
       amountOut: params.minAmountOutList[params.minAmountOutList.length - 1],
-      hash: "",
-      from: "",
-      to: "",
-      logs: []
+      hash: txResponse.hash,
+      from: txResponse.from,
+      to: txResponse.to,
+      logs: txResponse.logs
     };
     return Promise.resolve(receipt);
   }
+  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 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");
+    }
+  }
   validateParams(params) {
     if (!params.chain) {
       throw new Error("Chain not found");

package/dist/cjs/types.d.ts

@@ -24,6 +24,8 @@ export interface IBridgeParams {
     bridgeAddress: string;
     tokenAddress: string;
     destChain: string;
+    destUser: string;
+    bridgeFee: bigint;
     extra?: BytesLike;
 }
 export interface ISwapAndBridgeParams {
@@ -36,6 +38,8 @@ export interface ISwapAndBridgeParams {
     bridgeAddress: string;
     tokenAddress: string;
     destChain: string;
+    destUser: string;
+    bridgeFee: bigint;
     extra?: BytesLike;
 }
 export interface IReceipt {
@@ -81,7 +85,14 @@ export interface ILog {
     args: any[];
 }
 export declare enum DexType {
-    FX = "f(x)"
+    FX = "f(x)",
+    UNISWAPV2 = "uniswapv2",
+    CURVE128 = "curve128",
+    CURVE256 = "curve256"
+}
+export declare enum BridgeType {
+    LAYERZEROV1 = "layerzero_v1",
+    LAYERZEROV2 = "layerzero_v2"
 }
 export declare enum ChainNameEnum {
     ETH = "ETH",// Ethereum Mainnet
@@ -245,15 +256,24 @@ export interface IRpcConfig {
 export declare const AddressConst: {
     weth: {
         eth: string;
+        arb: string;
     };
     usdt: {
         eth: string;
     };
     feth: {
         eth: string;
+        arb: string;
     };
     xeth: {
         eth: string;
+        arb: string;
+    };
+    arb: {
+        arb: string;
+    };
+    usdc: {
+        arb: string;
     };
 };
 export interface IExpectPayload {

package/dist/cjs/types.js

@@ -20,14 +20,23 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var types_exports = {};
 __export(types_exports, {
   AddressConst: () => AddressConst,
+  BridgeType: () => BridgeType,
   ChainNameEnum: () => ChainNameEnum,
   DexType: () => DexType
 });
 module.exports = __toCommonJS(types_exports);
 var DexType = /* @__PURE__ */ ((DexType2) => {
   DexType2["FX"] = "f(x)";
+  DexType2["UNISWAPV2"] = "uniswapv2";
+  DexType2["CURVE128"] = "curve128";
+  DexType2["CURVE256"] = "curve256";
   return DexType2;
 })(DexType || {});
+var BridgeType = /* @__PURE__ */ ((BridgeType2) => {
+  BridgeType2["LAYERZEROV1"] = "layerzero_v1";
+  BridgeType2["LAYERZEROV2"] = "layerzero_v2";
+  return BridgeType2;
+})(BridgeType || {});
 var ChainNameEnum = /* @__PURE__ */ ((ChainNameEnum2) => {
   ChainNameEnum2["ETH"] = "ETH";
   ChainNameEnum2["ARB"] = "ARB";
@@ -186,22 +195,32 @@ var ChainNameEnum = /* @__PURE__ */ ((ChainNameEnum2) => {
 })(ChainNameEnum || {});
 var AddressConst = {
   weth: {
-    eth: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"
+    eth: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+    arb: "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1"
   },
   usdt: {
     eth: ""
   },
   // fx
   feth: {
-    eth: "0x53805A76E1f5ebbFE7115F16f9c87C2f7e633726"
+    eth: "0x53805A76E1f5ebbFE7115F16f9c87C2f7e633726",
+    arb: "0xc608Dfb90A430Df79a8a1eDBC8be7f1A0Eb4E763"
   },
   xeth: {
-    eth: "0xe063F04f280c60aECa68b38341C2eEcBeC703ae2"
+    eth: "0xe063F04f280c60aECa68b38341C2eEcBeC703ae2",
+    arb: "0x55380fe7A1910dFf29A47B622057ab4139DA42C5"
+  },
+  arb: {
+    arb: "0x912CE59144191C1204E64559FE8253a0e49E6548"
+  },
+  usdc: {
+    arb: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
   }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AddressConst,
+  BridgeType,
   ChainNameEnum,
   DexType
 });