hermes-swap 0.6.11 → 0.7.1

package/dist/cjs/aggregator.cjs

@@ -1153,31 +1153,66 @@ var _Aggregator = class {
       );
     });
   }
-  async sendSignedTxToChannels(chain, signedTx, txHash, channels, traceReq) {
-    const results = await Promise.all(
-      channels.map(async ({ label, send }) => {
-        var _a, _b, _c, _d, _e;
+  async sendSignedTxToChannels(chain, signedTx, txHash, channels, traceReq, abortSignal) {
+    return await new Promise((resolve, reject) => {
+      let settled = false;
+      let finishedCount = 0;
+      const failures = [];
+      const cleanup = () => {
+        abortSignal == null ? void 0 : abortSignal.removeEventListener("abort", onAbort);
+      };
+      const finishResolve = () => {
+        if (settled)
+          return;
+        settled = true;
+        cleanup();
+        resolve();
+      };
+      const finishReject = () => {
+        if (settled)
+          return;
+        settled = true;
+        cleanup();
+        const detail = failures.map((result) => `${result.label}: ${result.msg ?? "unknown error"}`).join("; ");
+        reject(new Error(`All broadcast channels failed for ${txHash}: ${detail}`));
+      };
+      const onAbort = () => {
+        finishResolve();
+      };
+      if (abortSignal == null ? void 0 : abortSignal.aborted) {
+        finishResolve();
+        return;
+      }
+      abortSignal == null ? void 0 : abortSignal.addEventListener("abort", onAbort, { once: true });
+      for (const { label, send } of channels) {
         const sendTs = Date.now();
-        try {
-          await send();
-          this.trace(chain, traceReq, "log", "hermes-broadcast-channel-成功", `广播${label} OK, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
-          return { label, ok: true };
-        } catch (err) {
-          const msg = ((_c = (_b = (_a = err == null ? void 0 : err.response) == null ? void 0 : _a.data) == null ? void 0 : _b.error) == null ? void 0 : _c.message) ?? ((_e = (_d = err == null ? void 0 : err.response) == null ? void 0 : _d.data) == null ? void 0 : _e.message) ?? (err == null ? void 0 : err.message) ?? String(err);
-          if (_Aggregator.isBenignBroadcastError(msg)) {
-            this.trace(chain, traceReq, "log", "hermes-broadcast-channel-已存在", `广播${label} already-known, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
-            return { label, ok: true };
+        send(abortSignal).then(
+          () => {
+            if (settled || (abortSignal == null ? void 0 : abortSignal.aborted))
+              return;
+            this.trace(chain, traceReq, "log", "hermes-broadcast-channel-成功", `广播${label} OK, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
+            finishResolve();
+          },
+          (err) => {
+            var _a, _b, _c, _d, _e;
+            if (settled || (abortSignal == null ? void 0 : abortSignal.aborted))
+              return;
+            const msg = ((_c = (_b = (_a = err == null ? void 0 : err.response) == null ? void 0 : _a.data) == null ? void 0 : _b.error) == null ? void 0 : _c.message) ?? ((_e = (_d = err == null ? void 0 : err.response) == null ? void 0 : _d.data) == null ? void 0 : _e.message) ?? (err == null ? void 0 : err.message) ?? String(err);
+            if (_Aggregator.isBenignBroadcastError(msg)) {
+              this.trace(chain, traceReq, "log", "hermes-broadcast-channel-已存在", `广播${label} already-known, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
+              finishResolve();
+              return;
+            }
+            this.trace(chain, traceReq, "warn", "hermes-broadcast-channel-失败", `广播${label} 失败: ${msg}, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
+            failures.push({ label, msg });
+            finishedCount += 1;
+            if (finishedCount === channels.length) {
+              finishReject();
+            }
           }
-          this.trace(chain, traceReq, "warn", "hermes-broadcast-channel-失败", `广播${label} 失败: ${msg}, txHash=${txHash}, 耗时=${Date.now() - sendTs}ms`);
-          return { label, ok: false, msg };
-        }
-      })
-    );
-    if (results.some((result) => result.ok)) {
-      return;
-    }
-    const detail = results.map((result) => `${result.label}: ${result.msg ?? "unknown error"}`).join("; ");
-    throw new Error(`All broadcast channels failed for ${txHash}: ${detail}`);
+        );
+      }
+    });
   }
   raceForReceipt(chain, txHash, providers, ownedProviders = [], timeoutMs = _Aggregator.TX_CONFIRM_TIMEOUT_MS, traceReq) {
     return new Promise((resolve, reject) => {
@@ -1237,9 +1272,9 @@ var _Aggregator = class {
       return null;
     return {
       label: `Sequencer[${new URL(sequencerUrl).hostname}]`,
-      send: async () => {
+      send: async (signal) => {
         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, signal });
         if ((_a = resp.data) == null ? void 0 : _a.error) {
           throw new Error(resp.data.error.message ?? JSON.stringify(resp.data.error));
         }
@@ -1288,10 +1323,17 @@ var _Aggregator = class {
       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 receiptPromise2 = this.raceForReceipt(chain, txHash2, providers, [], _Aggregator.TX_CONFIRM_TIMEOUT_MS, traceReq);
-      await this.sendSignedTxToChannels(chain, signedTx2, txHash2, channels2, traceReq);
+      const broadcastAbortController2 = new AbortController();
+      const receiptPromise2 = this.raceForReceipt(chain, txHash2, providers, [], _Aggregator.TX_CONFIRM_TIMEOUT_MS, traceReq).finally(() => {
+        broadcastAbortController2.abort();
+      });
+      const broadcastPromise2 = this.sendSignedTxToChannels(chain, signedTx2, txHash2, channels2, traceReq, broadcastAbortController2.signal);
       this.trace(chain, traceReq, "log", "hermes-sendContractTx-等待确认", `并行广播后开始等待确认, txHash=${txHash2}`);
-      const receipt2 = await receiptPromise2;
+      const receipt2 = await Promise.race([
+        receiptPromise2,
+        broadcastPromise2.then(() => new Promise(() => {
+        }))
+      ]);
       const blockTs2 = await this.getBlockTimestampStr(mainProvider2, receipt2.blockNumber);
       this.trace(
         chain,
@@ -1330,11 +1372,18 @@ 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 receiptPromise = this.raceForReceipt(chain, txHash, allProviders, ownedProviders, _Aggregator.TX_CONFIRM_TIMEOUT_MS, traceReq);
+    const broadcastAbortController = new AbortController();
+    const receiptPromise = this.raceForReceipt(chain, txHash, allProviders, ownedProviders, _Aggregator.TX_CONFIRM_TIMEOUT_MS, traceReq).finally(() => {
+      broadcastAbortController.abort();
+    });
+    const broadcastPromise = this.sendSignedTxToChannels(chain, signedTx, txHash, channels, traceReq, broadcastAbortController.signal);
     this.trace(chain, traceReq, "log", "hermes-sendContractTx-RPC发送前", `多RPC广播准备发送, txHash=${txHash}`);
-    await this.sendSignedTxToChannels(chain, signedTx, txHash, channels, traceReq);
     this.trace(chain, traceReq, "log", "hermes-sendContractTx-等待确认", `多RPC广播后开始等待确认, txHash=${txHash}`);
-    const receipt = await receiptPromise;
+    const receipt = await Promise.race([
+      receiptPromise,
+      broadcastPromise.then(() => new Promise(() => {
+      }))
+    ]);
     const blockTs = await this.getBlockTimestampStr(mainProvider, receipt.blockNumber);
     this.trace(
       chain,
@@ -1393,6 +1442,7 @@ var _Aggregator = class {
     let totalSent = 0;
     let totalFailed = 0;
     const signer = builderCfg.authType === "flashbots" ? this.flashbotSigner : void 0;
+    const builderAbortController = new AbortController();
     const fireAndForget = builderEntries.flatMap(([name, url]) => {
       if (name === "flashbots" && builderCfg.authType === "flashbots" && signer) {
         return [
@@ -1404,7 +1454,9 @@ var _Aggregator = class {
             };
             const ts = Date.now();
             try {
-              const response = await import_axios.default.post(url, body, { headers, timeout: 3e3 });
+              const response = await import_axios.default.post(url, body, { headers, timeout: 3e3, signal: builderAbortController.signal });
+              if (builderAbortController.signal.aborted)
+                return;
               const rpcErrorMessage = _Aggregator.getJsonRpcErrorMessage(response.data);
               if (rpcErrorMessage) {
                 totalFailed++;
@@ -1418,6 +1470,8 @@ var _Aggregator = class {
                 return;
               }
               totalSent++;
+              if (builderAbortController.signal.aborted)
+                return;
               this.trace(
                 chain,
                 traceReq,
@@ -1426,6 +1480,8 @@ var _Aggregator = class {
                 `Builder[${name}] mev_sendBundle 发送成功, targetBlocks=[${targetBlocks.join(",")}], 耗时=${Date.now() - ts}ms, resp=${JSON.stringify(response.data)}`
               );
             } catch (error) {
+              if (builderAbortController.signal.aborted)
+                return;
               totalFailed++;
               const msg = (error == null ? void 0 : error.response) ? JSON.stringify(error.response.data) : (error == null ? void 0 : error.message) ?? String(error);
               this.trace(
@@ -1447,7 +1503,9 @@ var _Aggregator = class {
         }
         const ts = Date.now();
         try {
-          const response = await import_axios.default.post(url, body, { headers, timeout: 3e3 });
+          const response = await import_axios.default.post(url, body, { headers, timeout: 3e3, signal: builderAbortController.signal });
+          if (builderAbortController.signal.aborted)
+            return;
           const rpcErrorMessage = _Aggregator.getJsonRpcErrorMessage(response.data);
           if (rpcErrorMessage) {
             totalFailed++;
@@ -1461,32 +1519,47 @@ var _Aggregator = class {
             return;
           }
           totalSent++;
+          if (builderAbortController.signal.aborted)
+            return;
           this.trace(chain, traceReq, "log", "hermes-submitBundleTx-builder-成功", `Builder[${name}] 发送成功, targetBlock=${block}, 耗时=${Date.now() - ts}ms, resp=${JSON.stringify(response.data)}`);
         } catch (error) {
+          if (builderAbortController.signal.aborted)
+            return;
           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}] 发送失败, targetBlock=${block}, 耗时=${Date.now() - ts}ms, error=${msg}`);
         }
       });
     });
-    const abortController = new AbortController();
-    const inclusionPromise = this.waitForBundleInclusion(provider, txHash, targetBlocks, abortController.signal);
+    const inclusionAbortController = new AbortController();
+    const inclusionPromise = this.waitForBundleInclusion(provider, txHash, targetBlocks, inclusionAbortController.signal).finally(() => {
+      builderAbortController.abort();
+    });
     const waitTs = Date.now();
     this.trace(chain, traceReq, "log", "hermes-submitBundleTx-RPC发送前", `Bundle 请求开始发送, txHash=${txHash}, targetBlocks=[${targetBlocks.join(",")}]`);
-    const [receipt] = await Promise.all([
-      inclusionPromise,
-      Promise.all(fireAndForget).then(() => {
-        this.trace(
-          chain,
-          traceReq,
-          "log",
-          "hermes-submitBundleTx-RPC已发送",
-          `Bundle发送完成, 成功=${totalSent}, 失败=${totalFailed}, 总请求=${fireAndForget.length}, 耗时=${Date.now() - sendBundleTs}ms, txHash=${txHash}`
-        );
-        if (totalSent === 0)
-          abortController.abort();
-      })
+    const sendPromise = Promise.all(fireAndForget).then(() => {
+      this.trace(
+        chain,
+        traceReq,
+        "log",
+        "hermes-submitBundleTx-RPC已发送",
+        `Bundle发送完成, 成功=${totalSent}, 失败=${totalFailed}, 总请求=${fireAndForget.length}, 耗时=${Date.now() - sendBundleTs}ms, txHash=${txHash}`
+      );
+      return { totalSent, totalFailed };
+    });
+    const firstResult = await Promise.race([
+      inclusionPromise.then((receipt2) => ({ kind: "receipt", receipt: receipt2 })),
+      sendPromise.then((summary) => ({ kind: "sendDone", summary }))
     ]);
+    let receipt;
+    if (firstResult.kind === "receipt") {
+      receipt = firstResult.receipt;
+    } else {
+      if (firstResult.summary.totalSent === 0) {
+        inclusionAbortController.abort();
+      }
+      receipt = await inclusionPromise;
+    }
     if (receipt) {
       const blockTs = await this.getBlockTimestampStr(provider, receipt.blockNumber);
       this.trace(
@@ -1638,8 +1711,7 @@ Aggregator.DEFAULT_ETH_BUILDERS = {
   // bloXroute: 'https://mev.api.blxrbdn.com', // 旧 api.blxrbdn.com 也行，需配置 Authorization 头
   "Builder+": "https://rpc.btcs.com",
   // BTCS 官方文档支持 eth_sendBundle
-  turbobuilder: "https://rpc.turbobuilder.xyz",
-  // 官方文档支持 eth_sendBundle
+  // turbobuilder: 'https://rpc.turbobuilder.xyz', // 官方文档支持 eth_sendBundle
   lightspeedbuilder: "https://rpc.lightspeedbuilder.info",
   // 新增，实测直接可用
   buildernet: "https://rpc.buildernet.org",

package/dist/cjs/types.cjs

@@ -36,7 +36,9 @@ var import_lz_definitions = require("@layerzerolabs/lz-definitions");
 var DexType = /* @__PURE__ */ ((DexType2) => {
   DexType2["FX"] = "f(x)";
   DexType2["UNISWAPV2"] = "uniswapv2";
+  DexType2["SUSHIV2"] = "sushiv2";
   DexType2["UNISWAPV3"] = "uniswapv3";
+  DexType2["SUSHIV3"] = "sushiv3";
   DexType2["UNISWAPV4"] = "uniswapv4";
   DexType2["CURVE128"] = "curve128";
   DexType2["CURVE256"] = "curve256";
@@ -58,6 +60,58 @@ var DexType = /* @__PURE__ */ ((DexType2) => {
   DexType2["BLACKHOLEV3"] = "blackholev3";
   DexType2["BLACKHOLEV2"] = "blackholev2";
   DexType2["FLUID"] = "fluid";
+  DexType2["BANCOR"] = "bancor";
+  DexType2["ERC4626"] = "erc4626";
+  DexType2["DODOV2"] = "dodo-v2";
+  DexType2["AERODROMEV3"] = "aerodrome_v3";
+  DexType2["ALGEBRAINTEGRAL"] = "algebra_integral";
+  DexType2["AMBIENT"] = "ambient";
+  DexType2["ANGSTROM"] = "angstrom";
+  DexType2["APESWAP"] = "apeswap";
+  DexType2["ARCHLYV2"] = "archly_v2";
+  DexType2["BALANCER"] = "balancer";
+  DexType2["BALANCERV2"] = "balancer_v2";
+  DexType2["BALANCERV3"] = "balancer_v3";
+  DexType2["BANCORV2"] = "bancor_v2";
+  DexType2["BANCORV3"] = "bancor_v3";
+  DexType2["BASIN"] = "basin";
+  DexType2["BUNNIV2"] = "bunni_v2";
+  DexType2["CURVELENDINGPOOLS"] = "curve_lending_pools";
+  DexType2["CURVEMETAPOOL"] = "curve_metapool";
+  DexType2["CURVESTABLESWAP"] = "curve_stable_swap";
+  DexType2["CURVESTABLESWAPNG"] = "curve_stable_swap_ng";
+  DexType2["CURVETRICRYPTO"] = "curve_tricrypto";
+  DexType2["CURVETRICRYPTONG"] = "curve_tricrypto_ng";
+  DexType2["CURVETWOCRYPTO"] = "curve_twocrypto";
+  DexType2["CYPHERV2"] = "cypher_v2";
+  DexType2["DEFIPLAZA"] = "defiplaza";
+  DexType2["DFXV2"] = "dfx_v2";
+  DexType2["DODOV1"] = "dodo_v1";
+  DexType2["EKUBO"] = "ekubo";
+  DexType2["EMPIREDEX"] = "empiredex";
+  DexType2["EULERSWAP"] = "eulerswap";
+  DexType2["FLUIDDEXLITE"] = "fluid_dex_lite";
+  DexType2["FLUIDDEXT1"] = "fluid_dex_t1";
+  DexType2["INTEGRAL"] = "integral";
+  DexType2["JOEV2"] = "joe_v2";
+  DexType2["KYBERSWAPCLASSIC"] = "kyberswap_classic";
+  DexType2["KYBERSWAPELASTIC"] = "kyberswap_elastic";
+  DexType2["LISTADEX"] = "lista_dex";
+  DexType2["LUASWAP"] = "luaswap";
+  DexType2["MAVERICKV2"] = "maverick_v2";
+  DexType2["MOONISWAP"] = "mooniswap";
+  DexType2["PENDLEV2"] = "pendle_v2";
+  DexType2["RINGSWAP"] = "ring_swap";
+  DexType2["SADDLEFINANCE"] = "saddle_finance";
+  DexType2["SHIBASWAPV1"] = "shibaswap_v1";
+  DexType2["SMARDEX"] = "smardex";
+  DexType2["SOLIDLYV3"] = "solidly_v3";
+  DexType2["STABULL"] = "stabull";
+  DexType2["SUPERNOVABASIC"] = "supernova_basic";
+  DexType2["SWAPR"] = "swapr";
+  DexType2["UNISWAPV1"] = "uniswap_v1";
+  DexType2["WOMBAT"] = "wombat";
+  DexType2["YIELDBASIS"] = "yield_basis";
   return DexType2;
 })(DexType || {});
 var IEstimateType = /* @__PURE__ */ ((IEstimateType2) => {

package/dist/cjs/types.d.ts

@@ -172,7 +172,9 @@ export interface IHermesSignalQuoteBestData {
 export declare enum DexType {
     FX = "f(x)",
     UNISWAPV2 = "uniswapv2",
+    SUSHIV2 = "sushiv2",
     UNISWAPV3 = "uniswapv3",
+    SUSHIV3 = "sushiv3",
     UNISWAPV4 = "uniswapv4",
     CURVE128 = "curve128",
     CURVE256 = "curve256",
@@ -193,7 +195,59 @@ export declare enum DexType {
     SHADOWV2 = "shadowv2",
     BLACKHOLEV3 = "blackholev3",
     BLACKHOLEV2 = "blackholev2",
-    FLUID = "fluid"
+    FLUID = "fluid",
+    BANCOR = "bancor",
+    ERC4626 = "erc4626",
+    DODOV2 = "dodo-v2",
+    AERODROMEV3 = "aerodrome_v3",
+    ALGEBRAINTEGRAL = "algebra_integral",
+    AMBIENT = "ambient",
+    ANGSTROM = "angstrom",
+    APESWAP = "apeswap",
+    ARCHLYV2 = "archly_v2",
+    BALANCER = "balancer",
+    BALANCERV2 = "balancer_v2",
+    BALANCERV3 = "balancer_v3",
+    BANCORV2 = "bancor_v2",
+    BANCORV3 = "bancor_v3",
+    BASIN = "basin",
+    BUNNIV2 = "bunni_v2",
+    CURVELENDINGPOOLS = "curve_lending_pools",
+    CURVEMETAPOOL = "curve_metapool",
+    CURVESTABLESWAP = "curve_stable_swap",
+    CURVESTABLESWAPNG = "curve_stable_swap_ng",
+    CURVETRICRYPTO = "curve_tricrypto",
+    CURVETRICRYPTONG = "curve_tricrypto_ng",
+    CURVETWOCRYPTO = "curve_twocrypto",
+    CYPHERV2 = "cypher_v2",
+    DEFIPLAZA = "defiplaza",
+    DFXV2 = "dfx_v2",
+    DODOV1 = "dodo_v1",
+    EKUBO = "ekubo",
+    EMPIREDEX = "empiredex",
+    EULERSWAP = "eulerswap",
+    FLUIDDEXLITE = "fluid_dex_lite",
+    FLUIDDEXT1 = "fluid_dex_t1",
+    INTEGRAL = "integral",
+    JOEV2 = "joe_v2",
+    KYBERSWAPCLASSIC = "kyberswap_classic",
+    KYBERSWAPELASTIC = "kyberswap_elastic",
+    LISTADEX = "lista_dex",
+    LUASWAP = "luaswap",
+    MAVERICKV2 = "maverick_v2",
+    MOONISWAP = "mooniswap",
+    PENDLEV2 = "pendle_v2",
+    RINGSWAP = "ring_swap",
+    SADDLEFINANCE = "saddle_finance",
+    SHIBASWAPV1 = "shibaswap_v1",
+    SMARDEX = "smardex",
+    SOLIDLYV3 = "solidly_v3",
+    STABULL = "stabull",
+    SUPERNOVABASIC = "supernova_basic",
+    SWAPR = "swapr",
+    UNISWAPV1 = "uniswap_v1",
+    WOMBAT = "wombat",
+    YIELDBASIS = "yield_basis"
 }
 export declare enum IEstimateType {
     BRIDGE = "bridge",