hermes-swap 0.6.7 → 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);
@@ -877,8 +894,19 @@ var _Aggregator = class {
   static isBenignBroadcastError(message) {
     return message.includes("already known") || message.includes("nonce too low") || message.includes("nonce has already been used") || message.includes("ALREADY_EXISTS") || message.includes("NONCE_EXPIRED");
   }
-  async waitForBundleInclusion(provider, txHash, maxTargetBlock, signal) {
-    const deadline = Date.now() + _Aggregator.BUNDLE_INCLUSION_TIMEOUT_MS;
+  async blockContainsTxHash(provider, blockNumber, txHash) {
+    try {
+      const block = await provider.getBlock(blockNumber, true);
+      if (!block)
+        return false;
+      if (block.transactions.some((hash) => hash === txHash))
+        return true;
+      return block.prefetchedTransactions.some((tx) => tx.hash === txHash);
+    } catch {
+      return false;
+    }
+  }
+  async waitForReceipt(provider, txHash, deadline, signal) {
     while (Date.now() < deadline) {
       if (signal == null ? void 0 : signal.aborted)
         return null;
@@ -888,12 +916,119 @@ var _Aggregator = class {
           return receipt;
       } catch {
       }
-      const currentBlock = await provider.getBlockNumber().catch(() => 0);
-      if (currentBlock > maxTargetBlock + 1)
-        return null;
-      await new Promise((r) => setTimeout(r, _Aggregator.BUNDLE_POLL_INTERVAL_MS));
+      await new Promise((r) => setTimeout(r, 200));
+    }
+    try {
+      const receipt = await provider.getTransactionReceipt(txHash);
+      return receipt ? receipt : null;
+    } catch {
+      return null;
     }
-    return null;
+  }
+  async waitForBundleInclusion(provider, txHash, targetBlocks, signal) {
+    const deadline = Date.now() + _Aggregator.BUNDLE_INCLUSION_TIMEOUT_MS;
+    const sortedTargetBlocks = [...targetBlocks].sort((a, b) => a - b);
+    const targetBlockSet = new Set(sortedTargetBlocks);
+    const maxTargetBlock = sortedTargetBlocks[sortedTargetBlocks.length - 1];
+    return new Promise((resolve) => {
+      let settled = false;
+      let lastObservedBlock = sortedTargetBlocks[0] - 1;
+      const checkedBlocks = /* @__PURE__ */ new Set();
+      let matchedTargetBlock = false;
+      let inspectionChain = Promise.resolve();
+      const cleanup = () => {
+        clearTimeout(timer);
+        provider.off("block", onBlock);
+      };
+      const finish = (receipt) => {
+        if (settled)
+          return;
+        settled = true;
+        cleanup();
+        resolve(receipt);
+      };
+      const scheduleInspect = (fromBlock, toBlock) => {
+        if (fromBlock > toBlock) {
+          if (checkedBlocks.size === targetBlockSet.size && lastObservedBlock >= maxTargetBlock) {
+            finish(null);
+          }
+          return;
+        }
+        inspectionChain = inspectionChain.then(() => inspectTargetBlocks(fromBlock, toBlock)).catch(() => {
+        });
+      };
+      const inspectTargetBlocks = async (fromBlock, toBlock) => {
+        if (settled || (signal == null ? void 0 : signal.aborted)) {
+          finish(null);
+          return;
+        }
+        for (let blockNumber = fromBlock; blockNumber <= toBlock; blockNumber++) {
+          if (settled || (signal == null ? void 0 : signal.aborted)) {
+            finish(null);
+            return;
+          }
+          if (!targetBlockSet.has(blockNumber) || checkedBlocks.has(blockNumber))
+            continue;
+          checkedBlocks.add(blockNumber);
+          const matched = await this.blockContainsTxHash(provider, blockNumber, txHash);
+          if (!matched)
+            continue;
+          matchedTargetBlock = true;
+          clearTimeout(timer);
+          const receipt = await this.waitForReceipt(provider, txHash, Date.now() + _Aggregator.TX_CONFIRM_TIMEOUT_MS, signal);
+          finish(receipt);
+          return;
+        }
+        if (checkedBlocks.size === targetBlockSet.size && lastObservedBlock >= maxTargetBlock) {
+          finish(null);
+        }
+      };
+      const onBlock = (blockNumber) => {
+        if (settled)
+          return;
+        const fromBlock = Math.max(lastObservedBlock + 1, sortedTargetBlocks[0]);
+        const toBlock = Math.min(blockNumber, maxTargetBlock);
+        if (blockNumber > lastObservedBlock) {
+          lastObservedBlock = blockNumber;
+        }
+        if (fromBlock > toBlock) {
+          if (checkedBlocks.size === targetBlockSet.size && lastObservedBlock >= maxTargetBlock) {
+            finish(null);
+          }
+          return;
+        }
+        scheduleInspect(fromBlock, toBlock);
+      };
+      const timer = setTimeout(async () => {
+        if (settled)
+          return;
+        if (matchedTargetBlock)
+          return;
+        const latestBlock = await provider.getBlockNumber().catch(() => lastObservedBlock);
+        if (latestBlock > lastObservedBlock) {
+          lastObservedBlock = latestBlock;
+        }
+        const toBlock = Math.min(latestBlock, maxTargetBlock);
+        scheduleInspect(sortedTargetBlocks[0], toBlock);
+        await inspectionChain;
+        finish(null);
+      }, _Aggregator.BUNDLE_INCLUSION_TIMEOUT_MS);
+      provider.on("block", onBlock);
+      provider.getBlockNumber().then(
+        (currentBlock) => {
+          if (settled)
+            return;
+          lastObservedBlock = currentBlock;
+          const fromBlock = sortedTargetBlocks[0];
+          const toBlock = Math.min(currentBlock, maxTargetBlock);
+          if (fromBlock <= toBlock) {
+            scheduleInspect(fromBlock, toBlock);
+          }
+        },
+        () => {
+        }
+      );
+    });
   }
   async sendSignedTxToChannels(chain, signedTx, txHash, channels) {
     const results = await Promise.all(
@@ -980,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));
         }
@@ -1023,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);
       }
