hermes-swap 0.6.10 → 0.6.11

package/dist/cjs/aggregator.cjs

@@ -132,6 +132,15 @@ var _Aggregator = class {
     }
     throw new Error(`No builder config for chain: ${chain}`);
   }
+  getDefaultBundleBlockCount(chain) {
+    if (!chain)
+      return 1;
+    if (this.builderConfigMap.has(chain))
+      return 3;
+    if (chain === import_types.ChainNameEnum.ETH && this.flashbotSigner)
+      return 3;
+    return 1;
+  }
   getSequencerRpcs(config) {
     const merged = {
       ..._Aggregator.DEFAULT_SEQUENCER_RPC_BY_CHAIN
@@ -175,6 +184,16 @@ var _Aggregator = class {
       ]
     };
   }
+  static getJsonRpcErrorMessage(data) {
+    var _a;
+    if (!(data == null ? void 0 : data.error))
+      return null;
+    if (typeof data.error === "string")
+      return data.error;
+    if (typeof ((_a = data.error) == null ? void 0 : _a.message) === "string")
+      return data.error.message;
+    return JSON.stringify(data.error);
+  }
   async sendBundle(chain, rawTxs, targetBlock, signer) {
     const builderCfg = this.getBuilderConfig(chain);
     const body = this.buildBundleRequestBody(builderCfg, rawTxs, targetBlock);
@@ -190,6 +209,14 @@ var _Aggregator = class {
       const ts = Date.now();
       try {
         const response = await import_axios.default.post(url, body, { headers });
+        const rpcErrorMessage = _Aggregator.getJsonRpcErrorMessage(response.data);
+        if (rpcErrorMessage) {
+          failed++;
+          const detail2 = `[FAIL] ${name}: ${rpcErrorMessage}`;
+          details.push(detail2);
+          _Aggregator.traceLog(chain, "error", `Builder[${name}] 发送失败, targetBlock=${targetBlock}, 耗时=${Date.now() - ts}ms, error=${rpcErrorMessage}, resp=${JSON.stringify(response.data)}`);
+          return;
+        }
         sent++;
         const detail = `[OK] ${name}`;
         details.push(detail);
@@ -555,7 +582,14 @@ var _Aggregator = class {
         }
         receipt = flashbotsReceipt;
       } else {
-        receipt = await this.sendContractTx(params.chain, aggregator, "multiSwap", [params.user, params.amountInWeis, swapParamsList, params.minAmountOutLists, params.totalMinAmountOut], txReq, traceReq);
+        receipt = await this.sendContractTx(
+          params.chain,
+          aggregator,
+          "multiSwap",
+          [params.user, params.amountInWeis, swapParamsList, params.minAmountOutLists, params.totalMinAmountOut],
+          txReq,
+          traceReq
+        );
         txHash = receipt.hash;
       }
       let amountOutList = null;
@@ -971,9 +1005,12 @@ var _Aggregator = class {
       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);
+      const normalizedHash = txHash.toLowerCase();
+      const transactions = block.prefetchedTransactions ?? block.transactions;
+      return transactions.some((tx) => {
+        const hash = typeof tx === "string" ? tx : tx.hash;
+        return (hash == null ? void 0 : hash.toLowerCase()) === normalizedHash;
+      });
     } catch {
       return false;
     }
@@ -1019,10 +1056,23 @@ var _Aggregator = class {
         cleanup();
         resolve(receipt);
       };
+      const finishWithFallbackCheck = async () => {
+        if (settled)
+          return;
+        try {
+          const receipt = await provider.getTransactionReceipt(txHash);
+          if (receipt && targetBlockSet.has(receipt.blockNumber)) {
+            finish(receipt);
+            return;
+          }
+        } catch {
+        }
+        finish(null);
+      };
       const scheduleInspect = (fromBlock, toBlock) => {
         if (fromBlock > toBlock) {
           if (checkedBlocks.size === targetBlockSet.size && lastObservedBlock >= maxTargetBlock) {
-            finish(null);
+            finishWithFallbackCheck();
           }
           return;
         }
@@ -1052,7 +1102,7 @@ var _Aggregator = class {
           return;
         }
         if (checkedBlocks.size === targetBlockSet.size && lastObservedBlock >= maxTargetBlock) {
-          finish(null);
+          finishWithFallbackCheck();
         }
       };
       const onBlock = (blockNumber) => {
@@ -1065,7 +1115,7 @@ var _Aggregator = class {
         }
         if (fromBlock > toBlock) {
           if (checkedBlocks.size === targetBlockSet.size && lastObservedBlock >= maxTargetBlock) {
-            finish(null);
+            finishWithFallbackCheck();
           }
           return;
         }
@@ -1083,7 +1133,8 @@ var _Aggregator = class {
         const toBlock = Math.min(latestBlock, maxTargetBlock);
         scheduleInspect(sortedTargetBlocks[0], toBlock);
         await inspectionChain;
-        finish(null);
+        if (!settled)
+          await finishWithFallbackCheck();
       }, _Aggregator.BUNDLE_INCLUSION_TIMEOUT_MS);
       provider.on("block", onBlock);
       provider.getBlockNumber().then(
@@ -1299,7 +1350,7 @@ var _Aggregator = class {
   }
   async submitBundleTx(chain, wallet, txReq, to, data, value, bundleBlockCount, traceReq) {
     if (bundleBlockCount == null) {
-      bundleBlockCount = this.builderConfigMap.has(chain) ? 3 : 1;
+      bundleBlockCount = this.getDefaultBundleBlockCount(chain);
     }
     const builderCfg = this.getBuilderConfig(chain);
     if (builderCfg.authType === "flashbots" && !this.flashbotSigner) {
@@ -1354,12 +1405,36 @@ var _Aggregator = class {
             const ts = Date.now();
             try {
               const response = await import_axios.default.post(url, body, { headers, timeout: 3e3 });
+              const rpcErrorMessage = _Aggregator.getJsonRpcErrorMessage(response.data);
+              if (rpcErrorMessage) {
+                totalFailed++;
+                this.trace(
+                  chain,
+                  traceReq,
+                  "error",
+                  "hermes-submitBundleTx-builder-失败",
+                  `Builder[${name}] mev_sendBundle 发送失败, targetBlocks=[${targetBlocks.join(",")}], 耗时=${Date.now() - ts}ms, error=${rpcErrorMessage}, resp=${JSON.stringify(response.data)}`
+                );
+                return;
+              }
               totalSent++;
-              this.trace(chain, traceReq, "log", "hermes-submitBundleTx-builder-成功", `Builder[${name}] mev_sendBundle 发送成功, targetBlocks=[${targetBlocks.join(",")}], 耗时=${Date.now() - ts}ms, resp=${JSON.stringify(response.data)}`);
+              this.trace(
+                chain,
+                traceReq,
+                "log",
+                "hermes-submitBundleTx-builder-成功",
+                `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);
-              this.trace(chain, traceReq, "error", "hermes-submitBundleTx-builder-失败", `Builder[${name}] mev_sendBundle 发送失败, targetBlocks=[${targetBlocks.join(",")}], 耗时=${Date.now() - ts}ms, error=${msg}`);
+              this.trace(
+                chain,
+                traceReq,
+                "error",
+                "hermes-submitBundleTx-builder-失败",
+                `Builder[${name}] mev_sendBundle 发送失败, targetBlocks=[${targetBlocks.join(",")}], 耗时=${Date.now() - ts}ms, error=${msg}`
+              );
             }
           })()
         ];
@@ -1373,6 +1448,18 @@ var _Aggregator = class {
         const ts = Date.now();
         try {
           const response = await import_axios.default.post(url, body, { headers, timeout: 3e3 });
+          const rpcErrorMessage = _Aggregator.getJsonRpcErrorMessage(response.data);
+          if (rpcErrorMessage) {
+            totalFailed++;
+            this.trace(
+              chain,
+              traceReq,
+              "error",
+              "hermes-submitBundleTx-builder-失败",
+              `Builder[${name}] 发送失败, targetBlock=${block}, 耗时=${Date.now() - ts}ms, error=${rpcErrorMessage}, resp=${JSON.stringify(response.data)}`
+            );
+            return;
+          }
           totalSent++;
           this.trace(chain, traceReq, "log", "hermes-submitBundleTx-builder-成功", `Builder[${name}] 发送成功, targetBlock=${block}, 耗时=${Date.now() - ts}ms, resp=${JSON.stringify(response.data)}`);
         } catch (error) {
@@ -1410,13 +1497,7 @@ var _Aggregator = class {
         `Bundle上链确认, txHash=${receipt.hash}, blockNumber=${receipt.blockNumber}, 出块时间=${blockTs}, gasUsed=${receipt.gasUsed}, 等待耗时=${Date.now() - waitTs}ms`
       );
     } else {
-      this.trace(
-        chain,
-        traceReq,
-        "warn",
-        "hermes-submitBundleTx-等待结束",
-        `Bundle未在目标区块上链, txHash=${txHash}, 目标区块=[${targetBlocks.join(",")}], 等待耗时=${Date.now() - waitTs}ms`
-      );
+      this.trace(chain, traceReq, "warn", "hermes-submitBundleTx-等待结束", `Bundle未在目标区块上链, txHash=${txHash}, 目标区块=[${targetBlocks.join(",")}], 等待耗时=${Date.now() - waitTs}ms`);
     }
     return { receipt, txHash, targetBlocks };
   }
@@ -1517,7 +1598,7 @@ var _Aggregator = class {
     return chain === import_types.ChainNameEnum.ETH && !!this.flashbotSigner;
   }
   stripCustomFields(txReq, chain) {
-    const defaultBlockCount = chain && this.builderConfigMap.has(chain) ? 3 : 1;
+    const defaultBlockCount = this.getDefaultBundleBlockCount(chain);
     const { useBundle, bundleBlockCount = defaultBlockCount, trace, ...pureTxReq } = txReq;
     return { pureTxReq, bundleBlockCount: this.normalizeBundleBlockCount(bundleBlockCount) };
   }
@@ -1552,11 +1633,23 @@ var Aggregator = _Aggregator;
 Aggregator.DEFAULT_ETH_BUILDERS = {
   "beaverbuild.org": "https://rpc.beaverbuild.org",
   Titan: "https://rpc.titanbuilder.xyz",
+  "Titan-EU": "https://eu.rpc.titanbuilder.xyz",
   flashbots: "https://relay.flashbots.net",
   // bloXroute: 'https://mev.api.blxrbdn.com', // 旧 api.blxrbdn.com 也行，需配置 Authorization 头
-  lightspeedbuilder: "https://rpc.lightspeedbuilder.info"
+  "Builder+": "https://rpc.btcs.com",
+  // BTCS 官方文档支持 eth_sendBundle
+  turbobuilder: "https://rpc.turbobuilder.xyz",
+  // 官方文档支持 eth_sendBundle
+  lightspeedbuilder: "https://rpc.lightspeedbuilder.info",
   // 新增，实测直接可用
-  // buildernet: 'https://rpc.buildernet.org', // 新增，Flashbots 生态，需签名头（同 flashbots 格式）
+  buildernet: "https://rpc.buildernet.org",
+  // Flashbots 生态，使用 eth_sendBundle + X-Flashbots-Signature
+  quasar: "https://rpc.quasar.win",
+  // Quasar 文档支持 eth_sendBundle，认证沿用 X-Flashbots-Signature
+  bananabuild: "https://rpc.bananabuild.org",
+  // 官方文档支持 eth_sendBundle
+  snailbuilder: "https://rpc.snailbuilder.sh"
+  // 官网声明支持 Flashbots 同结构 bundle API
   // nfactorial: 'https://rpc.nfactorial.xyz', // 新增，支持 bundle rebate
 };
 Aggregator.DEFAULT_SEQUENCER_RPC_BY_CHAIN = {

package/dist/cjs/aggregator.d.ts

@@ -26,9 +26,11 @@ declare class Aggregator {
     getAggregatorAddress(chain: ChainNameEnum): string;
     signRequestBody(body: unknown, signer: ethers.Wallet): Promise<string>;
     private getBuilderConfig;
+    private getDefaultBundleBlockCount;
     private getSequencerRpcs;
     private buildBundleRequestBody;
     private buildFlashbotsMevBundleRequestBody;
+    private static getJsonRpcErrorMessage;
     sendBundle(chain: ChainNameEnum, rawTxs: string[], targetBlock: number, signer?: ethers.Wallet): Promise<{
         sent: number;
         failed: number;

package/dist/cjs/index.cjs

@@ -125,6 +125,9 @@ var Hermes = class {
   async getQuoterSupportContracts(chain) {
     return this.quoterClient.getQuoterSupportContracts(chain);
   }
+  destroy() {
+    this.providerClient.destroy();
+  }
   /**
    * 生成 swapAndBridge 的 calldata
    */

package/dist/cjs/index.d.ts

@@ -56,6 +56,7 @@ declare class Hermes {
     estimateGas(estimateType: IEstimateType, params: IBridgeParams | ISwapByPathParams | ISwapAndBridgeParams | IBatchMultiSwapParams): Promise<bigint>;
     getAggregatorSupportContracts(chain: ChainNameEnum): Promise<SupportContracts[]>;
     getQuoterSupportContracts(chain: ChainNameEnum): Promise<SupportContracts[]>;
+    destroy(): void;
     /**
      * 生成 swapAndBridge 的 calldata
      */

package/dist/cjs/provider.cjs

@@ -62,6 +62,16 @@ var Provider = class {
     }
     return this.walletMap.get(chain);
   }
+  destroy() {
+    var _a;
+    for (const provider of this.providerMap.values()) {
+      const rpcProvider = provider;
+      try {
+        (_a = rpcProvider.destroy) == null ? void 0 : _a.call(rpcProvider);
+      } catch {
+      }
+    }
+  }
 };
 var provider_default = Provider;
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/provider.d.ts

@@ -8,6 +8,7 @@ declare class Provider {
     getProvider(chain: ChainNameEnum): ethers.Provider;
     checkIsEnoughToken(fromTokenAddress: string, userAddress: string, amountInWei: bigint, aggregatorAddress: string, wallet: ethers.Wallet): Promise<void>;
     getWallet(chain: ChainNameEnum): ethers.Wallet;
+    destroy(): void;
 }
 export default Provider;
 export { Provider };

package/dist/esm/aggregator.d.ts

@@ -26,9 +26,11 @@ declare class Aggregator {
     getAggregatorAddress(chain: ChainNameEnum): string;
     signRequestBody(body: unknown, signer: ethers.Wallet): Promise<string>;
     private getBuilderConfig;
+    private getDefaultBundleBlockCount;
     private getSequencerRpcs;
     private buildBundleRequestBody;
     private buildFlashbotsMevBundleRequestBody;
+    private static getJsonRpcErrorMessage;
     sendBundle(chain: ChainNameEnum, rawTxs: string[], targetBlock: number, signer?: ethers.Wallet): Promise<{
         sent: number;
         failed: number;