hermes-swap 0.0.21 → 0.0.23

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

@@ -55,7 +55,6 @@ var Hermes = class {
         this.walletMap.set(chainName, new import_ethers.ethers.Wallet(rpc.privateKey, provider));
       }
     }
-    console.log(Object.entries(this.config.rpc), this.walletMap);
     for (const [chainName, quoterAddress] of Object.entries(this.config.quoterAddress)) {
       this.quoterAddressMap.set(chainName, quoterAddress);
     }
@@ -146,19 +145,119 @@ var Hermes = class {
     return {
       fromToken: fromTokenAddress,
       toToken: toTokenAddress,
-      amountOut
+      amountOut,
+      hash: receipt.hash,
+      from: receipt.from,
+      to: receipt.from,
+      logs: receipt.logs
     };
   }
   async bridge(params) {
     this.validateParams(params);
-    const receipt = {};
+    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: 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 receipt = {};
+    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: []
+    };
     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

@@ -1,4 +1,4 @@
-import type { BytesLike } from 'ethers';
+import type { BytesLike, JsonRpcProvider } from 'ethers';
 export interface IConfig {
     rpc: Record<string, IRpcConfig>;
     quoterAddress: Record<string, string>;
@@ -24,6 +24,8 @@ export interface IBridgeParams {
     bridgeAddress: string;
     tokenAddress: string;
     destChain: string;
+    destUser: string;
+    bridgeFee: bigint;
     extra?: BytesLike;
 }
 export interface ISwapAndBridgeParams {
@@ -36,15 +38,57 @@ export interface ISwapAndBridgeParams {
     bridgeAddress: string;
     tokenAddress: string;
     destChain: string;
+    destUser: string;
+    bridgeFee: bigint;
     extra?: BytesLike;
 }
 export interface IReceipt {
-    fromToken?: string;
-    toToken?: string;
-    amountOut?: bigint;
+    fromToken: string;
+    toToken: string;
+    amountOut: bigint;
+    hash: string;
+    from: string;
+    to: string;
+    logs: ILog[];
+}
+export interface IEthersReceipt {
+    provider: JsonRpcProvider;
+    to: string;
+    from: string;
+    contractAddress: string | null;
+    hash: string;
+    index: number;
+    blockHash: string;
+    blockNumber: number;
+    logsBloom: string;
+    gasUsed: bigint;
+    blobGasUsed: null;
+    cumulativeGasUsed: bigint;
+    gasPrice: bigint;
+    blobGasPrice: null;
+    type: number;
+    status: number;
+    root: undefined;
+    logs: ILog[];
+}
+export interface ILog {
+    provider: JsonRpcProvider;
+    transactionHash: string;
+    blockHash: string;
+    blockNumber: number;
+    removed: undefined;
+    address: string;
+    data: string;
+    topics: string[];
+    index: number;
+    transactionIndex: number;
+    args: any[];
 }
 export declare enum DexType {
-    FX = "f(x)"
+    FX = "f(x)",
+    UNISWAPV2 = "uniswapv2",
+    CURVE128 = "curve128",
+    CURVE256 = "curve256"
 }
 export declare enum ChainNameEnum {
     ETH = "ETH",// Ethereum Mainnet
@@ -218,6 +262,12 @@ export declare const AddressConst: {
     xeth: {
         eth: string;
     };
+    arb: {
+        arb: string;
+    };
+    usdc: {
+        arb: string;
+    };
 };
 export interface IExpectPayload {
 }

package/dist/cjs/types.js

@@ -26,6 +26,9 @@ __export(types_exports, {
 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 ChainNameEnum = /* @__PURE__ */ ((ChainNameEnum2) => {
@@ -197,6 +200,12 @@ var AddressConst = {
   },
   xeth: {
     eth: "0xe063F04f280c60aECa68b38341C2eEcBeC703ae2"
+  },
+  arb: {
+    arb: "0x912CE59144191C1204E64559FE8253a0e49E6548"
+  },
+  usdc: {
+    arb: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831"
   }
 };
 // Annotate the CommonJS export names for ESM import in node: