hermes-swap 0.6.1 → 0.6.3

package/dist/cjs/aggregator.cjs

@@ -168,12 +168,9 @@ var _Aggregator = class {
     this.validateParams(params);
     const useBundle = this.shouldUseBundle(params.chain, txReq);
     const pathDesc = params.path.map((p) => `${p.dexType}:${p.poolAddress.slice(0, 10)}`).join("→");
-    _Aggregator.traceLog(
-      params.chain,
-      "log",
-      `swapByPath开始, user=${params.user}, amountIn=${params.amountInWei}, path=[${pathDesc}], useBundle=${useBundle}`
-    );
+    _Aggregator.traceLog(params.chain, "log", `swapByPath开始, user=${params.user}, amountIn=${params.amountInWei}, path=[${pathDesc}], useBundle=${useBundle}`);
     const startTs = Date.now();
+    let txHash;
     try {
       if (useBundle) {
         const { pureTxReq: pureTxReq2, bundleBlockCount } = this.stripCustomFields(txReq, params.chain);
@@ -181,6 +178,7 @@ var _Aggregator = class {
         if (!flashbotsReceipt) {
           throw new Error("Bundle 未在目标区块上链");
         }
+        txHash = flashbotsReceipt.hash;
         _Aggregator.traceLog(params.chain, "log", `swapByPath完成(bundle), txHash=${flashbotsReceipt.hash}, amountOut=${flashbotsReceipt.amountOut}, 总耗时=${Date.now() - startTs}ms`);
         return flashbotsReceipt;
       }
@@ -206,13 +204,14 @@ var _Aggregator = class {
       try {
         estimateGas = await aggregator.swap.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, estimationOverrides);
       } catch (error) {
-        _Aggregator.traceLog(params.chain, "error", `swapByPath estimateGas失败, error=${error}`);
+        _Aggregator.traceLog(params.chain, "error", `swapByPath estimateGas失败, rpcUrl=${this.getRpcUrl(params.chain)}, error=${error}`);
         throw error;
       }
       txReq = this.resolveGasLimit(txReq, estimateGas);
       txReq = await this.resolveNonce(wallet.provider, wallet.address, txReq);
       txReq = await this.resolvePricing(wallet.provider, txReq);
       const receipt = await this.sendContractTx(params.chain, aggregator, "swap", [params.user, params.amountInWei, swapParams, params.minAmountOutList], txReq);
+      txHash = receipt.hash;
       const iface = new import_ethers.ethers.Interface(import_aggregator.default);
       let amountOut = null;
       for (const log of receipt.logs) {
@@ -240,7 +239,7 @@ var _Aggregator = class {
         to: receipt.from
       };
     } catch (error) {
-      _Aggregator.traceLog(params.chain, "error", `swapByPath异常, 总耗时=${Date.now() - startTs}ms, error=${error}`);
+      _Aggregator.traceLog(params.chain, "error", `swapByPath异常, rpcUrl=${this.getRpcUrl(params.chain)}, txHash=${txHash ?? "N/A"}, 总耗时=${Date.now() - startTs}ms, error=${error}`);
       throw error;
     }
   }
@@ -279,7 +278,7 @@ var _Aggregator = class {
       });
       return this.batchMultiSwap({ chain, users, amountInWeis, paths, minAmountOutLists });
     } catch (error) {
-      throw new Error(`aggregator swap error: ${error}`);
+      throw new Error(`aggregator swap error: chain=${chain}, rpcUrl=${this.getRpcUrl(chain)}, ${error}`);
     }
   }
   async swapAndBridge(params, txReq = {}) {
@@ -291,6 +290,7 @@ var _Aggregator = class {
       `swapAndBridge开始, user=${params.user}, amountInWeis=[${params.amountInWeis.join(",")}], bridgeType=${params.bridgeType}, destChain=${params.destChain}, useBundle=${useBundle}`
     );
     const startTs = Date.now();
+    let txHash;
     try {
       const { pureTxReq, bundleBlockCount } = this.stripCustomFields(txReq, params.chain);
       txReq = pureTxReq;
@@ -331,7 +331,7 @@ var _Aggregator = class {
       try {
         estimateGas = await aggregator.multiSwapAndBridge.estimateGas(...args, estimationOverrides);
       } catch (error) {
-        _Aggregator.traceLog(params.chain, "error", `swapAndBridge estimateGas失败, error=${error}`);
+        _Aggregator.traceLog(params.chain, "error", `swapAndBridge estimateGas失败, rpcUrl=${this.getRpcUrl(params.chain)}, error=${error}`);
         throw error;
       }
       txReq = this.resolveGasLimit(txReq, estimateGas);
@@ -341,13 +341,22 @@ var _Aggregator = class {
       let receipt;
       if (useBundle) {
         const calldata = iface.encodeFunctionData("multiSwapAndBridge", args);
-        const { receipt: flashbotsReceipt, txHash, targetBlocks } = await this.submitBundleTx(params.chain, wallet, txReq, aggregatorAddress, calldata, txReq.value ?? 0n, bundleBlockCount);
+        const {
+          receipt: flashbotsReceipt,
+          txHash: bundleTxHash,
+          targetBlocks
+        } = await this.submitBundleTx(params.chain, wallet, txReq, aggregatorAddress, calldata, txReq.value ?? 0n, bundleBlockCount);
+        txHash = bundleTxHash;
         if (!flashbotsReceipt) {
-          throw new import_types.BundleNotIncludedError(`Bundle 未在目标区块上链, txHash=${txHash}, targetBlocks=[${targetBlocks.join(",")}]`, txHash);
+          throw new import_types.BundleNotIncludedError(`Bundle 未在目标区块上链, txHash=${bundleTxHash}, targetBlocks=[${targetBlocks.join(",")}]`, bundleTxHash);
+        }
+        if (flashbotsReceipt.status === 0) {
+          throw new import_types.TransactionRevertedError(flashbotsReceipt.hash, flashbotsReceipt.gasUsed);
         }
         receipt = flashbotsReceipt;
       } else {
         receipt = await this.sendContractTx(params.chain, aggregator, "multiSwapAndBridge", args, txReq);
+        txHash = receipt.hash;
       }
       let receiptUser = null;
       let amountInList = null;
@@ -374,11 +383,7 @@ var _Aggregator = class {
       const fromTokenAddress = ((_a = pathStart == null ? void 0 : pathStart[0]) == null ? void 0 : _a.fromCoinAddress) ?? "";
       const toTokenAddress = ((_b = pathEnd == null ? void 0 : pathEnd[pathEnd.length - 1]) == null ? void 0 : _b.toCoinAddress) ?? "";
       const totalAmountInFromEvent = amountInList.reduce((sum, amount) => sum + amount, 0n);
-      _Aggregator.traceLog(
-        params.chain,
-        "log",
-        `swapAndBridge完成, txHash=${receipt.hash}, amountOut=${amountOut}, useBundle=${useBundle}, 总耗时=${Date.now() - startTs}ms`
-      );
+      _Aggregator.traceLog(params.chain, "log", `swapAndBridge完成, txHash=${receipt.hash}, amountOut=${amountOut}, useBundle=${useBundle}, 总耗时=${Date.now() - startTs}ms`);
       return {
         hash: receipt.hash,
         from: receipt.from,
@@ -387,19 +392,16 @@ var _Aggregator = class {
         receipt
       };
     } catch (error) {
-      _Aggregator.traceLog(params.chain, "error", `swapAndBridge异常, 总耗时=${Date.now() - startTs}ms, error=${error}`);
+      _Aggregator.traceLog(params.chain, "error", `swapAndBridge异常, rpcUrl=${this.getRpcUrl(params.chain)}, txHash=${txHash ?? "N/A"}, 总耗时=${Date.now() - startTs}ms, error=${error}`);
       throw error;
     }
   }
   async multiSwap(params, txReq = {}) {
     var _a;
     const useBundle = this.shouldUseBundle(params.chain, txReq);
-    _Aggregator.traceLog(
-      params.chain,
-      "log",
-      `multiSwap开始, user=${params.user}, pathsCount=${params.paths.length}, amountInWeis=[${params.amountInWeis.join(",")}], useBundle=${useBundle}`
-    );
+    _Aggregator.traceLog(params.chain, "log", `multiSwap开始, user=${params.user}, pathsCount=${params.paths.length}, amountInWeis=[${params.amountInWeis.join(",")}], useBundle=${useBundle}`);
     const startTs = Date.now();
+    let txHash;
     try {
       const { pureTxReq, bundleBlockCount } = this.stripCustomFields(txReq, params.chain);
       txReq = pureTxReq;
@@ -441,7 +443,7 @@ var _Aggregator = class {
       try {
         estimateGas = await aggregator.multiSwap.estimateGas(params.user, params.amountInWeis, swapParamsList, params.minAmountOutLists, params.totalMinAmountOut, estimationOverrides);
       } catch (error) {
-        _Aggregator.traceLog(params.chain, "error", `multiSwap estimateGas失败, error=${error}`);
+        _Aggregator.traceLog(params.chain, "error", `multiSwap estimateGas失败, rpcUrl=${this.getRpcUrl(params.chain)}, error=${error}`);
         throw error;
       }
       txReq = this.resolveGasLimit(txReq, estimateGas);
@@ -451,13 +453,22 @@ var _Aggregator = class {
       let receipt;
       if (useBundle) {
         const calldata = iface.encodeFunctionData("multiSwap", [params.user, params.amountInWeis, swapParamsList, params.minAmountOutLists, params.totalMinAmountOut]);
-        const { receipt: flashbotsReceipt, txHash, targetBlocks } = await this.submitBundleTx(params.chain, wallet, txReq, aggregatorAddress, calldata, txReq.value ?? 0n, bundleBlockCount);
+        const {
+          receipt: flashbotsReceipt,
+          txHash: bundleTxHash,
+          targetBlocks
+        } = await this.submitBundleTx(params.chain, wallet, txReq, aggregatorAddress, calldata, txReq.value ?? 0n, bundleBlockCount);
+        txHash = bundleTxHash;
         if (!flashbotsReceipt) {
-          throw new import_types.BundleNotIncludedError(`Bundle 未在目标区块上链, txHash=${txHash}, targetBlocks=[${targetBlocks.join(",")}]`, txHash);
+          throw new import_types.BundleNotIncludedError(`Bundle 未在目标区块上链, txHash=${bundleTxHash}, targetBlocks=[${targetBlocks.join(",")}]`, bundleTxHash);
+        }
+        if (flashbotsReceipt.status === 0) {
+          throw new import_types.TransactionRevertedError(flashbotsReceipt.hash, flashbotsReceipt.gasUsed);
         }
         receipt = flashbotsReceipt;
       } else {
         receipt = await this.sendContractTx(params.chain, aggregator, "multiSwap", [params.user, params.amountInWeis, swapParamsList, params.minAmountOutLists, params.totalMinAmountOut], txReq);
+        txHash = receipt.hash;
       }
       let amountOutList = null;
       for (const log of receipt.logs) {
@@ -474,11 +485,7 @@ var _Aggregator = class {
       }
       if (!amountOutList)
         throw new Error(`MultiSwapped event not found: ${receipt.hash}`);
-      _Aggregator.traceLog(
-        params.chain,
-        "log",
-        `multiSwap完成, txHash=${receipt.hash}, amountOutList=[${amountOutList.join(",")}], useBundle=${useBundle}, 总耗时=${Date.now() - startTs}ms`
-      );
+      _Aggregator.traceLog(params.chain, "log", `multiSwap完成, txHash=${receipt.hash}, amountOutList=[${amountOutList.join(",")}], useBundle=${useBundle}, 总耗时=${Date.now() - startTs}ms`);
       return {
         hash: receipt.hash,
         from: receipt.from,
@@ -496,7 +503,7 @@ var _Aggregator = class {
         receipt
       };
     } catch (error) {
-      _Aggregator.traceLog(params.chain, "error", `multiSwap异常, 总耗时=${Date.now() - startTs}ms, error=${error}`);
+      _Aggregator.traceLog(params.chain, "error", `multiSwap异常, rpcUrl=${this.getRpcUrl(params.chain)}, txHash=${txHash ?? "N/A"}, 总耗时=${Date.now() - startTs}ms, error=${error}`);
       throw error;
     }
   }
@@ -508,6 +515,7 @@ var _Aggregator = class {
       `batchMultiSwap开始, users=${params.users.length}, pathsCount=${params.paths.length}, amountInWeis=[${params.amountInWeis.join(",")}], useBundle=${useBundle}`
     );
     const startTs = Date.now();
+    let txHash;
     try {
       const { pureTxReq, bundleBlockCount } = this.stripCustomFields(txReq, params.chain);
       txReq = pureTxReq;
@@ -533,7 +541,7 @@ var _Aggregator = class {
       try {
         estimateGas = await aggregator.batchMultiSwap.estimateGas(params.users, params.amountInWeis, swapParamsList, params.minAmountOutLists, estimationOverrides);
       } catch (error) {
-        _Aggregator.traceLog(params.chain, "error", `batchMultiSwap estimateGas失败, error=${error}`);
+        _Aggregator.traceLog(params.chain, "error", `batchMultiSwap estimateGas失败, rpcUrl=${this.getRpcUrl(params.chain)}, error=${error}`);
         throw error;
       }
       txReq = this.resolveGasLimit(txReq, estimateGas);
@@ -543,13 +551,22 @@ var _Aggregator = class {
       let receipt;
       if (useBundle) {
         const calldata = iface.encodeFunctionData("batchMultiSwap", [params.users, params.amountInWeis, swapParamsList, params.minAmountOutLists]);
-        const { receipt: flashbotsReceipt, txHash, targetBlocks } = await this.submitBundleTx(params.chain, wallet, txReq, aggregatorAddress, calldata, txReq.value ?? 0n, bundleBlockCount);
+        const {
+          receipt: flashbotsReceipt,
+          txHash: bundleTxHash,
+          targetBlocks
+        } = await this.submitBundleTx(params.chain, wallet, txReq, aggregatorAddress, calldata, txReq.value ?? 0n, bundleBlockCount);
+        txHash = bundleTxHash;
         if (!flashbotsReceipt) {
-          throw new import_types.BundleNotIncludedError(`Bundle 未在目标区块上链, txHash=${txHash}, targetBlocks=[${targetBlocks.join(",")}]`, txHash);
+          throw new import_types.BundleNotIncludedError(`Bundle 未在目标区块上链, txHash=${bundleTxHash}, targetBlocks=[${targetBlocks.join(",")}]`, bundleTxHash);
+        }
+        if (flashbotsReceipt.status === 0) {
+          throw new import_types.TransactionRevertedError(flashbotsReceipt.hash, flashbotsReceipt.gasUsed);
         }
         receipt = flashbotsReceipt;
       } else {
         receipt = await this.sendContractTx(params.chain, aggregator, "batchMultiSwap", [params.users, params.amountInWeis, swapParamsList, params.minAmountOutLists], txReq);
+        txHash = receipt.hash;
       }
       let userList = null;
       let amountInList = null;
@@ -573,11 +590,7 @@ var _Aggregator = class {
       if (userList.length !== params.users.length || amountOutList.length !== params.users.length) {
         throw new Error(`MultiSwapped event length mismatch: ${receipt.hash}`);
       }
-      _Aggregator.traceLog(
-        params.chain,
-        "log",
-        `batchMultiSwap完成, txHash=${receipt.hash}, amountOutList=[${amountOutList.join(",")}], useBundle=${useBundle}, 总耗时=${Date.now() - startTs}ms`
-      );
+      _Aggregator.traceLog(params.chain, "log", `batchMultiSwap完成, txHash=${receipt.hash}, amountOutList=[${amountOutList.join(",")}], useBundle=${useBundle}, 总耗时=${Date.now() - startTs}ms`);
       return {
         hash: receipt.hash,
         from: receipt.from,
@@ -595,7 +608,7 @@ var _Aggregator = class {
         receipt
       };
     } catch (error) {
-      _Aggregator.traceLog(params.chain, "error", `batchMultiSwap异常, 总耗时=${Date.now() - startTs}ms, error=${error}`);
+      _Aggregator.traceLog(params.chain, "error", `batchMultiSwap异常, rpcUrl=${this.getRpcUrl(params.chain)}, txHash=${txHash ?? "N/A"}, 总耗时=${Date.now() - startTs}ms, error=${error}`);
       throw error;
     }
   }
@@ -630,6 +643,7 @@ var _Aggregator = class {
       `bridge开始, user=${params.user}, bridgeType=${params.bridgeType}, token=${params.tokenAddress}, amountInWei=${params.amountInWei}, destChain=${params.destChain}, useBundle=${useBundle}`
     );
     const startTs = Date.now();
+    let txHash;
     try {
       const { pureTxReq, bundleBlockCount } = this.stripCustomFields(txReq, params.chain);
       txReq = pureTxReq;
@@ -661,7 +675,7 @@ var _Aggregator = class {
       try {
         estimateGas = await aggregator.bridge.estimateGas(params.user, bridgeArgs, estimationOverrides);
       } catch (error) {
-        _Aggregator.traceLog(params.chain, "error", `bridge estimateGas失败, error=${error}`);
+        _Aggregator.traceLog(params.chain, "error", `bridge estimateGas失败, rpcUrl=${this.getRpcUrl(params.chain)}, error=${error}`);
         throw error;
       }
       txReq = this.resolveGasLimit(txReq, estimateGas);
@@ -671,19 +685,24 @@ var _Aggregator = class {
       if (useBundle) {
         const iface = new import_ethers.ethers.Interface(import_aggregator.default);
         const calldata = iface.encodeFunctionData("bridge", [params.user, bridgeArgs]);
-        const { receipt: flashbotsReceipt, txHash, targetBlocks } = await this.submitBundleTx(params.chain, wallet, txReq, aggregatorAddress, calldata, txReq.value ?? 0n, bundleBlockCount);
+        const {
+          receipt: flashbotsReceipt,
+          txHash: bundleTxHash,
+          targetBlocks
+        } = await this.submitBundleTx(params.chain, wallet, txReq, aggregatorAddress, calldata, txReq.value ?? 0n, bundleBlockCount);
+        txHash = bundleTxHash;
         if (!flashbotsReceipt) {
-          throw new import_types.BundleNotIncludedError(`Bundle 未在目标区块上链, txHash=${txHash}, targetBlocks=[${targetBlocks.join(",")}]`, txHash);
+          throw new import_types.BundleNotIncludedError(`Bundle 未在目标区块上链, txHash=${bundleTxHash}, targetBlocks=[${targetBlocks.join(",")}]`, bundleTxHash);
+        }
+        if (flashbotsReceipt.status === 0) {
+          throw new import_types.TransactionRevertedError(flashbotsReceipt.hash, flashbotsReceipt.gasUsed);
         }
         txReceipt = flashbotsReceipt;
       } else {
         txReceipt = await this.sendContractTx(params.chain, aggregator, "bridge", [params.user, bridgeArgs], txReq);
+        txHash = txReceipt.hash;
       }
-      _Aggregator.traceLog(
-        params.chain,
-        "log",
-        `bridge完成, txHash=${txReceipt.hash}, useBundle=${useBundle}, 总耗时=${Date.now() - startTs}ms`
-      );
+      _Aggregator.traceLog(params.chain, "log", `bridge完成, txHash=${txReceipt.hash}, useBundle=${useBundle}, 总耗时=${Date.now() - startTs}ms`);
       return {
         fromToken: params.tokenAddress,
         toToken: params.tokenAddress,
@@ -693,7 +712,7 @@ var _Aggregator = class {
         to: txReceipt.to ?? ""
       };
     } catch (error) {
-      _Aggregator.traceLog(params.chain, "error", `bridge异常, 总耗时=${Date.now() - startTs}ms, error=${error}`);
+      _Aggregator.traceLog(params.chain, "error", `bridge异常, rpcUrl=${this.getRpcUrl(params.chain)}, txHash=${txHash ?? "N/A"}, 总耗时=${Date.now() - startTs}ms, error=${error}`);
       throw error;
     }
   }
@@ -862,17 +881,87 @@ var _Aggregator = class {
     }
     return null;
   }
+  broadcastToAll(chain, signedTx, txHash, providers) {
+    for (const { provider, label } of providers) {
+      const sendTs = Date.now();
+      provider.broadcastTransaction(signedTx).then(
+        () => _Aggregator.traceLog(chain, "log", `广播${label} OK, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`),
+        (err) => {
+          const msg = (err == null ? void 0 : err.message) ?? String(err);
+          if (msg.includes("already known") || msg.includes("nonce too low") || msg.includes("nonce has already been used") || msg.includes("ALREADY_EXISTS") || msg.includes("NONCE_EXPIRED")) {
+            _Aggregator.traceLog(chain, "log", `广播${label} already-known, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
+          } else {
+            _Aggregator.traceLog(chain, "warn", `广播${label} 失败: ${msg}, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
+          }
+        }
+      );
+    }
+  }
+  raceForReceipt(chain, txHash, providers, ownedProviders = [], timeoutMs = _Aggregator.TX_CONFIRM_TIMEOUT_MS) {
+    return new Promise((resolve, reject) => {
+      let settled = false;
+      const blockHandlers = [];
+      const cleanup = () => {
+        for (const { provider, handler } of blockHandlers) {
+          provider.off("block", handler);
+        }
+        for (const p of ownedProviders) {
+          try {
+            p.destroy();
+          } catch {
+          }
+        }
+      };
+      const onFound = (receipt, label) => {
+        if (settled)
+          return;
+        settled = true;
+        clearTimeout(timer);
+        cleanup();
+        _Aggregator.traceLog(chain, "log", `${label} 先查到receipt, txHash=${txHash}, block=${receipt.blockNumber}`);
+        resolve(receipt);
+      };
+      const checkReceipt = (provider, label) => {
+        if (settled)
+          return;
+        provider.getTransactionReceipt(txHash).then(
+          (r) => {
+            if (r)
+              onFound(r, label);
+          },
+          () => {
+          }
+        );
+      };
+      for (const { provider, label } of providers) {
+        const handler = () => checkReceipt(provider, label);
+        provider.on("block", handler);
+        blockHandlers.push({ provider, handler });
+        checkReceipt(provider, label);
+      }
+      const timer = setTimeout(() => {
+        if (settled)
+          return;
+        settled = true;
+        cleanup();
+        reject(new Error(`Transaction not confirmed within ${timeoutMs}ms: ${txHash}`));
+      }, timeoutMs);
+    });
+  }
   async sendContractTx(chain, contract, method, args, txReq) {
     const extraUrls = this.broadcastRpcsMap.get(chain);
     if (!extraUrls || extraUrls.length === 0) {
       _Aggregator.traceLog(chain, "log", `渠道=单RPC直发, method=${method}, nonce=${txReq.nonce}, gasLimit=${txReq.gasLimit}`);
       const sendTs = Date.now();
-      const txResponse2 = await contract[method](...args, txReq);
-      _Aggregator.traceLog(chain, "log", `单RPC已发送, txHash=${txResponse2.hash}, 耗时=${Date.now() - sendTs}ms`);
-      const receipt2 = await txResponse2.wait();
+      const txResponse = await contract[method](...args, txReq);
+      _Aggregator.traceLog(chain, "log", `单RPC已发送, txHash=${txResponse.hash}, 耗时=${Date.now() - sendTs}ms`);
+      const receipt2 = await txResponse.wait();
       const singleProvider = this.providerClient.getProvider(chain);
       const blockTs2 = await this.getBlockTimestampStr(singleProvider, receipt2.blockNumber);
-      _Aggregator.traceLog(chain, "log", `单RPC上链确认, txHash=${receipt2.hash}, blockNumber=${receipt2.blockNumber}, 出块时间=${blockTs2}, gasUsed=${receipt2.gasUsed}`);
+      _Aggregator.traceLog(chain, "log", `单RPC上链确认, txHash=${receipt2.hash}, blockNumber=${receipt2.blockNumber}, 出块时间=${blockTs2}, gasUsed=${receipt2.gasUsed}, status=${receipt2.status}`);
+      if (receipt2.status === 0) {
+        throw new import_types.TransactionRevertedError(receipt2.hash, receipt2.gasUsed);
+      }
       return receipt2;
     }
     const wallet = this.providerClient.getWallet(chain);
@@ -882,68 +971,31 @@ var _Aggregator = class {
     populated.chainId = network.chainId;
     const signedTx = await wallet.signTransaction(populated);
     const txHash = import_ethers.ethers.keccak256(signedTx);
-    const provider = wallet.provider;
-    const currentBlock = await provider.getBlockNumber();
+    const mainProvider = wallet.provider;
+    const currentBlock = await mainProvider.getBlockNumber();
+    const extraProviders = extraUrls.map((url, i) => ({
+      provider: new import_ethers.ethers.JsonRpcProvider(url),
+      label: `RPC[${i + 1}/${new URL(url).hostname}]`
+    }));
+    const allProviders = [{ provider: mainProvider, label: "RPC[0/主]" }, ...extraProviders];
+    const ownedProviders = extraProviders.map((e) => e.provider);
     _Aggregator.traceLog(
       chain,
       "log",
-      `渠道=多RPC广播, method=${method}, nonce=${txReq.nonce}, gasLimit=${txReq.gasLimit}, 当前区块=${currentBlock}, 期望上链区块=${currentBlock + 1}, txHash=${txHash}, 主RPC=1, 额外RPC=${extraUrls.length}`
+      `渠道=多RPC广播, method=${method}, nonce=${txReq.nonce}, gasLimit=${txReq.gasLimit}, 当前区块=${currentBlock}, 期望上链区块=${currentBlock + 1}, txHash=${txHash}, RPC数量=${allProviders.length}(主1+副${extraUrls.length})`
     );
-    const broadcastToExtra = (url, index) => {
-      const label = `extra[${index}]`;
-      const rpc = new import_ethers.ethers.JsonRpcProvider(url);
-      const sendTs = Date.now();
-      rpc.broadcastTransaction(signedTx).then(
-        () => _Aggregator.traceLog(chain, "log", `广播${label} OK, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`),
-        (err) => {
-          const msg = (err == null ? void 0 : err.message) ?? String(err);
-          if (msg.includes("already known") || msg.includes("nonce too low") || msg.includes("ALREADY_EXISTS") || msg.includes("nonce has already been used")) {
-            _Aggregator.traceLog(chain, "log", `广播${label} already known, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
-          } else {
-            _Aggregator.traceLog(chain, "warn", `广播${label} 失败: ${msg}, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
-          }
-        }
-      );
-    };
-    const mainSendTs = Date.now();
-    extraUrls.forEach((url, i) => broadcastToExtra(url, i));
-    let txResponse;
-    try {
-      txResponse = await provider.broadcastTransaction(signedTx);
-      _Aggregator.traceLog(chain, "log", `广播主RPC已发送, txHash=${txHash}, 耗时=${Date.now() - mainSendTs}ms`);
-    } catch (err) {
-      const msg = (err == null ? void 0 : err.message) ?? String(err);
-      if (msg.includes("already known") || msg.includes("nonce too low") || msg.includes("ALREADY_EXISTS") || msg.includes("nonce has already been used")) {
-        _Aggregator.traceLog(chain, "log", `广播主RPC already known (可能额外RPC已上链), txHash=${txHash}, 耗时=${Date.now() - mainSendTs}ms, 开始轮询receipt`);
-        const existingReceipt = await provider.getTransactionReceipt(txHash);
-        if (existingReceipt) {
-          _Aggregator.traceLog(chain, "log", `交易已上链, txHash=${txHash}, blockNumber=${existingReceipt.blockNumber}`);
-          const blockTs2 = await this.getBlockTimestampStr(provider, existingReceipt.blockNumber);
-          _Aggregator.traceLog(
-            chain,
-            "log",
-            `多RPC广播上链确认, txHash=${existingReceipt.hash}, blockNumber=${existingReceipt.blockNumber}, 出块时间=${blockTs2}, gasUsed=${existingReceipt.gasUsed}, 总耗时=${Date.now() - mainSendTs}ms`
-          );
-          return existingReceipt;
-        }
-        txResponse = await provider.getTransaction(txHash);
-        if (!txResponse) {
-          throw new Error(`Transaction not found after broadcast error: ${txHash}`);
-        }
-      } else {
-        _Aggregator.traceLog(chain, "error", `广播主RPC失败: ${msg}, txHash=${txHash}, 耗时=${Date.now() - mainSendTs}ms`);
-        throw err;
-      }
-    }
-    const receipt = await txResponse.wait();
-    if (!receipt)
-      throw new Error(`Transaction receipt is null: ${txHash}`);
-    const blockTs = await this.getBlockTimestampStr(provider, receipt.blockNumber);
+    const broadcastTs = Date.now();
+    this.broadcastToAll(chain, signedTx, txHash, allProviders);
+    const receipt = await this.raceForReceipt(chain, txHash, allProviders, ownedProviders);
+    const blockTs = await this.getBlockTimestampStr(mainProvider, receipt.blockNumber);
     _Aggregator.traceLog(
       chain,
       "log",
-      `多RPC广播上链确认, txHash=${receipt.hash}, blockNumber=${receipt.blockNumber}, 出块时间=${blockTs}, gasUsed=${receipt.gasUsed}, 总耗时=${Date.now() - mainSendTs}ms`
+      `多RPC广播上链确认, txHash=${receipt.hash}, blockNumber=${receipt.blockNumber}, 出块时间=${blockTs}, gasUsed=${receipt.gasUsed}, status=${receipt.status}, 总耗时=${Date.now() - broadcastTs}ms`
     );
+    if (receipt.status === 0) {
+      throw new import_types.TransactionRevertedError(receipt.hash, receipt.gasUsed);
+    }
     return receipt;
   }
   async submitBundleTx(chain, wallet, txReq, to, data, value, bundleBlockCount) {
@@ -973,10 +1025,7 @@ var _Aggregator = class {
       baseTx.gasPrice = txReq.gasPrice;
       baseTx.type = 0;
     }
-    const [signTx, currentBlock] = await Promise.all([
-      wallet.signTransaction(baseTx),
-      provider.getBlockNumber()
-    ]);
+    const [signTx, currentBlock] = await Promise.all([wallet.signTransaction(baseTx), provider.getBlockNumber()]);
     const rawTxs = [signTx];
     const txHash = import_ethers.ethers.keccak256(rawTxs[0]);
     const normalizedBundleBlockCount = this.normalizeBundleBlockCount(bundleBlockCount);
@@ -1019,11 +1068,7 @@ var _Aggregator = class {
     const [receipt] = await Promise.all([
       inclusionPromise,
       Promise.all(fireAndForget).then(() => {
-        _Aggregator.traceLog(
-          chain,
-          "log",
-          `Bundle发送完成, 成功=${totalSent}, 失败=${totalFailed}, 总请求=${fireAndForget.length}, 耗时=${Date.now() - sendBundleTs}ms, txHash=${txHash}`
-        );
+        _Aggregator.traceLog(chain, "log", `Bundle发送完成, 成功=${totalSent}, 失败=${totalFailed}, 总请求=${fireAndForget.length}, 耗时=${Date.now() - sendBundleTs}ms, txHash=${txHash}`);
         if (totalSent === 0)
           abortController.abort();
       })
@@ -1036,11 +1081,7 @@ var _Aggregator = class {
         `Bundle上链确认, txHash=${receipt.hash}, blockNumber=${receipt.blockNumber}, 出块时间=${blockTs}, gasUsed=${receipt.gasUsed}, 等待耗时=${Date.now() - waitTs}ms`
       );
     } else {
-      _Aggregator.traceLog(
-        chain,
-        "warn",
-        `Bundle未在目标区块上链, txHash=${txHash}, 目标区块=[${targetBlocks.join(",")}], 等待耗时=${Date.now() - waitTs}ms`
-      );
+      _Aggregator.traceLog(chain, "warn", `Bundle未在目标区块上链, txHash=${txHash}, 目标区块=[${targetBlocks.join(",")}], 等待耗时=${Date.now() - waitTs}ms`);
     }
     return { receipt, txHash, targetBlocks };
   }
@@ -1061,7 +1102,7 @@ var _Aggregator = class {
     try {
       estimateGas = await aggregator.swap.estimateGas(params.user, params.amountInWei, swapParams, params.minAmountOutList, estimationOverrides);
     } catch (error) {
-      _Aggregator.traceLog(params.chain, "error", `swapByFlashbots estimateGas失败, error=${error}`);
+      _Aggregator.traceLog(params.chain, "error", `swapByFlashbots estimateGas失败, rpcUrl=${this.getRpcUrl(params.chain)}, error=${error}`);
       throw error;
     }
     _Aggregator.traceLog(params.chain, "log", `swapByFlashbots estimateGas=${estimateGas}`);
@@ -1124,6 +1165,10 @@ var _Aggregator = class {
     }
     return tx;
   }
+  getRpcUrl(chain) {
+    var _a;
+    return ((_a = this.config.rpc[chain]) == null ? void 0 : _a.url) ?? "unknown";
+  }
   validateParams(params) {
     if (!params.chain)
       throw new Error("Chain not found");
@@ -1169,6 +1214,7 @@ Aggregator.DEFAULT_ETH_BUILDERS = {
   tbuilder: "https://relay.tbuilder.xyz",
   bobabuilder: "https://relay.boba-builder.com"
 };
+Aggregator.TX_CONFIRM_TIMEOUT_MS = 12e4;
 Aggregator.BUNDLE_POLL_INTERVAL_MS = 500;
 Aggregator.BUNDLE_INCLUSION_TIMEOUT_MS = 3e4;
 var aggregator_default = Aggregator;

package/dist/cjs/aggregator.d.ts

@@ -50,9 +50,12 @@ 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 waitForBundleInclusion;
+    private broadcastToAll;
+    private raceForReceipt;
     private sendContractTx;
     private submitBundleTx;
     private swapByFlashbots;
@@ -60,6 +63,7 @@ declare class Aggregator {
     private resolveNonce;
     private resolvePricing;
     private sanitizePricing;
+    private getRpcUrl;
     private validateParams;
     private shouldUseBundle;
     private stripCustomFields;

package/dist/cjs/index.cjs

@@ -40,6 +40,7 @@ __export(src_exports, {
   LayerZeroV1ChainNameMap: () => import_types.LayerZeroV1ChainNameMap,
   LayerZeroV2ChainIdMap: () => import_types.LayerZeroV2ChainIdMap,
   LayerZeroV2ChainNameMap: () => import_types.LayerZeroV2ChainNameMap,
+  TransactionRevertedError: () => import_types2.TransactionRevertedError,
   default: () => src_default
 });
 module.exports = __toCommonJS(src_exports);
@@ -144,5 +145,6 @@ var src_default = Hermes;
   LayerZeroV1ChainIdMap,
   LayerZeroV1ChainNameMap,
   LayerZeroV2ChainIdMap,
-  LayerZeroV2ChainNameMap
+  LayerZeroV2ChainNameMap,
+  TransactionRevertedError
 });

package/dist/cjs/index.d.ts

@@ -2,8 +2,8 @@ import type { HermesTxRequest, IBatchMultiSwapParams, IBatchExpectParams, ISwapB
 import { ChainNameEnum, AddressConst, DexType, BridgeType, IEstimateType, LayerZeroV1ChainIdMap, LayerZeroV1ChainNameMap, LayerZeroV2ChainIdMap, LayerZeroV2ChainNameMap } from './types.js';
 import { TransactionRequest } from 'ethers';
 export type { HermesTxRequest, IBatchMultiSwapAndBridgeParams, IExpectSplitOrderParams, IExpectSplitOrderResp, IMultiSwapParams, IBatchMultiSwapParams, IBatchExpectParams, IBatchReceipt, ISwapByPathParams as ISwapParams, IBridgeParams, ISwapAndBridgeParams, IReceipt, IConfig, IBuilderConfig, IExpectPayload, IRouterPath, SupportContracts, IHermesSignalResponse, IHermesSignalRoute, };
-import { BundleNotIncludedError } from './types.js';
-export { ChainNameEnum, AddressConst, DexType, BridgeType, IEstimateType, LayerZeroV1ChainIdMap, LayerZeroV1ChainNameMap, LayerZeroV2ChainIdMap, LayerZeroV2ChainNameMap, BundleNotIncludedError };
+import { BundleNotIncludedError, TransactionRevertedError } from './types.js';
+export { ChainNameEnum, AddressConst, DexType, BridgeType, IEstimateType, LayerZeroV1ChainIdMap, LayerZeroV1ChainNameMap, LayerZeroV2ChainIdMap, LayerZeroV2ChainNameMap, BundleNotIncludedError, TransactionRevertedError };
 declare class Hermes {
     private readonly config;
     private readonly providerClient;

package/dist/cjs/types.cjs

@@ -28,7 +28,8 @@ __export(types_exports, {
   LayerZeroV1ChainIdMap: () => LayerZeroV1ChainIdMap,
   LayerZeroV1ChainNameMap: () => LayerZeroV1ChainNameMap,
   LayerZeroV2ChainIdMap: () => LayerZeroV2ChainIdMap,
-  LayerZeroV2ChainNameMap: () => LayerZeroV2ChainNameMap
+  LayerZeroV2ChainNameMap: () => LayerZeroV2ChainNameMap,
+  TransactionRevertedError: () => TransactionRevertedError
 });
 module.exports = __toCommonJS(types_exports);
 var import_lz_definitions = require("@layerzerolabs/lz-definitions");
@@ -1050,6 +1051,14 @@ var BundleNotIncludedError = class extends Error {
     this.txHash = txHash;
   }
 };
+var TransactionRevertedError = class extends Error {
+  constructor(txHash, gasUsed) {
+    super(`Transaction reverted: ${txHash}, gasUsed=${gasUsed}`);
+    this.name = "TransactionRevertedError";
+    this.txHash = txHash;
+    this.gasUsed = gasUsed;
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AddressConst,
@@ -1061,5 +1070,6 @@ var BundleNotIncludedError = class extends Error {
   LayerZeroV1ChainIdMap,
   LayerZeroV1ChainNameMap,
   LayerZeroV2ChainIdMap,
-  LayerZeroV2ChainNameMap
+  LayerZeroV2ChainNameMap,
+  TransactionRevertedError
 });

package/dist/cjs/types.d.ts

@@ -516,3 +516,8 @@ export declare class BundleNotIncludedError extends Error {
     readonly txHash: string;
     constructor(message: string, txHash: string);
 }
+export declare class TransactionRevertedError extends Error {
+    readonly txHash: string;
+    readonly gasUsed: bigint;
+    constructor(txHash: string, gasUsed: bigint);
+}

package/dist/esm/aggregator.d.ts

@@ -50,9 +50,12 @@ 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 waitForBundleInclusion;
+    private broadcastToAll;
+    private raceForReceipt;
     private sendContractTx;
     private submitBundleTx;
     private swapByFlashbots;
@@ -60,6 +63,7 @@ declare class Aggregator {
     private resolveNonce;
     private resolvePricing;
     private sanitizePricing;
+    private getRpcUrl;
     private validateParams;
     private shouldUseBundle;
     private stripCustomFields;