hermes-swap 0.6.4 → 0.6.6

package/dist/cjs/aggregator.cjs

@@ -43,6 +43,7 @@ var _Aggregator = class {
   constructor(config, providerClient, quoterClient) {
     this.builderConfigMap = /* @__PURE__ */ new Map();
     this.broadcastRpcsMap = /* @__PURE__ */ new Map();
+    this.sequencerRpcsMap = /* @__PURE__ */ new Map();
     this.aggregatorAddressMap = /* @__PURE__ */ new Map();
     this.aggregatorMap = /* @__PURE__ */ new Map();
     this.config = config;
@@ -52,16 +53,17 @@ var _Aggregator = class {
     if (config.flashbotSigner) {
       this.flashbotSigner = new import_ethers.ethers.Wallet(config.flashbotSigner);
     }
-    if (config.builderConfig) {
-      for (const [chainName, builderCfg] of Object.entries(config.builderConfig)) {
-        this.builderConfigMap.set(chainName, builderCfg);
+    for (const [chainName, builderCfg] of Object.entries(config.builderConfig ?? {})) {
+      this.builderConfigMap.set(chainName, builderCfg);
+    }
+    for (const [chainName, urls] of Object.entries(config.broadcastRpcs ?? {})) {
+      if (urls.length > 0) {
+        this.broadcastRpcsMap.set(chainName, urls);
       }
     }
-    if (config.broadcastRpcs) {
-      for (const [chainName, urls] of Object.entries(config.broadcastRpcs)) {
-        if (urls.length > 0) {
-          this.broadcastRpcsMap.set(chainName, urls);
-        }
+    for (const [chainName, url] of Object.entries(this.getSequencerRpcs(config))) {
+      if (url) {
+        this.sequencerRpcsMap.set(chainName, url);
       }
     }
     for (const [chainName, aggregatorAddress] of Object.entries(config.aggregatorAddress)) {
@@ -116,6 +118,15 @@ var _Aggregator = class {
     }
     throw new Error(`No builder config for chain: ${chain}`);
   }
+  getSequencerRpcs(config) {
+    const merged = {
+      ..._Aggregator.DEFAULT_SEQUENCER_RPC_BY_CHAIN
+    };
+    for (const [chainName, url] of Object.entries(config.sequencerRpcs ?? {})) {
+      merged[chainName] = url;
+    }
+    return merged;
+  }
   buildBundleRequestBody(builderCfg, rawTxs, targetBlock) {
     const method = builderCfg.method ?? "eth_sendBundle";
     if (builderCfg.blockParamStyle === "decimal") {
@@ -863,6 +874,9 @@ 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;
     while (Date.now() < deadline) {
@@ -881,21 +895,31 @@ 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")) {
+  async sendSignedTxToChannels(chain, signedTx, txHash, channels) {
+    const results = await Promise.all(
+      channels.map(async ({ label, send }) => {
+        var _a, _b, _c, _d, _e;
+        const sendTs = Date.now();
+        try {
+          await send();
+          _Aggregator.traceLog(chain, "log", `广播${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)) {
             _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`);
+            return { label, ok: true };
           }
+          _Aggregator.traceLog(chain, "warn", `广播${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) {
     return new Promise((resolve, reject) => {
@@ -948,17 +972,66 @@ var _Aggregator = class {
       }, timeoutMs);
     });
   }
+  buildSequencerChannel(chain, signedTx) {
+    const sequencerUrl = _Aggregator.SEQUENCER_CHAINS.has(chain) ? this.sequencerRpcsMap.get(chain) : void 0;
+    if (!sequencerUrl)
+      return null;
+    return {
+      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 }
+        );
+        if ((_a = resp.data) == null ? void 0 : _a.error) {
+          throw new Error(resp.data.error.message ?? JSON.stringify(resp.data.error));
+        }
+        return resp;
+      }
+    };
+  }
   async sendContractTx(chain, contract, method, args, txReq) {
     const extraUrls = this.broadcastRpcsMap.get(chain);
+    const hasSequencer = _Aggregator.SEQUENCER_CHAINS.has(chain) && this.sequencerRpcsMap.has(chain);
     if (!extraUrls || extraUrls.length === 0) {
-      _Aggregator.traceLog(chain, "log", `渠道=单RPC直发, method=${method}, nonce=${txReq.nonce}, gasLimit=${txReq.gasLimit}`);
-      const sendTs = Date.now();
-      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}, status=${receipt2.status}`);
+      if (!hasSequencer) {
+        _Aggregator.traceLog(chain, "log", `渠道=单RPC直发, method=${method}, nonce=${txReq.nonce}, gasLimit=${txReq.gasLimit}`);
+        const sendTs = Date.now();
+        const txResponse = await contract[method](...args, txReq);
+        _Aggregator.traceLog(chain, "log", `单RPC已发送, txHash=${txResponse.hash}, 耗时=${Date.now() - sendTs}ms`);
+        const receipt3 = await txResponse.wait();
+        const singleProvider = this.providerClient.getProvider(chain);
+        const blockTs3 = await this.getBlockTimestampStr(singleProvider, receipt3.blockNumber);
+        _Aggregator.traceLog(chain, "log", `单RPC上链确认, txHash=${receipt3.hash}, blockNumber=${receipt3.blockNumber}, 出块时间=${blockTs3}, gasUsed=${receipt3.gasUsed}, status=${receipt3.status}`);
+        if (receipt3.status === 0) {
+          throw new import_types.TransactionRevertedError(receipt3.hash, receipt3.gasUsed);
+        }
+        return receipt3;
+      }
+      _Aggregator.traceLog(chain, "log", `渠道=单RPC+排序器直发, method=${method}, nonce=${txReq.nonce}, gasLimit=${txReq.gasLimit}`);
+      const wallet2 = this.providerClient.getWallet(chain);
+      const populated2 = await contract[method].populateTransaction(...args, txReq);
+      delete populated2.from;
+      const network2 = await wallet2.provider.getNetwork();
+      populated2.chainId = network2.chainId;
+      const signedTx2 = await wallet2.signTransaction(populated2);
+      const txHash2 = import_ethers.ethers.keccak256(signedTx2);
+      const mainProvider2 = wallet2.provider;
+      _Aggregator.traceLog(chain, "log", `单RPC+排序器并行广播, txHash=${txHash2}`);
+      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 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`);
       if (receipt2.status === 0) {
         throw new import_types.TransactionRevertedError(receipt2.hash, receipt2.gasUsed);
       }
@@ -982,11 +1055,17 @@ var _Aggregator = class {
     _Aggregator.traceLog(
       chain,
       "log",
-      `渠道=多RPC广播, method=${method}, nonce=${txReq.nonce}, gasLimit=${txReq.gasLimit}, 当前区块=${currentBlock}, 期望上链区块=${currentBlock + 1}, txHash=${txHash}, RPC数量=${allProviders.length}(主1+副${extraUrls.length})`
+      `渠道=多RPC广播, method=${method}, nonce=${txReq.nonce}, gasLimit=${txReq.gasLimit}, 当前区块=${currentBlock}, 期望上链区块=${currentBlock + 1}, txHash=${txHash}, RPC数量=${allProviders.length}(主1+副${extraUrls.length})${hasSequencer ? ", +排序器直发" : ""}`
     );
     const broadcastTs = Date.now();
-    this.broadcastToAll(chain, signedTx, txHash, allProviders);
-    const receipt = await this.raceForReceipt(chain, txHash, allProviders, ownedProviders);
+    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);
+    await this.sendSignedTxToChannels(chain, signedTx, txHash, channels);
+    const receipt = await receiptPromise;
     const blockTs = await this.getBlockTimestampStr(mainProvider, receipt.blockNumber);
     _Aggregator.traceLog(
       chain,
@@ -1225,6 +1304,14 @@ Aggregator.DEFAULT_ETH_BUILDERS = {
   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.TX_CONFIRM_TIMEOUT_MS = 12e4;
 Aggregator.BUNDLE_POLL_INTERVAL_MS = 500;
 Aggregator.BUNDLE_INCLUSION_TIMEOUT_MS = 3e4;

package/dist/cjs/aggregator.d.ts

@@ -10,17 +10,21 @@ declare class Aggregator {
     private readonly flashbotSigner?;
     private readonly builderConfigMap;
     private readonly broadcastRpcsMap;
+    private readonly sequencerRpcsMap;
     private aggregatorAddressMap;
     private aggregatorMap;
     private static traceLog;
     private static formatBlockTimestamp;
     private getBlockTimestampStr;
     private static readonly DEFAULT_ETH_BUILDERS;
+    private static readonly DEFAULT_SEQUENCER_RPC_BY_CHAIN;
+    private static readonly SEQUENCER_CHAINS;
     constructor(config: IConfig, providerClient?: Provider, quoterClient?: Quoter);
     getAggregator(chain: ChainNameEnum): Contract;
     getAggregatorAddress(chain: ChainNameEnum): string;
     signRequestBody(body: unknown, signer: ethers.Wallet): Promise<string>;
     private getBuilderConfig;
+    private getSequencerRpcs;
     private buildBundleRequestBody;
     sendBundle(chain: ChainNameEnum, rawTxs: string[], targetBlock: number, signer?: ethers.Wallet): Promise<{
         sent: number;
@@ -53,9 +57,11 @@ declare class Aggregator {
     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 waitForBundleInclusion;
-    private broadcastToAll;
+    private sendSignedTxToChannels;
     private raceForReceipt;
+    private buildSequencerChannel;
     private sendContractTx;
     private submitBundleTx;
     private swapByFlashbots;

package/dist/cjs/quoter.cjs

@@ -76,7 +76,13 @@ var Quoter = class {
     var _a, _b, _c, _d;
     try {
       const res = await import_axios.default.get(`${this.hermesSignalDomain}/api/v1/quote-best`, {
-        params: { chain: params.chain, fromToken: params.fromTokenAddress, toToken: params.toTokenAddress, amountInWei: params.amountInWei.toString() }
+        params: {
+          chain: params.chain,
+          fromToken: params.fromTokenAddress,
+          toToken: params.toTokenAddress,
+          amountInWei: params.amountInWei.toString(),
+          ...params.blockNumber ? { blockNumber: params.blockNumber } : {}
+        }
       });
       const raw = res.data;
       if (raw.code !== 200) {

package/dist/cjs/types.d.ts

@@ -14,6 +14,7 @@ export interface IConfig {
     flashbotSigner?: string;
     builderConfig?: Record<string, IBuilderConfig>;
     broadcastRpcs?: Record<string, string[]>;
+    sequencerRpcs?: Record<string, string>;
 }
 export interface IExpectByPathParams {
     chain: ChainNameEnum;
@@ -25,6 +26,7 @@ export interface IExpectSplitOrderParams {
     amountInWei: bigint;
     fromTokenAddress: string;
     toTokenAddress: string;
+    blockNumber?: number;
 }
 export interface IExpectSplitOrderResp {
     routePath: IRouterPath[];

package/dist/esm/aggregator.d.ts

@@ -10,17 +10,21 @@ declare class Aggregator {
     private readonly flashbotSigner?;
     private readonly builderConfigMap;
     private readonly broadcastRpcsMap;
+    private readonly sequencerRpcsMap;
     private aggregatorAddressMap;
     private aggregatorMap;
     private static traceLog;
     private static formatBlockTimestamp;
     private getBlockTimestampStr;
     private static readonly DEFAULT_ETH_BUILDERS;
+    private static readonly DEFAULT_SEQUENCER_RPC_BY_CHAIN;
+    private static readonly SEQUENCER_CHAINS;
     constructor(config: IConfig, providerClient?: Provider, quoterClient?: Quoter);
     getAggregator(chain: ChainNameEnum): Contract;
     getAggregatorAddress(chain: ChainNameEnum): string;
     signRequestBody(body: unknown, signer: ethers.Wallet): Promise<string>;
     private getBuilderConfig;
+    private getSequencerRpcs;
     private buildBundleRequestBody;
     sendBundle(chain: ChainNameEnum, rawTxs: string[], targetBlock: number, signer?: ethers.Wallet): Promise<{
         sent: number;
@@ -53,9 +57,11 @@ declare class Aggregator {
     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 waitForBundleInclusion;
-    private broadcastToAll;
+    private sendSignedTxToChannels;
     private raceForReceipt;
+    private buildSequencerChannel;
     private sendContractTx;
     private submitBundleTx;
     private swapByFlashbots;