hermes-swap 0.0.16 → 0.0.17

package/dist/cjs/index.d.ts

@@ -6,7 +6,6 @@ declare class Hermes {
     private walletMap;
     private quoterAddressMap;
     private aggregatorAddressMap;
-    private executorMap;
     constructor(config: IConfig);
     expect(params: IExpectParams): Promise<bigint>;
     swap(params: ISwapParams): Promise<IReceipt>;

package/dist/cjs/index.js

@@ -55,37 +55,32 @@ var Hermes = class {
     this.walletMap = /* @__PURE__ */ new Map();
     this.quoterAddressMap = /* @__PURE__ */ new Map();
     this.aggregatorAddressMap = /* @__PURE__ */ new Map();
-    this.executorMap = /* @__PURE__ */ new Map();
     this.config = config;
     for (const [chainName, rpc] of Object.entries(this.config.rpc)) {
       const provider = new import_ethers.ethers.JsonRpcProvider(rpc.url);
       this.providerMap.set(chainName, provider);
       if (rpc.privateKey) {
-        this.walletMap.set(chainName, new import_ethers.ethers.Wallet(rpc.privateKey));
+        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);
     }
     for (const [chainName, aggregatorAddress] of Object.entries(this.config.aggregatorAddress)) {
       this.aggregatorAddressMap.set(chainName, aggregatorAddress);
     }
-    for (const [chainName, executorPrivateKey] of Object.entries(this.config.executorMap)) {
-      const provider = this.providerMap.get(chainName);
-      const executor = new import_ethers.ethers.Wallet(executorPrivateKey, provider);
-      this.executorMap.set(chainName, executor);
-    }
   }
   async expect(params) {
-    const executorWallet = this.executorMap.get(params.chain);
-    if (!executorWallet) {
-      throw new Error(`Executor wallet not configured for chain: ${params.chain}`);
+    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, executorWallet);
+    const quoter = new import_ethers2.Contract(address, import_quoter.default, wallet);
     const quoteParams = params.path.map((p) => ({
       dexType: p.dexType,
       pool: p.poolAddress,
@@ -104,11 +99,11 @@ var Hermes = class {
     const fromTokenAddress = params.path[0].fromCoinAddress;
     const toTokenAddress = params.path[params.path.length - 1].toCoinAddress;
     const aggregatorAddress = this.getAggregatorAddress(params.chain);
-    const executorWallet = this.executorMap.get(params.chain);
-    if (!executorWallet) {
-      throw new Error(`Executor wallet not configured for chain: ${params.chain}`);
+    const wallet = this.walletMap.get(params.chain);
+    if (!wallet) {
+      throw new Error(`Wallet not configured for chain: ${params.chain}`);
     }
-    const aggregator = new import_ethers2.Contract(aggregatorAddress, import_aggregator.default, executorWallet);
+    const aggregator = new import_ethers2.Contract(aggregatorAddress, import_aggregator.default, wallet);
     const swapParams = params.path.map((pathItem) => ({
       dexType: pathItem.dexType,
       pool: pathItem.poolAddress,
@@ -116,7 +111,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)"], executorWallet);
+    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(params.user);
     if (userBalance < params.amountInWei) {
       throw new Error("Insufficient balance for swap");
@@ -127,7 +122,7 @@ var Hermes = class {
       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: executorWallet.address });
+      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);
@@ -135,7 +130,7 @@ var Hermes = class {
     }
     let txResponse;
     try {
-      txResponse = await aggregator.getFunction("swap")(params.user, params.amountInWei, swapParams, params.minAmountOutList, { from: executorWallet.address });
+      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;

package/dist/cjs/types.d.ts

@@ -3,7 +3,6 @@ export interface IConfig {
     rpc: Record<string, IRpcConfig>;
     quoterAddress: Record<string, string>;
     aggregatorAddress: Record<string, string>;
-    executorMap: Record<string, string>;
 }
 export interface IExpectParams {
     chain: ChainNameEnum;

package/dist/esm/index.d.ts

@@ -6,7 +6,6 @@ declare class Hermes {
     private walletMap;
     private quoterAddressMap;
     private aggregatorAddressMap;
-    private executorMap;
     constructor(config: IConfig);
     expect(params: IExpectParams): Promise<bigint>;
     swap(params: ISwapParams): Promise<IReceipt>;

package/dist/esm/index.js

@@ -31,7 +31,6 @@ var Hermes = /*#__PURE__*/function () {
     _defineProperty(this, "walletMap", new Map());
     _defineProperty(this, "quoterAddressMap", new Map());
     _defineProperty(this, "aggregatorAddressMap", new Map());
-    _defineProperty(this, "executorMap", new Map());
     this.config = config;
     for (var _i = 0, _Object$entries = Object.entries(this.config.rpc); _i < _Object$entries.length; _i++) {
       var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
@@ -40,9 +39,10 @@ var Hermes = /*#__PURE__*/function () {
       var provider = new ethers.JsonRpcProvider(rpc.url);
       this.providerMap.set(chainName, provider);
       if (rpc.privateKey) {
-        this.walletMap.set(chainName, new ethers.Wallet(rpc.privateKey));
+        this.walletMap.set(chainName, new ethers.Wallet(rpc.privateKey, provider));
       }
     }
+    console.log(Object.entries(this.config.rpc), this.walletMap);
     for (var _i2 = 0, _Object$entries2 = Object.entries(this.config.quoterAddress); _i2 < _Object$entries2.length; _i2++) {
       var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
         _chainName = _Object$entries2$_i[0],
@@ -55,32 +55,22 @@ var Hermes = /*#__PURE__*/function () {
         aggregatorAddress = _Object$entries3$_i[1];
       this.aggregatorAddressMap.set(_chainName2, aggregatorAddress);
     }
-
-    // load executor
-    for (var _i4 = 0, _Object$entries4 = Object.entries(this.config.executorMap); _i4 < _Object$entries4.length; _i4++) {
-      var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i4], 2),
-        _chainName3 = _Object$entries4$_i[0],
-        executorPrivateKey = _Object$entries4$_i[1];
-      var _provider = this.providerMap.get(_chainName3);
-      var executor = new ethers.Wallet(executorPrivateKey, _provider);
-      this.executorMap.set(_chainName3, executor);
-    }
   }
   _createClass(Hermes, [{
     key: "expect",
     value: function () {
       var _expect = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-        var executorWallet, address, quoter, quoteParams, amountOutList;
+        var wallet, address, quoter, quoteParams, amountOutList;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               // 调用合约
-              executorWallet = this.executorMap.get(params.chain);
-              if (executorWallet) {
+              wallet = this.walletMap.get(params.chain);
+              if (wallet) {
                 _context.next = 3;
                 break;
               }
-              throw new Error("Executor wallet not configured for chain: ".concat(params.chain));
+              throw new Error("Wallet not configured for chain: ".concat(params.chain));
             case 3:
               address = this.getQuoterAddress(params.chain);
               if (address) {
@@ -89,7 +79,7 @@ var Hermes = /*#__PURE__*/function () {
               }
               throw new Error("Quoter address not found for chain: ".concat(params.chain));
             case 6:
-              quoter = new Contract(address, QuoterAbi, executorWallet); // 转换字段名以匹配合约 ABI
+              quoter = new Contract(address, QuoterAbi, wallet); // 转换字段名以匹配合约 ABI
               quoteParams = params.path.map(function (p) {
                 return {
                   dexType: p.dexType,
@@ -119,7 +109,7 @@ var Hermes = /*#__PURE__*/function () {
     key: "swap",
     value: function () {
       var _swap = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-        var fromTokenAddress, toTokenAddress, aggregatorAddress, executorWallet, aggregator, swapParams, erc20, userBalance, currentAllowance, gas, txResponse, receipt, iface, amountOut, _iterator, _step, log, parsed;
+        var fromTokenAddress, toTokenAddress, aggregatorAddress, wallet, aggregator, swapParams, erc20, userBalance, currentAllowance, gas, txResponse, receipt, iface, amountOut, _iterator, _step, log, parsed;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -133,14 +123,14 @@ var Hermes = /*#__PURE__*/function () {
               fromTokenAddress = params.path[0].fromCoinAddress;
               toTokenAddress = params.path[params.path.length - 1].toCoinAddress;
               aggregatorAddress = this.getAggregatorAddress(params.chain);
-              executorWallet = this.executorMap.get(params.chain);
-              if (executorWallet) {
+              wallet = this.walletMap.get(params.chain);
+              if (wallet) {
                 _context2.next = 9;
                 break;
               }
-              throw new Error("Executor wallet not configured for chain: ".concat(params.chain));
+              throw new Error("Wallet not configured for chain: ".concat(params.chain));
             case 9:
-              aggregator = new Contract(aggregatorAddress, AggregatorAbi, executorWallet);
+              aggregator = new Contract(aggregatorAddress, AggregatorAbi, wallet);
               swapParams = params.path.map(function (pathItem) {
                 var _pathItem$extra;
                 return {
@@ -151,7 +141,7 @@ var Hermes = /*#__PURE__*/function () {
                   extra: (_pathItem$extra = pathItem.extra) !== null && _pathItem$extra !== void 0 ? _pathItem$extra : '0x'
                 };
               });
-              erc20 = new Contract(fromTokenAddress, ['function balanceOf(address) view returns (uint256)', 'function allowance(address, address) view returns (uint256)'], executorWallet);
+              erc20 = new Contract(fromTokenAddress, ['function balanceOf(address) view returns (uint256)', 'function allowance(address, address) view returns (uint256)'], wallet);
               _context2.next = 14;
               return erc20.balanceOf(params.user);
             case 14:
@@ -176,7 +166,7 @@ var Hermes = /*#__PURE__*/function () {
               _context2.prev = 23;
               _context2.next = 26;
               return aggregator.getFunction('swap').estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, {
-                from: executorWallet.address
+                from: wallet.address
               });
             case 26:
               gas = _context2.sent;
@@ -192,7 +182,7 @@ var Hermes = /*#__PURE__*/function () {
               _context2.prev = 34;
               _context2.next = 37;
               return aggregator.getFunction('swap')(params.user, params.amountInWei, swapParams, params.minAmountOutList, {
-                from: executorWallet.address
+                from: wallet.address
               });
             case 37:
               txResponse = _context2.sent;

package/dist/esm/types.d.ts

@@ -3,7 +3,6 @@ export interface IConfig {
     rpc: Record<string, IRpcConfig>;
     quoterAddress: Record<string, string>;
     aggregatorAddress: Record<string, string>;
-    executorMap: Record<string, string>;
 }
 export interface IExpectParams {
     chain: ChainNameEnum;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-swap",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "A TypeScript utility library for swap and bridge",
   "main": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",