hermes-swap 0.1.9 → 0.2.0

package/dist/cjs/index.d.ts

@@ -1,19 +1,23 @@
-import type { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts } from './types.js';
+import type { IExpectParams, IBatchMultiSwapParams, IBatchExpectParams, ISwapParams, IBridgeParams, IBatchReceipt, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts } 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 type { IExpectParams, IBatchMultiSwapParams, IBatchExpectParams, IBatchReceipt, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts, };
 export { ChainNameEnum, AddressConst, DexType, BridgeType, IEstimateType, LayerZeroV1ChainIdMap, LayerZeroV1ChainNameMap, LayerZeroV2ChainIdMap, LayerZeroV2ChainNameMap };
 declare class Hermes {
     private config;
     private providerMap;
     private walletMap;
     private quoterAddressMap;
+    private flashbotSigner;
     private aggregatorAddressMap;
     private executor;
     constructor(config: IConfig);
     expectPriorityLocal(params: IExpectParams): Promise<bigint>;
     expect(params: IExpectParams): Promise<bigint>;
+    batchMultiExpect(params: IBatchExpectParams): Promise<bigint[]>;
     swap(params: ISwapParams, txReq?: TransactionRequest): Promise<IReceipt>;
+    batchMultiSwap(params: IBatchMultiSwapParams, txReq?: TransactionRequest): Promise<IBatchReceipt>;
+    swapByFlashbots(params: ISwapParams, txReq?: TransactionRequest, _targetBlockNumber?: number): Promise<IReceipt | null>;
     /**
      * 生成 swap 的 calldata
      */
@@ -41,8 +45,10 @@ declare class Hermes {
         value: bigint;
     };
     private resolveGasLimit;
+    private sendBundle;
     private resolveNonce;
     private resolvePricing;
+    private signRequestBody;
     private sanitizePricing;
     private checkIsEnoughToken;
     private validateParams;

package/dist/cjs/index.js

@@ -44,6 +44,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 var import_types = require("./types.js");
 var import_ethers = require("ethers");
+var import_axios = __toESM(require("axios"));
 var import_quoter = __toESM(require("./abis/quoter.js"));
 var import_aggregator = __toESM(require("./abis/aggregator.js"));
 var Hermes = class {
@@ -54,6 +55,7 @@ var Hermes = class {
     this.aggregatorAddressMap = /* @__PURE__ */ new Map();
     this.config = config;
     this.executor = config.executor;
+    this.flashbotSigner = new import_ethers.ethers.Wallet(config.flashbotSigner);
     if (!config.hermesSignalDomain || config.hermesSignalDomain === "") {
       this.config.hermesSignalDomain = "http://127.0.0.1:3002";
     } else {
@@ -113,6 +115,41 @@ var Hermes = class {
     }
     return amountOutList[amountOutList.length - 1];
   }
+  async batchMultiExpect(params) {
+    const provider = this.providerMap.get(params.chain);
+    if (!provider) {
+      throw new Error(`Chain: ${params.chain} provider is undefined`);
+    }
+    if (params.amountInWei.length !== params.path.length) {
+      throw new Error("amountInWei length must match path length");
+    }
+    const address = this.getQuoterAddress(params.chain);
+    if (!address) {
+      throw new Error(`Quoter address not found for chain: ${params.chain}`);
+    }
+    const quoter = new import_ethers.Contract(address, import_quoter.default, provider);
+    const quoteParamsArr = params.path.map(
+      (path) => path.map((p) => ({
+        dexType: p.dexType,
+        pool: p.poolAddress,
+        fromCoin: p.fromCoinAddress,
+        toCoin: p.toCoinAddress,
+        extra: p.extra || "0x"
+      }))
+    );
+    const amountOutListArr = await quoter.batchMultiQuote.staticCall(params.amountInWei, quoteParamsArr, {
+      from: this.config.executor
+    });
+    if (!amountOutListArr.length) {
+      throw new Error("No expect result return from smart contract");
+    }
+    return amountOutListArr.map((list) => {
+      if (!list.length) {
+        throw new Error("No expect result return from smart contract");
+      }
+      return list[list.length - 1];
+    });
+  }
   async swap(params, txReq = {}) {
     this.validateParams(params);
     if (!params.path.length) {
@@ -169,10 +206,178 @@ var Hermes = class {
       amountOut,
       hash: receipt.hash,
       from: receipt.from,
-      to: receipt.from,
-      logs: receipt.logs
+      to: receipt.from
     };
   }
+  async batchMultiSwap(params, txReq = {}) {
+    const provider = this.providerMap.get(params.chain);
+    const wallet = this.walletMap.get(params.chain);
+    if (!wallet || !provider) {
+      throw new Error(`sdk不支持的链： ${params.chain}`);
+    }
+    if (params.amountInWeis.length !== params.paths.length) {
+      throw new Error("传入参数数量不正确");
+    }
+    const aggregatorAddress = this.getAggregatorAddress(params.chain);
+    const aggregator = new import_ethers.Contract(aggregatorAddress, import_aggregator.default, wallet);
+    const swapParamsList = params.paths.map(
+      (path) => path.map((pathItem) => ({
+        dexType: pathItem.dexType,
+        pool: pathItem.poolAddress,
+        fromCoin: pathItem.fromCoinAddress,
+        toCoin: pathItem.toCoinAddress,
+        extra: pathItem.extra ?? "0x"
+      }))
+    );
+    let estimateGas;
+    const { gasLimit: _ignore, ...estimationOverrides } = txReq;
+    try {
+      estimateGas = await aggregator.batchMultiSwap.estimateGas(params.users, params.amountInWeis, swapParamsList, params.minAmountOutLists, estimationOverrides);
+    } catch (error) {
+      console.warn("Aggregator estimateGas.swap 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.batchMultiSwap(params.users, params.amountInWeis, swapParamsList, params.minAmountOutLists, estimationOverrides);
+    const receipt = await txResponse.wait();
+    const iface = new import_ethers.ethers.Interface(import_aggregator.default);
+    let userList = null;
+    let amountInList = null;
+    let amountOutList = null;
+    for (const log of receipt.logs) {
+      if (log.address.toLowerCase() === aggregatorAddress.toLowerCase()) {
+        try {
+          const parsed = iface.parseLog(log);
+          if (parsed && parsed.name === "MultiSwapped" && parsed.args) {
+            userList = parsed.args.userList;
+            amountInList = parsed.args.amountInList;
+            amountOutList = parsed.args.amountOutList;
+            break;
+          }
+        } catch {
+        }
+      }
+    }
+    if (!userList || !amountInList || !amountOutList) {
+      throw new Error(`MultiSwapped event not found: ${receipt.hash}`);
+    }
+    if (userList.length !== params.users.length || amountOutList.length !== params.users.length) {
+      throw new Error(`MultiSwapped event length mismatch: ${receipt.hash}`);
+    }
+    return {
+      hash: receipt.hash,
+      from: receipt.from,
+      to: receipt.to ?? null,
+      userResults: params.users.map((user, i) => {
+        var _a, _b;
+        const path = params.paths[i];
+        const fromTokenAddress = ((_a = path == null ? void 0 : path[0]) == null ? void 0 : _a.fromCoinAddress) ?? "";
+        const toTokenAddress = ((_b = path == null ? void 0 : path[path.length - 1]) == null ? void 0 : _b.toCoinAddress) ?? "";
+        return {
+          user,
+          amountIn: amountInList[i],
+          amountOut: amountOutList[i],
+          fromToken: fromTokenAddress,
+          toToken: toTokenAddress
+        };
+      })
+    };
+  }
+  async swapByFlashbots(params, txReq = {}, _targetBlockNumber) {
+    const provider = this.providerMap.get(params.chain);
+    const wallet = this.walletMap.get(params.chain);
+    if (!wallet || !provider) {
+      throw new Error(`sdk不支持的链： ${params.chain}`);
+    }
+    const aggregatorAddress = this.getAggregatorAddress(params.chain);
+    const aggregator = new import_ethers.Contract(aggregatorAddress, import_aggregator.default, wallet);
+    const swapParams = params.path.map((pathItem) => ({
+      dexType: pathItem.dexType,
+      pool: pathItem.poolAddress,
+      fromCoin: pathItem.fromCoinAddress,
+      toCoin: pathItem.toCoinAddress,
+      extra: pathItem.extra ?? "0x"
+    }));
+    let estimateGas;
+    const { gasLimit: _ignore, ...estimationOverrides } = txReq;
+    try {
+      estimateGas = await aggregator.swap.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, estimationOverrides);
+    } catch (error) {
+      console.warn("Aggregator estimateGas.swap 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);
+    this.validateParams(params);
+    const swapCallData = this.genSwapCalldata(params);
+    const baseTx = {
+      from: wallet.address,
+      to: swapCallData.to,
+      nonce: txReq.nonce,
+      value: import_ethers.ethers.parseEther("0"),
+      maxFeePerGas: txReq.maxFeePerGas,
+      maxPriorityFeePerGas: txReq.maxPriorityFeePerGas,
+      chainId: 1,
+      data: swapCallData.data,
+      gasLimit: txReq.gasLimit
+    };
+    const signTx = await wallet.signTransaction(baseTx);
+    const rawTxs = [signTx];
+    const txHashes = rawTxs.map((tx) => import_ethers.ethers.keccak256(tx));
+    txHashes.forEach((hash, i) => {
+      console.log(`Transaction ${i + 1}: ${hash}`);
+    });
+    let targetBlock;
+    if (_targetBlockNumber) {
+      targetBlock = _targetBlockNumber;
+    } else {
+      targetBlock = await provider.getBlockNumber() + 1;
+    }
+    const resultPromise = new Promise((resolve) => {
+      const onBlock = async (blockNumber) => {
+        if (blockNumber < targetBlock) {
+          return;
+        }
+        provider.off("block", onBlock);
+        const receipts = await Promise.all(txHashes.map((hash) => provider.getTransactionReceipt(hash)));
+        const receipt = receipts.find((r) => r && r.blockNumber === targetBlock) ?? null;
+        if (!receipt) {
+          resolve(null);
+          return;
+        }
+        const fromTokenAddress = params.path[0].fromCoinAddress;
+        const toTokenAddress = params.path[params.path.length - 1].toCoinAddress;
+        const iface = new import_ethers.ethers.Interface(import_aggregator.default);
+        let amountOut = null;
+        for (const log of receipt.logs) {
+          if (log.address.toLowerCase() === aggregatorAddress.toLowerCase()) {
+            try {
+              const parsed = iface.parseLog(log);
+              if (parsed && parsed.name === "Swapped" && parsed.args && parsed.args.amountOut !== void 0) {
+                amountOut = parsed.args.amountOut;
+                break;
+              }
+            } catch {
+            }
+          }
+        }
+        resolve({
+          fromToken: fromTokenAddress,
+          toToken: toTokenAddress,
+          amountOut,
+          hash: receipt.hash,
+          from: receipt.from,
+          to: receipt.to
+        });
+      };
+      provider.on("block", onBlock);
+    });
+    await this.sendBundle(rawTxs, targetBlock, this.flashbotSigner);
+    return resultPromise;
+  }
   /**
    * 生成 swap 的 calldata
    */
@@ -273,8 +478,7 @@ var Hermes = class {
       amountOut: params.amountInWei,
       hash: txReceipt.hash,
       from: txReceipt.from,
-      to: txReceipt.to,
-      logs: txReceipt.logs
+      to: txReceipt.to
     };
   }
   async estimateBridgeFee(params) {
@@ -357,8 +561,7 @@ var Hermes = class {
       amountOut: outputAmountWei,
       hash: txReceipt.hash,
       from: txReceipt.from,
-      to: txReceipt.to,
-      logs: txReceipt.logs
+      to: txReceipt.to
     };
   }
   async estimateGas(estimateType, params) {
@@ -524,6 +727,47 @@ var Hermes = class {
       // 上浮30%
     };
   }
+  async sendBundle(rawTxs, targetBlock, signer) {
+    console.log(`
+--- Sending Bundle for Block ${targetBlock} ---`);
+    const body = {
+      jsonrpc: "2.0",
+      id: 1,
+      method: "eth_sendBundle",
+      params: [
+        {
+          txs: rawTxs,
+          blockNumber: `0x${targetBlock.toString(16)}`
+        }
+      ]
+    };
+    const signature = await this.signRequestBody(body, signer);
+    const headers = {
+      "Content-Type": "application/json",
+      "X-Flashbots-Signature": signature
+    };
+    const BUILDERS = {
+      "beaverbuild.org": "https://rpc.beaverbuild.org",
+      Titan: "https://rpc.titanbuilder.xyz",
+      flashbots: "https://relay.flashbots.net",
+      // For simulation and sending
+      bloXroute: "rpc-builder.blxrbdn.com"
+    };
+    const builderEntries = Object.entries(BUILDERS);
+    let count = 0;
+    const promises = builderEntries.map(async ([name, url]) => {
+      try {
+        const response = await import_axios.default.post(url, body, { headers });
+        count++;
+        console.log(`[${count}/${builderEntries.length}] Sent to ${name}:`, response.data);
+      } catch (error) {
+        count++;
+        const msg = (error == null ? void 0 : error.response) ? error.response.data : (error == null ? void 0 : error.message) ?? error;
+        console.error(`[${count}/${builderEntries.length}] Error sending to ${name}:`, msg);
+      }
+    });
+    await Promise.all(promises);
+  }
   async resolveNonce(provider, from, tx) {
     if (tx.nonce != null)
       return tx;
@@ -548,6 +792,13 @@ var Hermes = class {
     }
     return tx;
   }
+  async signRequestBody(body, signer) {
+    const bodyJson = JSON.stringify(body);
+    const encoder = new TextEncoder();
+    const requestBodyHash = import_ethers.ethers.keccak256(encoder.encode(bodyJson));
+    const signature = await signer.signMessage(requestBodyHash);
+    return `${signer.address}:${signature}`;
+  }
   sanitizePricing(tx) {
     if (tx.maxFeePerGas != null || tx.maxPriorityFeePerGas != null) {
       const { gasPrice, ...rest } = tx;

package/dist/cjs/types.d.ts

@@ -5,12 +5,18 @@ export interface IConfig {
     quoterAddress: Record<string, string>;
     aggregatorAddress: Record<string, string>;
     hermesSignalDomain?: string;
+    flashbotSigner: string;
 }
 export interface IExpectParams {
     chain: ChainNameEnum;
     amountInWei: bigint;
     path: IRouterPath[];
 }
+export interface IBatchExpectParams {
+    chain: ChainNameEnum;
+    amountInWei: bigint[];
+    path: IRouterPath[][];
+}
 export interface ISwapParams {
     user: string;
     chain: ChainNameEnum;
@@ -18,6 +24,13 @@ export interface ISwapParams {
     path: IRouterPath[];
     minAmountOutList: bigint[];
 }
+export interface IBatchMultiSwapParams {
+    users: string[];
+    chain: ChainNameEnum;
+    amountInWeis: bigint[];
+    paths: IRouterPath[][];
+    minAmountOutLists: bigint[][];
+}
 export interface IBridgeParams {
     chain: ChainNameEnum;
     user: string;
@@ -51,7 +64,18 @@ export interface IReceipt {
     hash: string;
     from: string;
     to: string;
-    logs: ILog[];
+}
+export interface IBatchReceipt {
+    hash: string;
+    from: string;
+    to: string | null;
+    userResults: Array<{
+        user: string;
+        amountIn: bigint;
+        amountOut: bigint;
+        fromToken: string;
+        toToken: string;
+    }>;
 }
 export interface ICalldata {
     to: string;
@@ -103,6 +127,7 @@ export declare enum DexType {
     CURVE128 = "curve128",
     CURVE256 = "curve256",
     CAMELOTV2 = "camelotv2",
+    CAMELOTV3 = "camelotv3",
     PANCAKEV2 = "pancakev2",
     AERODROME = "aerodrome",
     PANCAKEV3 = "pancakev3",
@@ -405,6 +430,7 @@ export declare const AddressConst: {
     };
     xaut: {
         avax: string;
+        arb: string;
     };
     link: {
         eth: string;

package/dist/cjs/types.js

@@ -39,6 +39,7 @@ var DexType = /* @__PURE__ */ ((DexType2) => {
   DexType2["CURVE128"] = "curve128";
   DexType2["CURVE256"] = "curve256";
   DexType2["CAMELOTV2"] = "camelotv2";
+  DexType2["CAMELOTV3"] = "camelotv3";
   DexType2["PANCAKEV2"] = "pancakev2";
   DexType2["AERODROME"] = "aerodrome";
   DexType2["PANCAKEV3"] = "pancakev3";
@@ -340,7 +341,8 @@ var AddressConst = {
     avax: "0x6EDac263561DA41aDe155a992759260FAFb87B43"
   },
   xaut: {
-    avax: "0x2775d5105276781B4b85bA6eA6a6653bEeD1dd32"
+    avax: "0x2775d5105276781B4b85bA6eA6a6653bEeD1dd32",
+    arb: "0x40461291347e1eCbb09499F3371D3f17f10d7159"
   },
   link: {
     eth: "0x514910771AF9Ca656af840dff83E8264EcF986CA"

package/dist/esm/index.d.ts

@@ -1,19 +1,23 @@
-import type { IExpectParams, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts } from './types.js';
+import type { IExpectParams, IBatchMultiSwapParams, IBatchExpectParams, ISwapParams, IBridgeParams, IBatchReceipt, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts } 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 type { IExpectParams, IBatchMultiSwapParams, IBatchExpectParams, IBatchReceipt, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts, };
 export { ChainNameEnum, AddressConst, DexType, BridgeType, IEstimateType, LayerZeroV1ChainIdMap, LayerZeroV1ChainNameMap, LayerZeroV2ChainIdMap, LayerZeroV2ChainNameMap };
 declare class Hermes {
     private config;
     private providerMap;
     private walletMap;
     private quoterAddressMap;
+    private flashbotSigner;
     private aggregatorAddressMap;
     private executor;
     constructor(config: IConfig);
     expectPriorityLocal(params: IExpectParams): Promise<bigint>;
     expect(params: IExpectParams): Promise<bigint>;
+    batchMultiExpect(params: IBatchExpectParams): Promise<bigint[]>;
     swap(params: ISwapParams, txReq?: TransactionRequest): Promise<IReceipt>;
+    batchMultiSwap(params: IBatchMultiSwapParams, txReq?: TransactionRequest): Promise<IBatchReceipt>;
+    swapByFlashbots(params: ISwapParams, txReq?: TransactionRequest, _targetBlockNumber?: number): Promise<IReceipt | null>;
     /**
      * 生成 swap 的 calldata
      */
@@ -41,8 +45,10 @@ declare class Hermes {
         value: bigint;
     };
     private resolveGasLimit;
+    private sendBundle;
     private resolveNonce;
     private resolvePricing;
+    private signRequestBody;
     private sanitizePricing;
     private checkIsEnoughToken;
     private validateParams;