hermes-swap 0.3.16 → 0.4.0

package/dist/cjs/abis/aggregator.cjs

@@ -32,7 +32,7 @@ var AggregatorAbi = [
         internalType: "address"
       },
       {
-        name: "_executor",
+        name: "_executorContract",
         type: "address",
         internalType: "address"
       },
@@ -323,13 +323,13 @@ var AggregatorAbi = [
   },
   {
     type: "function",
-    name: "executor",
+    name: "executorContract",
     inputs: [],
     outputs: [
       {
         name: "",
         type: "address",
-        internalType: "address"
+        internalType: "contract IAddressWhiteList"
       }
     ],
     stateMutability: "view"
@@ -392,6 +392,72 @@ var AggregatorAbi = [
     ],
     stateMutability: "view"
   },
+  {
+    type: "function",
+    name: "multiSwap",
+    inputs: [
+      {
+        name: "user",
+        type: "address",
+        internalType: "address"
+      },
+      {
+        name: "amountInList",
+        type: "uint256[]",
+        internalType: "uint256[]"
+      },
+      {
+        name: "swapParamsList",
+        type: "tuple[][]",
+        internalType: "struct SwapParams[][]",
+        components: [
+          {
+            name: "dexType",
+            type: "string",
+            internalType: "string"
+          },
+          {
+            name: "pool",
+            type: "address",
+            internalType: "address"
+          },
+          {
+            name: "fromCoin",
+            type: "address",
+            internalType: "address"
+          },
+          {
+            name: "toCoin",
+            type: "address",
+            internalType: "address"
+          },
+          {
+            name: "extra",
+            type: "bytes",
+            internalType: "bytes"
+          }
+        ]
+      },
+      {
+        name: "minAmountOutList",
+        type: "uint256[][]",
+        internalType: "uint256[][]"
+      },
+      {
+        name: "totalMinAmountOut",
+        type: "uint256",
+        internalType: "uint256"
+      }
+    ],
+    outputs: [
+      {
+        name: "transferOutList",
+        type: "uint256[]",
+        internalType: "uint256[]"
+      }
+    ],
+    stateMutability: "nonpayable"
+  },
   {
     type: "function",
     name: "multiSwapAndBridge",
@@ -484,6 +550,11 @@ var AggregatorAbi = [
             internalType: "bytes"
           }
         ]
