hermes-swap 0.6.8 → 0.6.9

package/dist/cjs/aggregator.cjs

@@ -144,6 +144,23 @@ var _Aggregator = class {
       params: [{ txs: rawTxs, blockNumber: `0x${targetBlock.toString(16)}` }]
     };
   }
+  buildFlashbotsMevBundleRequestBody(rawTxs, startBlock, endBlock) {
+    return {
+      jsonrpc: "2.0",
+      id: 1,
+      method: "mev_sendBundle",
+      params: [
+        {
+          version: "v0.1",
+          inclusion: {
+            block: `0x${startBlock.toString(16)}`,
+            maxBlock: `0x${endBlock.toString(16)}`
+          },
+          body: rawTxs.map((tx) => ({ tx, canRevert: false }))
+        }
+      ]
+    };
+  }
   async sendBundle(chain, rawTxs, targetBlock, signer) {
     const builderCfg = this.getBuilderConfig(chain);
     const body = this.buildBundleRequestBody(builderCfg, rawTxs, targetBlock);
@@ -1098,11 +1115,7 @@ var _Aggregator = class {
       label: `Sequencer[${new URL(sequencerUrl).hostname}]`,
       send: async () => {
         var _a;
-        const resp = await import_axios.default.post(
-          sequencerUrl,
-          { jsonrpc: "2.0", id: 1, method: "eth_sendRawTransaction", params: [signedTx] },
-          { timeout: 5e3 }
-        );
+        const resp = await import_axios.default.post(sequencerUrl, { jsonrpc: "2.0", id: 1, method: "eth_sendRawTransaction", params: [signedTx] }, { timeout: 5e3 });
         if ((_a = resp.data) == null ? void 0 : _a.error) {
           throw new Error(resp.data.error.message ?? JSON.stringify(resp.data.error));
         }
@@ -1141,15 +1154,16 @@ var _Aggregator = class {
       const broadcastTs2 = Date.now();
       const providers = [{ provider: mainProvider2, label: "RPC[0/主]" }];
       const sequencerChannel2 = this.buildSequencerChannel(chain, signedTx2);
-      const channels2 = [
-        ...providers.map(({ provider, label }) => ({ label, send: () => provider.broadcastTransaction(signedTx2) })),
-        ...sequencerChannel2 ? [sequencerChannel2] : []
-      ];
+      const channels2 = [...providers.map(({ provider, label }) => ({ label, send: () => provider.broadcastTransaction(signedTx2) })), ...sequencerChannel2 ? [sequencerChannel2] : []];
       const receiptPromise2 = this.raceForReceipt(chain, txHash2, providers);
       await this.sendSignedTxToChannels(chain, signedTx2, txHash2, channels2);
       const receipt2 = await receiptPromise2;
       const blockTs2 = await this.getBlockTimestampStr(mainProvider2, receipt2.blockNumber);
-      _Aggregator.traceLog(chain, "log", `单RPC+排序器上链确认, txHash=${receipt2.hash}, blockNumber=${receipt2.blockNumber}, 出块时间=${blockTs2}, gasUsed=${receipt2.gasUsed}, status=${receipt2.status}, 总耗时=${Date.now() - broadcastTs2}ms`);
+      _Aggregator.traceLog(
+        chain,
+        "log",
+        `单RPC+排序器上链确认, txHash=${receipt2.hash}, blockNumber=${receipt2.blockNumber}, 出块时间=${blockTs2}, gasUsed=${receipt2.gasUsed}, status=${receipt2.status}, 总耗时=${Date.now() - broadcastTs2}ms`
+      );
       if (receipt2.status === 0) {
         throw new import_types.TransactionRevertedError(receipt2.hash, receipt2.gasUsed);
       }
@@ -1177,10 +1191,7 @@ var _Aggregator = class {
     );
     const broadcastTs = Date.now();
     const sequencerChannel = this.buildSequencerChannel(chain, signedTx);
-    const channels = [
-      ...allProviders.map(({ provider, label }) => ({ label, send: () => provider.broadcastTransaction(signedTx) })),
-      ...sequencerChannel ? [sequencerChannel] : []
-    ];
+    const channels = [...allProviders.map(({ provider, label }) => ({ label, send: () => provider.broadcastTransaction(signedTx) })), ...sequencerChannel ? [sequencerChannel] : []];
     const receiptPromise = this.raceForReceipt(chain, txHash, allProviders, ownedProviders);
     await this.sendSignedTxToChannels(chain, signedTx, txHash, channels);
     const receipt = await receiptPromise;
@@ -1234,18 +1245,38 @@ var _Aggregator = class {
       "log",
       `渠道=Builder Bundle, authType=${builderCfg.authType}, method=${builderCfg.method ?? "eth_sendBundle"}, nonce=${txReq.nonce}, gasLimit=${txReq.gasLimit}, chainId=${network.chainId}, 当前区块=${currentBlock}, 目标区块=[${targetBlocks.join(",")}], builders=[${builderNames.join(",")}](${builderNames.length}个), txHash=${txHash}`
     );
-    const signer = builderCfg.authType === "flashbots" ? this.flashbotSigner : void 0;
-    const headers = { "Content-Type": "application/json" };
-    if (builderCfg.authType === "flashbots" && signer) {
-      const sampleBody = this.buildBundleRequestBody(builderCfg, rawTxs, targetBlocks[0]);
-      headers["X-Flashbots-Signature"] = await this.signRequestBody(sampleBody, signer);
-    }
     const sendBundleTs = Date.now();
     let totalSent = 0;
     let totalFailed = 0;
-    const fireAndForget = targetBlocks.flatMap((block) => {
-      const body = this.buildBundleRequestBody(builderCfg, rawTxs, block);
-      return builderEntries.map(async ([name, url]) => {
+    const signer = builderCfg.authType === "flashbots" ? this.flashbotSigner : void 0;
+    const fireAndForget = builderEntries.flatMap(([name, url]) => {
+      if (name === "flashbots" && builderCfg.authType === "flashbots" && signer) {
+        return [
+          (async () => {
+            const body = this.buildFlashbotsMevBundleRequestBody(rawTxs, targetBlocks[0], targetBlocks[targetBlocks.length - 1]);
+            const headers = {
+              "Content-Type": "application/json",
+              "X-Flashbots-Signature": await this.signRequestBody(body, signer)
+            };
+            const ts = Date.now();
+            try {
+              const response = await import_axios.default.post(url, body, { headers, timeout: 3e3 });
+              totalSent++;
+              _Aggregator.traceLog(chain, "log", `Builder[${name}] mev_sendBundle 发送成功, targetBlocks=[${targetBlocks.join(",")}], 耗时=${Date.now() - ts}ms, resp=${JSON.stringify(response.data)}`);
+            } catch (error) {
+              totalFailed++;
+              const msg = (error == null ? void 0 : error.response) ? JSON.stringify(error.response.data) : (error == null ? void 0 : error.message) ?? String(error);
+              _Aggregator.traceLog(chain, "error", `Builder[${name}] mev_sendBundle 发送失败, targetBlocks=[${targetBlocks.join(",")}], 耗时=${Date.now() - ts}ms, error=${msg}`);
+            }
+          })()
+        ];
+      }
+      return targetBlocks.map(async (block) => {
+        const body = this.buildBundleRequestBody(builderCfg, rawTxs, block);
+        const headers = { "Content-Type": "application/json" };
+        if (builderCfg.authType === "flashbots" && signer) {
+          headers["X-Flashbots-Signature"] = await this.signRequestBody(body, signer);
+        }
         const ts = Date.now();
         try {
           const response = await import_axios.default.post(url, body, { headers, timeout: 3e3 });
@@ -1415,20 +1446,17 @@ Aggregator.DEFAULT_ETH_BUILDERS = {
   Titan: "https://rpc.titanbuilder.xyz",
   flashbots: "https://relay.flashbots.net",
   // bloXroute: 'https://mev.api.blxrbdn.com', // 旧 api.blxrbdn.com 也行，需配置 Authorization 头
-  lightspeedbuilder: "https://rpc.lightspeedbuilder.info",
+  lightspeedbuilder: "https://rpc.lightspeedbuilder.info"
   // 新增，实测直接可用
   // buildernet: 'https://rpc.buildernet.org', // 新增，Flashbots 生态，需签名头（同 flashbots 格式）
-  nfactorial: "https://rpc.nfactorial.xyz"
-  // 新增，支持 bundle rebate
+  // nfactorial: 'https://rpc.nfactorial.xyz', // 新增，支持 bundle rebate
 };
 Aggregator.DEFAULT_SEQUENCER_RPC_BY_CHAIN = {
   [import_types.ChainNameEnum.ARB]: "https://arb1-sequencer.arbitrum.io/rpc",
   [import_types.ChainNameEnum.BASE]: "https://mainnet-sequencer.base.org",
   [import_types.ChainNameEnum.ETHERLINK]: "https://relay.mainnet.etherlink.com"
 };
-Aggregator.SEQUENCER_CHAINS = new Set(
-  Object.keys(_Aggregator.DEFAULT_SEQUENCER_RPC_BY_CHAIN)
-);
+Aggregator.SEQUENCER_CHAINS = new Set(Object.keys(_Aggregator.DEFAULT_SEQUENCER_RPC_BY_CHAIN));
 Aggregator.TX_CONFIRM_TIMEOUT_MS = 12e4;
 Aggregator.BUNDLE_INCLUSION_TIMEOUT_MS = 3e4;
 var aggregator_default = Aggregator;

package/dist/cjs/aggregator.d.ts

@@ -26,6 +26,7 @@ declare class Aggregator {
     private getBuilderConfig;
     private getSequencerRpcs;
     private buildBundleRequestBody;
+    private buildFlashbotsMevBundleRequestBody;
     sendBundle(chain: ChainNameEnum, rawTxs: string[], targetBlock: number, signer?: ethers.Wallet): Promise<{
         sent: number;
         failed: number;

package/dist/esm/aggregator.d.ts

@@ -26,6 +26,7 @@ declare class Aggregator {
     private getBuilderConfig;
     private getSequencerRpcs;
     private buildBundleRequestBody;
+    private buildFlashbotsMevBundleRequestBody;
     sendBundle(chain: ChainNameEnum, rawTxs: string[], targetBlock: number, signer?: ethers.Wallet): Promise<{
         sent: number;
         failed: number;

package/dist/esm/aggregator.mjs

@@ -236,6 +236,28 @@ var Aggregator = /*#__PURE__*/function () {
         }]
       };
     }
+  }, {
+    key: "buildFlashbotsMevBundleRequestBody",
+    value: function buildFlashbotsMevBundleRequestBody(rawTxs, startBlock, endBlock) {
+      return {
+        jsonrpc: '2.0',
+        id: 1,
+        method: 'mev_sendBundle',
+        params: [{
+          version: 'v0.1',
+          inclusion: {
+            block: "0x".concat(startBlock.toString(16)),
+            maxBlock: "0x".concat(endBlock.toString(16))
+          },
+          body: rawTxs.map(function (tx) {
+            return {
+              tx: tx,
+              canRevert: false
+            };
+          })
+        }]
+      };
+    }
   }, {
     key: "sendBundle",
     value: function () {
@@ -2520,28 +2542,28 @@ var Aggregator = /*#__PURE__*/function () {
   }, {
     key: "submitBundleTx",
     value: function () {
-      var _submitBundleTx = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(chain, wallet, txReq, to, data, value, bundleBlockCount) {
+      var _submitBundleTx = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(chain, wallet, txReq, to, data, value, bundleBlockCount) {
         var _builderCfg$method2,
           _this2 = this;
-        var builderCfg, provider, network, baseTx, _yield$Promise$all, _yield$Promise$all2, signTx, currentBlock, rawTxs, txHash, normalizedBundleBlockCount, targetBlocks, builderNames, builderEntries, signer, headers, sampleBody, sendBundleTs, totalSent, totalFailed, fireAndForget, abortController, inclusionPromise, waitTs, _yield$Promise$all3, _yield$Promise$all4, receipt, blockTs;
-        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
-          while (1) switch (_context25.prev = _context25.next) {
+        var builderCfg, provider, network, baseTx, _yield$Promise$all, _yield$Promise$all2, signTx, currentBlock, rawTxs, txHash, normalizedBundleBlockCount, targetBlocks, builderNames, builderEntries, sendBundleTs, totalSent, totalFailed, signer, fireAndForget, abortController, inclusionPromise, waitTs, _yield$Promise$all3, _yield$Promise$all4, receipt, blockTs;
+        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
+          while (1) switch (_context26.prev = _context26.next) {
             case 0:
               if (bundleBlockCount == null) {
                 bundleBlockCount = this.builderConfigMap.has(chain) ? 3 : 1;
               }
               builderCfg = this.getBuilderConfig(chain);
               if (!(builderCfg.authType === 'flashbots' && !this.flashbotSigner)) {
-                _context25.next = 4;
+                _context26.next = 4;
                 break;
               }
               throw new Error('flashbot signer未初始化');
             case 4:
               provider = this.providerClient.getProvider(chain);
-              _context25.next = 7;
+              _context26.next = 7;
               return provider.getNetwork();
             case 7:
-              network = _context25.sent;
+              network = _context26.sent;
               baseTx = {
                 from: wallet.address,
                 to: to,
@@ -2559,10 +2581,10 @@ var Aggregator = /*#__PURE__*/function () {
                 baseTx.gasPrice = txReq.gasPrice;
                 baseTx.type = 0;
               }
-              _context25.next = 12;
+              _context26.next = 12;
               return Promise.all([wallet.signTransaction(baseTx), provider.getBlockNumber()]);
             case 12:
-              _yield$Promise$all = _context25.sent;
+              _yield$Promise$all = _context26.sent;
               _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
               signTx = _yield$Promise$all2[0];
               currentBlock = _yield$Promise$all2[1];
@@ -2577,98 +2599,140 @@ var Aggregator = /*#__PURE__*/function () {
               builderNames = Object.keys(builderCfg.urls);
               builderEntries = Object.entries(builderCfg.urls);
               Aggregator.traceLog(chain, 'log', "\u6E20\u9053=Builder Bundle, authType=".concat(builderCfg.authType, ", method=").concat((_builderCfg$method2 = builderCfg.method) !== null && _builderCfg$method2 !== void 0 ? _builderCfg$method2 : 'eth_sendBundle', ", ") + "nonce=".concat(txReq.nonce, ", gasLimit=").concat(txReq.gasLimit, ", chainId=").concat(network.chainId, ", ") + "\u5F53\u524D\u533A\u5757=".concat(currentBlock, ", \u76EE\u6807\u533A\u5757=[").concat(targetBlocks.join(','), "], ") + "builders=[".concat(builderNames.join(','), "](").concat(builderNames.length, "\u4E2A), txHash=").concat(txHash));
-              signer = builderCfg.authType === 'flashbots' ? this.flashbotSigner : undefined;
-              headers = {
-                'Content-Type': 'application/json'
-              };
-              if (!(builderCfg.authType === 'flashbots' && signer)) {
-                _context25.next = 30;
-                break;
-              }
-              sampleBody = this.buildBundleRequestBody(builderCfg, rawTxs, targetBlocks[0]);
-              _context25.next = 29;
-              return this.signRequestBody(sampleBody, signer);
-            case 29:
-              headers['X-Flashbots-Signature'] = _context25.sent;
-            case 30:
               sendBundleTs = Date.now();
               totalSent = 0;
               totalFailed = 0;
-              fireAndForget = targetBlocks.flatMap(function (block) {
-                var body = _this2.buildBundleRequestBody(builderCfg, rawTxs, block);
-                return builderEntries.map( /*#__PURE__*/function () {
-                  var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24(_ref14) {
-                    var _ref16, name, url, ts, response, _error$message2, msg;
+              signer = builderCfg.authType === 'flashbots' ? this.flashbotSigner : undefined;
+              fireAndForget = builderEntries.flatMap(function (_ref14) {
+                var _ref15 = _slicedToArray(_ref14, 2),
+                  name = _ref15[0],
+                  url = _ref15[1];
+                if (name === 'flashbots' && builderCfg.authType === 'flashbots' && signer) {
+                  return [_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
+                    var body, headers, ts, response, _error$message2, msg;
                     return _regeneratorRuntime().wrap(function _callee24$(_context24) {
                       while (1) switch (_context24.prev = _context24.next) {
                         case 0:
-                          _ref16 = _slicedToArray(_ref14, 2), name = _ref16[0], url = _ref16[1];
+                          body = _this2.buildFlashbotsMevBundleRequestBody(rawTxs, targetBlocks[0], targetBlocks[targetBlocks.length - 1]);
+                          _context24.next = 3;
+                          return _this2.signRequestBody(body, signer);
+                        case 3:
+                          _context24.t0 = _context24.sent;
+                          headers = {
+                            'Content-Type': 'application/json',
+                            'X-Flashbots-Signature': _context24.t0
+                          };
                           ts = Date.now();
-                          _context24.prev = 2;
-                          _context24.next = 5;
+                          _context24.prev = 6;
+                          _context24.next = 9;
                           return axios.post(url, body, {
                             headers: headers,
                             timeout: 3000
                           });
-                        case 5:
+                        case 9:
                           response = _context24.sent;
                           totalSent++;
-                          Aggregator.traceLog(chain, 'log', "Builder[".concat(name, "] \u53D1\u9001\u6210\u529F, targetBlock=").concat(block, ", \u8017\u65F6=").concat(Date.now() - ts, "ms, resp=").concat(JSON.stringify(response.data)));
-                          _context24.next = 15;
+                          Aggregator.traceLog(chain, 'log', "Builder[".concat(name, "] mev_sendBundle \u53D1\u9001\u6210\u529F, targetBlocks=[").concat(targetBlocks.join(','), "], \u8017\u65F6=").concat(Date.now() - ts, "ms, resp=").concat(JSON.stringify(response.data)));
+                          _context24.next = 19;
                           break;
+                        case 14:
+                          _context24.prev = 14;
+                          _context24.t1 = _context24["catch"](6);
+                          totalFailed++;
+                          msg = _context24.t1 !== null && _context24.t1 !== void 0 && _context24.t1.response ? JSON.stringify(_context24.t1.response.data) : (_error$message2 = _context24.t1 === null || _context24.t1 === void 0 ? void 0 : _context24.t1.message) !== null && _error$message2 !== void 0 ? _error$message2 : String(_context24.t1);
+                          Aggregator.traceLog(chain, 'error', "Builder[".concat(name, "] mev_sendBundle \u53D1\u9001\u5931\u8D25, targetBlocks=[").concat(targetBlocks.join(','), "], \u8017\u65F6=").concat(Date.now() - ts, "ms, error=").concat(msg));
+                        case 19:
+                        case "end":
+                          return _context24.stop();
+                      }
+                    }, _callee24, null, [[6, 14]]);
+                  }))()];
+                }
+                return targetBlocks.map( /*#__PURE__*/function () {
+                  var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25(block) {
+                    var body, headers, ts, response, _error$message3, msg;
+                    return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+                      while (1) switch (_context25.prev = _context25.next) {
+                        case 0:
+                          body = _this2.buildBundleRequestBody(builderCfg, rawTxs, block);
+                          headers = {
+                            'Content-Type': 'application/json'
+                          };
+                          if (!(builderCfg.authType === 'flashbots' && signer)) {
+                            _context25.next = 6;
+                            break;
+                          }
+                          _context25.next = 5;
+                          return _this2.signRequestBody(body, signer);
+                        case 5:
+                          headers['X-Flashbots-Signature'] = _context25.sent;
+                        case 6:
+                          ts = Date.now();
+                          _context25.prev = 7;
+                          _context25.next = 10;
+                          return axios.post(url, body, {
+                            headers: headers,
+                            timeout: 3000
+                          });
                         case 10:
-                          _context24.prev = 10;
-                          _context24.t0 = _context24["catch"](2);
+                          response = _context25.sent;
+                          totalSent++;
+                          Aggregator.traceLog(chain, 'log', "Builder[".concat(name, "] \u53D1\u9001\u6210\u529F, targetBlock=").concat(block, ", \u8017\u65F6=").concat(Date.now() - ts, "ms, resp=").concat(JSON.stringify(response.data)));
+                          _context25.next = 20;
+                          break;
+                        case 15:
+                          _context25.prev = 15;
+                          _context25.t0 = _context25["catch"](7);
                           totalFailed++;
-                          msg = _context24.t0 !== null && _context24.t0 !== void 0 && _context24.t0.response ? JSON.stringify(_context24.t0.response.data) : (_error$message2 = _context24.t0 === null || _context24.t0 === void 0 ? void 0 : _context24.t0.message) !== null && _error$message2 !== void 0 ? _error$message2 : String(_context24.t0);
+                          msg = _context25.t0 !== null && _context25.t0 !== void 0 && _context25.t0.response ? JSON.stringify(_context25.t0.response.data) : (_error$message3 = _context25.t0 === null || _context25.t0 === void 0 ? void 0 : _context25.t0.message) !== null && _error$message3 !== void 0 ? _error$message3 : String(_context25.t0);
                           Aggregator.traceLog(chain, 'error', "Builder[".concat(name, "] \u53D1\u9001\u5931\u8D25, targetBlock=").concat(block, ", \u8017\u65F6=").concat(Date.now() - ts, "ms, error=").concat(msg));
-                        case 15:
+                        case 20:
                         case "end":
-                          return _context24.stop();
+                          return _context25.stop();
                       }
-                    }, _callee24, null, [[2, 10]]);
+                    }, _callee25, null, [[7, 15]]);
                   }));
                   return function (_x57) {
-                    return _ref15.apply(this, arguments);
+                    return _ref17.apply(this, arguments);
                   };
                 }());
               });
               abortController = new AbortController();
               inclusionPromise = this.waitForBundleInclusion(provider, txHash, targetBlocks, abortController.signal);
               waitTs = Date.now();
-              _context25.next = 39;
+              _context26.next = 33;
               return Promise.all([inclusionPromise, Promise.all(fireAndForget).then(function () {
                 Aggregator.traceLog(chain, 'log', "Bundle\u53D1\u9001\u5B8C\u6210, \u6210\u529F=".concat(totalSent, ", \u5931\u8D25=").concat(totalFailed, ", \u603B\u8BF7\u6C42=").concat(fireAndForget.length, ", \u8017\u65F6=").concat(Date.now() - sendBundleTs, "ms, txHash=").concat(txHash));
                 if (totalSent === 0) abortController.abort();
               })]);
-            case 39:
-              _yield$Promise$all3 = _context25.sent;
+            case 33:
+              _yield$Promise$all3 = _context26.sent;
               _yield$Promise$all4 = _slicedToArray(_yield$Promise$all3, 1);
               receipt = _yield$Promise$all4[0];
               if (!receipt) {
-                _context25.next = 49;
+                _context26.next = 43;
                 break;
               }
-              _context25.next = 45;
+              _context26.next = 39;
               return this.getBlockTimestampStr(provider, receipt.blockNumber);
-            case 45:
-              blockTs = _context25.sent;
+            case 39:
+              blockTs = _context26.sent;
               Aggregator.traceLog(chain, 'log', "Bundle\u4E0A\u94FE\u786E\u8BA4, txHash=".concat(receipt.hash, ", blockNumber=").concat(receipt.blockNumber, ", \u51FA\u5757\u65F6\u95F4=").concat(blockTs, ", gasUsed=").concat(receipt.gasUsed, ", ") + "\u7B49\u5F85\u8017\u65F6=".concat(Date.now() - waitTs, "ms"));
-              _context25.next = 50;
+              _context26.next = 44;
               break;
-            case 49:
+            case 43:
               Aggregator.traceLog(chain, 'warn', "Bundle\u672A\u5728\u76EE\u6807\u533A\u5757\u4E0A\u94FE, txHash=".concat(txHash, ", \u76EE\u6807\u533A\u5757=[").concat(targetBlocks.join(','), "], \u7B49\u5F85\u8017\u65F6=").concat(Date.now() - waitTs, "ms"));
-            case 50:
-              return _context25.abrupt("return", {
+            case 44:
+              return _context26.abrupt("return", {
                 receipt: receipt,
                 txHash: txHash,
                 targetBlocks: targetBlocks
               });
-            case 51:
+            case 45:
             case "end":
-              return _context25.stop();
+              return _context26.stop();
           }
-        }, _callee25, this);
+        }, _callee26, this);
       }));
       function submitBundleTx(_x50, _x51, _x52, _x53, _x54, _x55, _x56) {
         return _submitBundleTx.apply(this, arguments);
@@ -2678,7 +2742,7 @@ var Aggregator = /*#__PURE__*/function () {
   }, {
     key: "swapByFlashbots",
     value: function () {
-      var _swapByFlashbots = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee26(params) {
+      var _swapByFlashbots = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(params) {
         var _amountOut, _receipt$to4;
         var txReq,
           bundleBlockCount,
@@ -2701,12 +2765,12 @@ var Aggregator = /*#__PURE__*/function () {
           _step7,
           log,
           parsed,
-          _args26 = arguments;
-        return _regeneratorRuntime().wrap(function _callee26$(_context26) {
-          while (1) switch (_context26.prev = _context26.next) {
+          _args27 = arguments;
+        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
+          while (1) switch (_context27.prev = _context27.next) {
             case 0:
-              txReq = _args26.length > 1 && _args26[1] !== undefined ? _args26[1] : {};
-              bundleBlockCount = _args26.length > 2 && _args26[2] !== undefined ? _args26[2] : 1;
+              txReq = _args27.length > 1 && _args27[1] !== undefined ? _args27[1] : {};
+              bundleBlockCount = _args27.length > 2 && _args27[2] !== undefined ? _args27[2] : 1;
               Aggregator.traceLog(params.chain, 'log', "swapByFlashbots(bundle\u8DEF\u5F84)\u5F00\u59CB, bundleBlockCount=".concat(bundleBlockCount));
               wallet = this.providerClient.getWallet(params.chain);
               aggregatorAddress = this.getAggregatorAddress(params.chain);
@@ -2722,39 +2786,39 @@ var Aggregator = /*#__PURE__*/function () {
                 };
               });
               _txReq6 = txReq, _ignore = _txReq6.gasLimit, estimationOverrides = _objectWithoutProperties(_txReq6, _excluded7);
-              _context26.prev = 8;
-              _context26.next = 11;
+              _context27.prev = 8;
+              _context27.next = 11;
               return aggregator.swap.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, estimationOverrides);
             case 11:
-              estimateGas = _context26.sent;
-              _context26.next = 18;
+              estimateGas = _context27.sent;
+              _context27.next = 18;
               break;
             case 14:
-              _context26.prev = 14;
-              _context26.t0 = _context26["catch"](8);
-              Aggregator.traceLog(params.chain, 'error', "swapByFlashbots estimateGas\u5931\u8D25, rpcUrl=".concat(this.getRpcUrl(params.chain), ", error=").concat(_context26.t0));
-              throw _context26.t0;
+              _context27.prev = 14;
+              _context27.t0 = _context27["catch"](8);
+              Aggregator.traceLog(params.chain, 'error', "swapByFlashbots estimateGas\u5931\u8D25, rpcUrl=".concat(this.getRpcUrl(params.chain), ", error=").concat(_context27.t0));
+              throw _context27.t0;
             case 18:
               Aggregator.traceLog(params.chain, 'log', "swapByFlashbots estimateGas=".concat(estimateGas));
               txReq = this.resolveGasLimit(txReq, estimateGas);
-              _context26.next = 22;
+              _context27.next = 22;
               return this.resolveNonce(wallet.provider, wallet.address, txReq);
             case 22:
-              txReq = _context26.sent;
-              _context26.next = 25;
+              txReq = _context27.sent;
+              _context27.next = 25;
               return this.resolvePricing(wallet.provider, txReq);
             case 25:
-              txReq = _context26.sent;
+              txReq = _context27.sent;
               swapCallData = this.genSwapCalldata(params);
-              _context26.next = 29;
+              _context27.next = 29;
               return this.submitBundleTx(params.chain, wallet, txReq, swapCallData.to, swapCallData.data, 0n, bundleBlockCount);
             case 29:
-              _yield$this$submitBun5 = _context26.sent;
+              _yield$this$submitBun5 = _context27.sent;
               receipt = _yield$this$submitBun5.receipt;
               txHash = _yield$this$submitBun5.txHash;
               targetBlocks = _yield$this$submitBun5.targetBlocks;
               if (receipt) {
-                _context26.next = 35;
+                _context27.next = 35;
                 break;
               }
               throw new BundleNotIncludedError("Bundle \u672A\u5728\u76EE\u6807\u533A\u5757\u4E0A\u94FE, txHash=".concat(txHash, ", targetBlocks=[").concat(targetBlocks.join(','), "]"), txHash);
@@ -2762,48 +2826,48 @@ var Aggregator = /*#__PURE__*/function () {
               iface = new ethers.Interface(AggregatorAbi);
               amountOut = null;
               _iterator7 = _createForOfIteratorHelper(receipt.logs);
-              _context26.prev = 38;
+              _context27.prev = 38;
               _iterator7.s();
             case 40:
               if ((_step7 = _iterator7.n()).done) {
-                _context26.next = 54;
+                _context27.next = 54;
                 break;
               }
               log = _step7.value;
               if (!(log.address.toLowerCase() === aggregatorAddress.toLowerCase())) {
-                _context26.next = 52;
+                _context27.next = 52;
                 break;
               }
-              _context26.prev = 43;
+              _context27.prev = 43;
               parsed = iface.parseLog(log);
               if (!(parsed && parsed.name === 'Swapped' && parsed.args && parsed.args.amountOut !== undefined)) {
-                _context26.next = 48;
+                _context27.next = 48;
                 break;
               }
               amountOut = parsed.args.amountOut;
-              return _context26.abrupt("break", 54);
+              return _context27.abrupt("break", 54);
             case 48:
-              _context26.next = 52;
+              _context27.next = 52;
               break;
             case 50:
-              _context26.prev = 50;
-              _context26.t1 = _context26["catch"](43);
+              _context27.prev = 50;
+              _context27.t1 = _context27["catch"](43);
             case 52:
-              _context26.next = 40;
+              _context27.next = 40;
               break;
             case 54:
-              _context26.next = 59;
+              _context27.next = 59;
               break;
             case 56:
-              _context26.prev = 56;
-              _context26.t2 = _context26["catch"](38);
-              _iterator7.e(_context26.t2);
+              _context27.prev = 56;
+              _context27.t2 = _context27["catch"](38);
+              _iterator7.e(_context27.t2);
             case 59:
-              _context26.prev = 59;
+              _context27.prev = 59;
               _iterator7.f();
-              return _context26.finish(59);
+              return _context27.finish(59);
             case 62:
-              return _context26.abrupt("return", {
+              return _context27.abrupt("return", {
                 fromToken: params.path[0].fromCoinAddress,
                 toToken: params.path[params.path.length - 1].toCoinAddress,
                 amountOut: (_amountOut = amountOut) !== null && _amountOut !== void 0 ? _amountOut : 0n,
@@ -2813,9 +2877,9 @@ var Aggregator = /*#__PURE__*/function () {
               });
             case 63:
             case "end":
-              return _context26.stop();
+              return _context27.stop();
           }
-        }, _callee26, this, [[8, 14], [38, 56, 59, 62], [43, 50]]);
+        }, _callee27, this, [[8, 14], [38, 56, 59, 62], [43, 50]]);
       }));
       function swapByFlashbots(_x58) {
         return _swapByFlashbots.apply(this, arguments);
@@ -2833,32 +2897,32 @@ var Aggregator = /*#__PURE__*/function () {
   }, {
     key: "resolveNonce",
     value: function () {
-      var _resolveNonce = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee27(provider, from, tx) {
-        return _regeneratorRuntime().wrap(function _callee27$(_context27) {
-          while (1) switch (_context27.prev = _context27.next) {
+      var _resolveNonce = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(provider, from, tx) {
+        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
+          while (1) switch (_context28.prev = _context28.next) {
             case 0:
               if (!(tx.nonce != null)) {
-                _context27.next = 2;
+                _context28.next = 2;
                 break;
               }
-              return _context27.abrupt("return", tx);
+              return _context28.abrupt("return", tx);
             case 2:
-              _context27.t0 = _objectSpread;
-              _context27.t1 = _objectSpread({}, tx);
-              _context27.t2 = {};
-              _context27.next = 7;
+              _context28.t0 = _objectSpread;
+              _context28.t1 = _objectSpread({}, tx);
+              _context28.t2 = {};
+              _context28.next = 7;
               return provider.getTransactionCount(from, 'latest');
             case 7:
-              _context27.t3 = _context27.sent;
-              _context27.t4 = {
-                nonce: _context27.t3
+              _context28.t3 = _context28.sent;
+              _context28.t4 = {
+                nonce: _context28.t3
               };
-              return _context27.abrupt("return", (0, _context27.t0)(_context27.t1, _context27.t2, _context27.t4));
+              return _context28.abrupt("return", (0, _context28.t0)(_context28.t1, _context28.t2, _context28.t4));
             case 10:
             case "end":
-              return _context27.stop();
+              return _context28.stop();
           }
-        }, _callee27);
+        }, _callee28);
       }));
       function resolveNonce(_x59, _x60, _x61) {
         return _resolveNonce.apply(this, arguments);
@@ -2868,44 +2932,44 @@ var Aggregator = /*#__PURE__*/function () {
   }, {
     key: "resolvePricing",
     value: function () {
-      var _resolvePricing = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee28(provider, tx) {
+      var _resolvePricing = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee29(provider, tx) {
         var fd;
-        return _regeneratorRuntime().wrap(function _callee28$(_context28) {
-          while (1) switch (_context28.prev = _context28.next) {
+        return _regeneratorRuntime().wrap(function _callee29$(_context29) {
+          while (1) switch (_context29.prev = _context29.next) {
             case 0:
               if (!(tx.gasPrice != null || tx.maxFeePerGas != null || tx.maxPriorityFeePerGas != null)) {
-                _context28.next = 2;
+                _context29.next = 2;
                 break;
               }
-              return _context28.abrupt("return", this.sanitizePricing(tx));
+              return _context29.abrupt("return", this.sanitizePricing(tx));
             case 2:
-              _context28.next = 4;
+              _context29.next = 4;
               return provider.getFeeData();
             case 4:
-              fd = _context28.sent;
+              fd = _context29.sent;
               if (!(fd.maxFeePerGas != null && fd.maxPriorityFeePerGas != null)) {
-                _context28.next = 7;
+                _context29.next = 7;
                 break;
               }
-              return _context28.abrupt("return", _objectSpread(_objectSpread({}, tx), {}, {
+              return _context29.abrupt("return", _objectSpread(_objectSpread({}, tx), {}, {
                 maxFeePerGas: fd.maxFeePerGas * 150n / 100n,
                 maxPriorityFeePerGas: fd.maxPriorityFeePerGas
               }));
             case 7:
               if (!(fd.gasPrice != null)) {
-                _context28.next = 9;
+                _context29.next = 9;
                 break;
               }
-              return _context28.abrupt("return", _objectSpread(_objectSpread({}, tx), {}, {
+              return _context29.abrupt("return", _objectSpread(_objectSpread({}, tx), {}, {
                 gasPrice: fd.gasPrice
               }));
             case 9:
-              return _context28.abrupt("return", tx);
+              return _context29.abrupt("return", tx);
             case 10:
             case "end":
-              return _context28.stop();
+              return _context29.stop();
           }
-        }, _callee28, this);
+        }, _callee29, this);
       }));
       function resolvePricing(_x62, _x63) {
         return _resolvePricing.apply(this, arguments);
@@ -2994,10 +3058,9 @@ _defineProperty(Aggregator, "DEFAULT_ETH_BUILDERS", {
   Titan: 'https://rpc.titanbuilder.xyz',
   flashbots: 'https://relay.flashbots.net',
   // bloXroute: 'https://mev.api.blxrbdn.com', // 旧 api.blxrbdn.com 也行，需配置 Authorization 头
-  lightspeedbuilder: 'https://rpc.lightspeedbuilder.info',
-  // 新增，实测直接可用
+  lightspeedbuilder: 'https://rpc.lightspeedbuilder.info' // 新增，实测直接可用
   // buildernet: 'https://rpc.buildernet.org', // 新增，Flashbots 生态，需签名头（同 flashbots 格式）
-  nfactorial: 'https://rpc.nfactorial.xyz' // 新增，支持 bundle rebate
+  // nfactorial: 'https://rpc.nfactorial.xyz', // 新增，支持 bundle rebate
 });
 _defineProperty(Aggregator, "DEFAULT_SEQUENCER_RPC_BY_CHAIN", _defineProperty(_defineProperty(_defineProperty({}, ChainNameEnum.ARB, 'https://arb1-sequencer.arbitrum.io/rpc'), ChainNameEnum.BASE, 'https://mainnet-sequencer.base.org'), ChainNameEnum.ETHERLINK, 'https://relay.mainnet.etherlink.com'));
 _defineProperty(Aggregator, "SEQUENCER_CHAINS", new Set(Object.keys(_class.DEFAULT_SEQUENCER_RPC_BY_CHAIN)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-swap",
-  "version": "0.6.8",
+  "version": "0.6.9",
   "description": "A TypeScript utility library for swap and bridge",
   "main": "dist/cjs/index.cjs",
   "module": "dist/esm/index.mjs",