@@ -1059,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;
@@ -1116,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 });
@@ -1141,8 +1290,7 @@ var _Aggregator = class {
       });
     });
     const abortController = new AbortController();
-    const maxTargetBlock = Math.max(...targetBlocks);
-    const inclusionPromise = this.waitForBundleInclusion(provider, txHash, maxTargetBlock, abortController.signal);
+    const inclusionPromise = this.waitForBundleInclusion(provider, txHash, targetBlocks, abortController.signal);
     const waitTs = Date.now();
     const [receipt] = await Promise.all([
       inclusionPromise,
@@ -1298,22 +1446,18 @@ 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_POLL_INTERVAL_MS = 500;
 Aggregator.BUNDLE_INCLUSION_TIMEOUT_MS = 3e4;
 var aggregator_default = Aggregator;
 // Annotate the CommonJS export names for ESM import in node:

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;
@@ -55,9 +56,10 @@ declare class Aggregator {
     estimateGas(estimateType: IEstimateType, params: IBridgeParams | ISwapByPathParams | ISwapAndBridgeParams | IBatchMultiSwapParams): Promise<bigint>;
     getAggregatorSupportContracts(chain: ChainNameEnum): Promise<SupportContracts[]>;
     private static readonly TX_CONFIRM_TIMEOUT_MS;
-    private static readonly BUNDLE_POLL_INTERVAL_MS;
     private static readonly BUNDLE_INCLUSION_TIMEOUT_MS;
     private static isBenignBroadcastError;
+    private blockContainsTxHash;
+    private waitForReceipt;
     private waitForBundleInclusion;
     private sendSignedTxToChannels;
     private raceForReceipt;

package/dist/cjs/provider.cjs

@@ -32,6 +32,7 @@ var Provider = class {
     for (const [chainName, rpc] of Object.entries(this.config.rpc)) {
       const chain = chainName;
       const provider = new import_ethers.ethers.JsonRpcProvider(rpc.url);
+      provider.pollingInterval = 500;
       this.providerMap.set(chain, provider);
       if (rpc.privateKey) {
         this.walletMap.set(chain, new import_ethers.ethers.Wallet(rpc.privateKey, provider));

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;
@@ -55,9 +56,10 @@ declare class Aggregator {
     estimateGas(estimateType: IEstimateType, params: IBridgeParams | ISwapByPathParams | ISwapAndBridgeParams | IBatchMultiSwapParams): Promise<bigint>;
     getAggregatorSupportContracts(chain: ChainNameEnum): Promise<SupportContracts[]>;
     private static readonly TX_CONFIRM_TIMEOUT_MS;
-    private static readonly BUNDLE_POLL_INTERVAL_MS;
     private static readonly BUNDLE_INCLUSION_TIMEOUT_MS;
     private static isBenignBroadcastError;
+    private blockContainsTxHash;
+    private waitForReceipt;
     private waitForBundleInclusion;
     private sendSignedTxToChannels;
     private raceForReceipt;