+      },
+      {
+        name: "totalMinAmountOut",
+        type: "uint256",
+        internalType: "uint256"
       }
     ],
     outputs: [
@@ -591,19 +662,6 @@ var AggregatorAbi = [
     outputs: [],
     stateMutability: "nonpayable"
   },
-  {
-    type: "function",
-    name: "setExecutor",
-    inputs: [
-      {
-        name: "_executor",
-        type: "address",
-        internalType: "address"
-      }
-    ],
-    outputs: [],
-    stateMutability: "nonpayable"
-  },
   {
     type: "function",
     name: "setQuoter",
@@ -901,6 +959,31 @@ var AggregatorAbi = [
     ],
     anonymous: false
   },
+  {
+    type: "event",
+    name: "BatchMultiSwapped",
+    inputs: [
+      {
+        name: "userList",
+        type: "address[]",
+        indexed: false,
+        internalType: "address[]"
+      },
+      {
+        name: "amountInList",
+        type: "uint256[]",
+        indexed: false,
+        internalType: "uint256[]"
+      },
+      {
+        name: "amountOutList",
+        type: "uint256[]",
+        indexed: false,
+        internalType: "uint256[]"
+      }
+    ],
+    anonymous: false
+  },
   {
     type: "event",
     name: "Bridge",
@@ -1052,10 +1135,10 @@ var AggregatorAbi = [
     name: "MultiSwapped",
     inputs: [
       {
-        name: "userList",
-        type: "address[]",
+        name: "user",
+        type: "address",
         indexed: false,
-        internalType: "address[]"
+        internalType: "address"
       },
       {
         name: "amountInList",

package/dist/cjs/index.cjs

@@ -304,7 +304,7 @@ var Hermes = class {
     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.multiSwapAndBridge(params.user, params.amountInWeis, swapParamsList, params.minAmountOutLists, bridgeArgs, txReq);
+    let txResponse = await aggregator.multiSwapAndBridge(params.user, params.amountInWeis, swapParamsList, params.minAmountOutLists, bridgeArgs, params.totalMinAmountOut, txReq);
     const receipt = await txResponse.wait();
     const iface = new import_ethers.ethers.Interface(import_aggregator.default);
     let receiptUser = null;
@@ -348,6 +348,32 @@ var Hermes = class {
       receipt
     };
   }
+  async simulateBatchMultiSwap(params, txReq = {}, simulateBlock, executor, aggregatorAddress) {
+    const provider = this.providerMap.get(params.chain);
+    const caller = new import_ethers.ethers.VoidSigner(executor, provider);
+    if (params.amountInWeis.length !== params.paths.length) {
+      throw new Error("传入参数数量不正确");
+    }
+    const aggregator = new import_ethers.Contract(aggregatorAddress, import_aggregator.default, caller);
+    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 {
+      const result = await aggregator.batchMultiSwap.staticCall(params.users, params.amountInWeis, swapParamsList, params.minAmountOutLists, { ...estimationOverrides, blockTag: simulateBlock });
+      return result;
+    } catch (error) {
+      console.warn("Aggregator estimateGas.swap failed", error);
+      throw error;
+    }
+  }
   async batchMultiSwap(params, txReq = {}) {
     const provider = this.providerMap.get(params.chain);
     const wallet = this.walletMap.get(params.chain);
@@ -389,7 +415,7 @@ var Hermes = class {
       if (log.address.toLowerCase() === aggregatorAddress.toLowerCase()) {
         try {
           const parsed = iface.parseLog(log);
-          if (parsed && parsed.name === "MultiSwapped" && parsed.args) {
+          if (parsed && parsed.name === "BatchMultiSwapped" && parsed.args) {
             userList = parsed.args.userList;
             amountInList = parsed.args.amountInList;
             amountOutList = parsed.args.amountOutList;
@@ -425,6 +451,102 @@ var Hermes = class {
       receipt
     };
   }
+  // 单用户的拆单交易
+  async multiSwap(params, txReq = {}) {
+    var _a;
+    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("传入参数数量不正确");
+    }
+    if (!params.paths.length || !((_a = params.paths[0]) == null ? void 0 : _a.length)) {
+      throw new Error("paths不能为空");
+    }
+    const expectedFromToken = params.paths[0][0].fromCoinAddress.toLowerCase();
+    const expectedToToken = params.paths[0][params.paths[0].length - 1].toCoinAddress.toLowerCase();
+    for (let i = 0; i < params.paths.length; i++) {
+      const path = params.paths[i];
+      if (!(path == null ? void 0 : path.length)) {
+        throw new Error(`paths[${i}]不能为空`);
+      }
+      const fromToken = path[0].fromCoinAddress.toLowerCase();
+      const lastStep = path[path.length - 1];
+      const toToken = lastStep.toCoinAddress.toLowerCase();
+      if (fromToken !== expectedFromToken) {
+        throw new Error(`所有paths的起始代币必须一致，paths[${i}]不匹配`);
+      }
+      if (toToken !== expectedToToken) {
+        throw new Error(`所有paths的最终代币必须一致，paths[${i}]不匹配`);
+      }
+    }
+    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.multiSwap.estimateGas(params.user, params.amountInWeis, swapParamsList, params.minAmountOutLists, params.totalMinAmountOut, 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.multiSwap(params.user, params.amountInWeis, swapParamsList, params.minAmountOutLists, params.totalMinAmountOut, estimationOverrides);
+    const receipt = await txResponse.wait();
+    const iface = new import_ethers.ethers.Interface(import_aggregator.default);
+    let user = 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) {
+            user = parsed.args.user;
+            amountInList = parsed.args.amountInList;
+            amountOutList = parsed.args.amountOutList;
+            break;
+          }
+        } catch {
+        }
+      }
+    }
+    if (!user || !amountInList || !amountOutList) {
+      throw new Error(`MultiSwapped event not found: ${receipt.hash}`);
+    }
+    return {
+      hash: receipt.hash,
+      from: receipt.from,
+      to: receipt.to ?? null,
+      userResults: params.amountInWeis.map((amountIn, i) => {
+        var _a2, _b;
+        const path = params.paths[i];
+        const fromTokenAddress = ((_a2 = path == null ? void 0 : path[0]) == null ? void 0 : _a2.fromCoinAddress) ?? "";
+        const toTokenAddress = ((_b = path == null ? void 0 : path[path.length - 1]) == null ? void 0 : _b.toCoinAddress) ?? "";
+        return {
+          user: params.user,
+          amountIn,
+          amountOut: amountOutList[i],
+          fromToken: fromTokenAddress,
+          toToken: toTokenAddress
+        };
+      }),
+      receipt
+    };
+  }
   async swapByFlashbots(params, txReq = {}, _targetBlockNumber) {
     if (!this.flashbotSigner) {
       throw new Error("flashbot signer未初始化");

package/dist/cjs/index.d.ts

@@ -1,7 +1,7 @@
-import type { IExpectParams, IBatchMultiSwapParams, IBatchExpectParams, ISwapParams, IExpectSplitOrderParams, IExpectSplitOrderResp, IBridgeParams, IBatchReceipt, IBatchMultiSwapAndBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts } from './types.js';
+import type { IExpectParams, IBatchMultiSwapParams, IBatchExpectParams, ISwapParams, IExpectSplitOrderParams, IExpectSplitOrderResp, IBridgeParams, IBatchReceipt, IMultiSwapParams, IBatchMultiSwapAndBridgeParams, 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 { IBatchMultiSwapAndBridgeParams, IExpectSplitOrderParams, IExpectSplitOrderResp, IExpectParams, IBatchMultiSwapParams, IBatchExpectParams, IBatchReceipt, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts, };
+import { ethers, TransactionRequest } from 'ethers';
+export type { IBatchMultiSwapAndBridgeParams, IExpectSplitOrderParams, IExpectSplitOrderResp, IExpectParams, IMultiSwapParams, 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;
@@ -22,7 +22,9 @@ declare class Hermes {
     batchMultiExpect(params: IBatchExpectParams): Promise<bigint[]>;
     swap(params: ISwapParams, txReq?: TransactionRequest): Promise<IReceipt>;
     batchMultiSwapAndBridge(params: IBatchMultiSwapAndBridgeParams, txReq?: TransactionRequest): Promise<IBatchReceipt>;
+    simulateBatchMultiSwap(params: IBatchMultiSwapParams, txReq: ethers.TransactionRequest | undefined, simulateBlock: number, executor: string, aggregatorAddress: string): Promise<bigint[]>;
     batchMultiSwap(params: IBatchMultiSwapParams, txReq?: TransactionRequest): Promise<IBatchReceipt>;
+    multiSwap(params: IMultiSwapParams, txReq?: TransactionRequest): Promise<IBatchReceipt>;
     swapByFlashbots(params: ISwapParams, txReq?: TransactionRequest, _targetBlockNumber?: number): Promise<IReceipt | null>;
     aggregatorSwap(chain: ChainNameEnum, fromTokenAddress: string, toTokenAddress: string, amountInWei: bigint, minAmountOutWei: bigint): Promise<IBatchReceipt>;
     /**

package/dist/cjs/types.cjs

@@ -249,7 +249,11 @@ var AddressConst = {
     op: "0x4200000000000000000000000000000000000006"
   },
   wfrax: {
-    fraxtal: "0xFc00000000000000000000000000000000000002"
+    fraxtal: "0xFc00000000000000000000000000000000000002",
+    eth: "0x04acaf8d2865c0714f79da09645c13fd2888977f"
+  },
+  sogni: {
+    base: "0xe014d2a4da6e450f21b5050120d291e63c8940fd"
   },
   gswift: {
     arb: "0x580E933D90091b9cE380740E3a4A39c67eB85B4c",
@@ -345,7 +349,8 @@ var AddressConst = {
     sonic: "0x29219dd400f2Bf60E5a23d13Be72B486D4038894",
     etherlink: "0x796Ea11Fa2dD751eD01b53C372fFDB4AAa8f00F9",
     fraxtal: "0xDcc0F2D8F90FDe85b10aC1c8Ab57dc0AE946A543",
-    avax: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E"
+    avax: "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
+    base: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913"
   },
   vertai: {
     avax: "0x6EDac263561DA41aDe155a992759260FAFb87B43"

package/dist/cjs/types.d.ts

@@ -42,12 +42,21 @@ export interface IBatchMultiSwapParams {
     paths: IRouterPath[][];
     minAmountOutLists: bigint[][];
 }
+export interface IMultiSwapParams {
+    user: string;
+    chain: ChainNameEnum;
+    amountInWeis: bigint[];
+    paths: IRouterPath[][];
+    minAmountOutLists: bigint[][];
+    totalMinAmountOut: bigint;
+}
 export interface IBatchMultiSwapAndBridgeParams {
     user: string;
     chain: ChainNameEnum;
     amountInWeis: bigint[];
     paths: IRouterPath[][];
     minAmountOutLists: bigint[][];
+    totalMinAmountOut: bigint;
     bridgeType: string;
     bridgeAddress: string;
     tokenAddress: string;
@@ -344,6 +353,10 @@ export declare const AddressConst: {
     };
     wfrax: {
         fraxtal: string;
+        eth: string;
+    };
+    sogni: {
+        base: string;
     };
     gswift: {
         arb: string;
@@ -440,6 +453,7 @@ export declare const AddressConst: {
         etherlink: string;
         fraxtal: string;
         avax: string;
+        base: string;
     };
     vertai: {
         avax: string;

package/dist/esm/abis/aggregator.mjs

@@ -5,7 +5,7 @@ var AggregatorAbi = [{
     type: 'address',
     internalType: 'address'
   }, {
-    name: '_executor',
+    name: '_executorContract',
     type: 'address',
     internalType: 'address'
   }, {
@@ -229,12 +229,12 @@ var AggregatorAbi = [{
   stateMutability: 'view'
 }, {
   type: 'function',
-  name: 'executor',
+  name: 'executorContract',
   inputs: [],
   outputs: [{
     name: '',
     type: 'address',
-    internalType: 'address'
+    internalType: 'contract IAddressWhiteList'
   }],
   stateMutability: 'view'
 }, {
@@ -281,6 +281,57 @@ var AggregatorAbi = [{
     internalType: 'bool'
   }],
   stateMutability: 'view'
+}, {
+  type: 'function',
+  name: 'multiSwap',
+  inputs: [{
+    name: 'user',
+    type: 'address',
+    internalType: 'address'
+  }, {
+    name: 'amountInList',
+    type: 'uint256[]',
+    internalType: 'uint256[]'
+  }, {
+    name: 'swapParamsList',
+    type: 'tuple[][]',
+    internalType: 'struct SwapParams[][]',
+    components: [{
+      name: 'dexType',
+      type: 'string',
+      internalType: 'string'
+    }, {
+      name: 'pool',
+      type: 'address',
+      internalType: 'address'
+    }, {
+      name: 'fromCoin',
+      type: 'address',
+      internalType: 'address'
+    }, {
+      name: 'toCoin',
+      type: 'address',
+      internalType: 'address'
+    }, {
+      name: 'extra',
+      type: 'bytes',
+      internalType: 'bytes'
+    }]
+  }, {
+    name: 'minAmountOutList',
+    type: 'uint256[][]',
+    internalType: 'uint256[][]'
+  }, {
+    name: 'totalMinAmountOut',
+    type: 'uint256',
+    internalType: 'uint256'
+  }],
+  outputs: [{
+    name: 'transferOutList',
+    type: 'uint256[]',
+    internalType: 'uint256[]'
+  }],
+  stateMutability: 'nonpayable'
 }, {
   type: 'function',
   name: 'multiSwapAndBridge',
@@ -354,6 +405,10 @@ var AggregatorAbi = [{
       type: 'bytes',
       internalType: 'bytes'
     }]
+  }, {
+    name: 'totalMinAmountOut',
+    type: 'uint256',
+    internalType: 'uint256'
   }],
   outputs: [{
     name: 'success',
@@ -435,16 +490,6 @@ var AggregatorAbi = [{
   }],
   outputs: [],
   stateMutability: 'nonpayable'
-}, {
-  type: 'function',
-  name: 'setExecutor',
-  inputs: [{
-    name: '_executor',
-    type: 'address',
-    internalType: 'address'
-  }],
-  outputs: [],
-  stateMutability: 'nonpayable'
 }, {
   type: 'function',
   name: 'setQuoter',
@@ -673,6 +718,26 @@ var AggregatorAbi = [{
     internalType: 'address[]'
   }],
   anonymous: false
+}, {
+  type: 'event',
+  name: 'BatchMultiSwapped',
+  inputs: [{
+    name: 'userList',
+    type: 'address[]',
+    indexed: false,
+    internalType: 'address[]'
+  }, {
+    name: 'amountInList',
+    type: 'uint256[]',
+    indexed: false,
+    internalType: 'uint256[]'
+  }, {
+    name: 'amountOutList',
+    type: 'uint256[]',
+    indexed: false,
+    internalType: 'uint256[]'
+  }],
+  anonymous: false
 }, {
   type: 'event',
   name: 'Bridge',
@@ -792,10 +857,10 @@ var AggregatorAbi = [{
   type: 'event',
   name: 'MultiSwapped',
   inputs: [{
-    name: 'userList',
-    type: 'address[]',
+    name: 'user',
+    type: 'address',
     indexed: false,
-    internalType: 'address[]'
+    internalType: 'address'
   }, {
     name: 'amountInList',
     type: 'uint256[]',

package/dist/esm/index.d.ts

@@ -1,7 +1,7 @@
-import type { IExpectParams, IBatchMultiSwapParams, IBatchExpectParams, ISwapParams, IExpectSplitOrderParams, IExpectSplitOrderResp, IBridgeParams, IBatchReceipt, IBatchMultiSwapAndBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts } from './types.js';
+import type { IExpectParams, IBatchMultiSwapParams, IBatchExpectParams, ISwapParams, IExpectSplitOrderParams, IExpectSplitOrderResp, IBridgeParams, IBatchReceipt, IMultiSwapParams, IBatchMultiSwapAndBridgeParams, 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 { IBatchMultiSwapAndBridgeParams, IExpectSplitOrderParams, IExpectSplitOrderResp, IExpectParams, IBatchMultiSwapParams, IBatchExpectParams, IBatchReceipt, ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IExpectPayload, IRouterPath, SupportContracts, };
+import { ethers, TransactionRequest } from 'ethers';
+export type { IBatchMultiSwapAndBridgeParams, IExpectSplitOrderParams, IExpectSplitOrderResp, IExpectParams, IMultiSwapParams, 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;
@@ -22,7 +22,9 @@ declare class Hermes {
     batchMultiExpect(params: IBatchExpectParams): Promise<bigint[]>;
     swap(params: ISwapParams, txReq?: TransactionRequest): Promise<IReceipt>;
     batchMultiSwapAndBridge(params: IBatchMultiSwapAndBridgeParams, txReq?: TransactionRequest): Promise<IBatchReceipt>;
+    simulateBatchMultiSwap(params: IBatchMultiSwapParams, txReq: ethers.TransactionRequest | undefined, simulateBlock: number, executor: string, aggregatorAddress: string): Promise<bigint[]>;
     batchMultiSwap(params: IBatchMultiSwapParams, txReq?: TransactionRequest): Promise<IBatchReceipt>;
+    multiSwap(params: IMultiSwapParams, txReq?: TransactionRequest): Promise<IBatchReceipt>;
     swapByFlashbots(params: ISwapParams, txReq?: TransactionRequest, _targetBlockNumber?: number): Promise<IReceipt | null>;
     aggregatorSwap(chain: ChainNameEnum, fromTokenAddress: string, toTokenAddress: string, amountInWei: bigint, minAmountOutWei: bigint): Promise<IBatchReceipt>;
     /**