@hyperbridge/simplex 0.17.0 → 0.17.1

package/dist/index.cjs

@@ -625,6 +625,20 @@ var ConfirmationPolicy = class {
 // src/core/filler.ts
 var import_p_queue = __toESM(require("p-queue"), 1);
 
+// src/config/bundlers.ts
+var HYPERBRIDGE_BUNDLER_URLS = {
+  1: "https://bundler.polytope.technology/ethereum",
+  56: "https://bundler.polytope.technology/bsc",
+  97: "https://bundler.polytope.technology/bsc-chapel",
+  137: "https://bundler.polytope.technology/polygon",
+  8453: "https://bundler.polytope.technology/base",
+  42161: "https://bundler.polytope.technology/arbitrum",
+  80002: "https://bundler.polytope.technology/polygon-amoy"
+};
+function hyperbridgeBundlerUrl(chainId) {
+  return HYPERBRIDGE_BUNDLER_URLS[chainId];
+}
+
 // src/config/asset-registry.ts
 var import_viem = require("viem");
 var BUILTIN_ASSETS = {
@@ -1245,7 +1259,7 @@ async function resolveChainConfigs(chains, options = {}) {
           "RPC endpoint could not report its chainId at startup; keeping it for the quorum to judge per call"
         );
       }
-      return { chainId: first.chainId, rpcUrls, bundlerUrl: chain.bundlerUrl };
+      return { chainId: first.chainId, rpcUrls, bundlerUrl: hyperbridgeBundlerUrl(first.chainId) };
     })
   );
 }
@@ -1314,12 +1328,6 @@ var FillerConfigService = class {
     }
     this.rpcOverrides.set(chainId, validateRpcUrls(rpcUrls));
   }
-  setBundlerUrl(chainId, bundlerUrl) {
-    if (!this.rpcOverrides.has(chainId)) {
-      throw new Error(`Chain ${chainId} is not configured`);
-    }
-    this.bundlerUrls.set(chainId, bundlerUrl);
-  }
   /** Replaces the rebalancing config at runtime; trigger checks read it live. */
   setRebalancing(rebalancing) {
     if (this.fillerConfig) this.fillerConfig.rebalancing = rebalancing;
@@ -1681,9 +1689,6 @@ function validateConfig(config, cliWatchOnly = false) {
     if (!Array.isArray(chain.rpcUrls) || chain.rpcUrls.length === 0 || chain.rpcUrls.some((u) => !u)) {
       throw new Error("Each chain configuration must have rpcUrls (a non-empty array of strings)");
     }
-    if (!chain.bundlerUrl) {
-      throw new Error("Each chain configuration must have bundlerUrl");
-    }
   }
   const concurrent = config.simplex.maxConcurrentOrders;
   if (concurrent !== void 0) {
@@ -2545,13 +2550,6 @@ var FREE_RPC_URLS = {
     "https://arb1.arbitrum.io/rpc"
   ]
 };
-var HYPERBRIDGE_BUNDLER_URLS = {
-  1: "https://bundler.polytope.technology/ethereum",
-  56: "https://bundler.polytope.technology/bsc",
-  137: "https://bundler.polytope.technology/polygon",
-  8453: "https://bundler.polytope.technology/base",
-  42161: "https://bundler.polytope.technology/arbitrum"
-};
 var CHAIN_NATIVE_SYMBOLS = {
   1: "ETH",
   56: "BNB",
@@ -2653,7 +2651,8 @@ var INIT_CHAINS = [
     label: "Polygon Amoy",
     network: "testnet",
     alchemySubdomain: "polygon-amoy",
-    explorerUrl: external_links_default.chainExplorers.polygonAmoy
+    explorerUrl: external_links_default.chainExplorers.polygonAmoy,
+    hyperbridgeBundlerUrl: HYPERBRIDGE_BUNDLER_URLS[80002]
   },
   {
     chainId: 97,
@@ -2661,7 +2660,8 @@ var INIT_CHAINS = [
     label: "BSC Chapel",
     network: "testnet",
     alchemySubdomain: "bnb-testnet",
-    explorerUrl: external_links_default.chainExplorers.bnbChapel
+    explorerUrl: external_links_default.chainExplorers.bnbChapel,
+    hyperbridgeBundlerUrl: HYPERBRIDGE_BUNDLER_URLS[97]
   }
 ];
 function chainByChainId(chainId) {
@@ -4458,80 +4458,6 @@ async function patchRuntimeState(store, patch) {
   return next;
 }
 
-// src/services/bundler-preflight.ts
-var BUNDLER_PREFLIGHT_TIMEOUT_MS = 1e4;
-async function assertBundlersServeEntryPoint(chains, configService, options = {}) {
-  const timeoutMs = options.timeoutMs ?? BUNDLER_PREFLIGHT_TIMEOUT_MS;
-  const logger = moduleLogger(configService.loggers, "bundler-preflight");
-  const failures = await Promise.all(
-    chains.map(async ({ chainId, bundlerUrl }) => {
-      if (options.watchOnly?.[chainId] === true) return void 0;
-      if (!bundlerUrl?.trim()) return void 0;
-      const entryPoint = configService.getEntryPointAddress(formatChainKey(chainId));
-      if (!entryPoint) return void 0;
-      return checkBundler(chainId, bundlerUrl.trim(), entryPoint, timeoutMs, logger);
-    })
-  );
-  const messages = failures.filter((failure) => failure !== void 0);
-  if (messages.length > 0) throw new Error(messages.join("; "));
-}
-function servesEntryPoint(listed, entryPoint) {
-  return Array.isArray(listed) && listed.some((address) => String(address).toLowerCase() === entryPoint.toLowerCase());
-}
-function describeEntryPoints(listed) {
-  return Array.isArray(listed) && listed.length > 0 ? listed.map(String).join(", ") : "none";
-}
-function bundlerHost(url) {
-  try {
-    return new URL(url).host || "an unparseable URL";
-  } catch {
-    return "an unparseable URL";
-  }
-}
-function chainName(chainId) {
-  const label = chainByChainId(chainId)?.label;
-  return label ? `${label} (${formatChainKey(chainId)})` : formatChainKey(chainId);
-}
-async function checkBundler(chainId, bundlerUrl, entryPoint, timeoutMs, logger) {
-  const host = bundlerHost(bundlerUrl);
-  const subject = `Bundler ${host} for ${chainName(chainId)}`;
-  const signal = AbortSignal.timeout(timeoutMs);
-  let listed;
-  try {
-    listed = await supportedEntryPoints(bundlerUrl, signal);
-  } catch (err) {
-    const reason = signal.aborted ? `timed out after ${timeoutMs}ms` : errorReason(err);
-    logger.warn(
-      { chain: formatChainKey(chainId), bundler: host },
-      `${subject} did not answer eth_supportedEntryPoints: ${reason.split(bundlerUrl).join(host)}. Continuing without confirming it serves EntryPoint ${entryPoint}`
-    );
-    return void 0;
-  }
-  if (servesEntryPoint(listed, entryPoint)) return void 0;
-  return `${subject} does not support EntryPoint ${entryPoint}; it lists ${describeEntryPoints(listed)}`;
-}
-async function supportedEntryPoints(bundlerUrl, signal) {
-  const response = await fetch(bundlerUrl, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "eth_supportedEntryPoints", params: [] }),
-    signal
-  });
-  if (!response.ok) throw new Error(`HTTP ${response.status}`);
-  const json = await response.json();
-  if (json.error) throw new Error(json.error.message ?? JSON.stringify(json.error));
-  const { result } = json;
-  if (!Array.isArray(result) || !result.every((address) => typeof address === "string")) {
-    throw new Error("the result is not a list of addresses");
-  }
-  return result;
-}
-function errorReason(err) {
-  if (!(err instanceof Error)) return String(err);
-  const { cause } = err;
-  return cause instanceof Error ? `${err.message} (${cause.message})` : err.message;
-}
-
 // src/services/wallet/mpcvault.ts
 var import_viem7 = require("viem");
 var grpc = __toESM(require("@grpc/grpc-js"), 1);
@@ -19996,7 +19922,7 @@ var UserOpSender = class {
     let auth;
     let fees;
     try {
-      fees = await this.getGasPrice(bundlerUrl, publicClient, chainId);
+      fees = await this.getGasPrice(bundlerUrl, publicClient);
       const gasForPrefund = gas ?? {
         verificationGasLimit: FALLBACK_VERIFICATION_GAS_LIMIT,
         callGasLimit: FALLBACK_CALL_GAS_LIMIT,
@@ -20151,48 +20077,26 @@ var UserOpSender = class {
     return userOp;
   }
   /**
-   * Mirrors the gas-price selection used by the delegation and fill paths: Pimlico's and
-   * Alchemy's own pricing, otherwise the chain's gas price raised to the priority fee a
-   * rundler bundler requires, when the bundler gives one.
+   * Prices the op for the rundler bundler, as the fill path does: its suggested fees, or the
+   * chain's gas price raised to the priority fee it requires where it suggests none.
    */
-  async getGasPrice(bundlerUrl, publicClient, chainId) {
-    const lower = bundlerUrl.toLowerCase();
-    if (lower.includes("pimlico.io")) {
-      const res = await this.sendBundlerRpc(
-        bundlerUrl,
-        import_sdk8.BundlerMethod.PIMLICO_GET_USER_OPERATION_GAS_PRICE,
-        []
-      );
-      return { maxFeePerGas: BigInt(res.fast.maxFeePerGas), maxPriorityFeePerGas: BigInt(res.fast.maxPriorityFeePerGas) };
-    }
-    if (lower.includes("alchemy.com")) {
-      const [rundlerPriorityFee2, latestBlock2] = await Promise.all([
-        this.sendBundlerRpc(bundlerUrl, import_sdk8.BundlerMethod.RUNDLER_MAX_PRIORITY_FEE_PER_GAS, []),
-        publicClient.getBlock({ blockTag: "latest" })
-      ]);
-      const baseFeePerGas = latestBlock2.baseFeePerGas ?? await publicClient.getGasPrice();
-      const isArbitrum = BigInt(chainId) === 42161n;
-      const prioBump = isArbitrum ? 0n : 25n;
-      const maxPriorityFeePerGas = BigInt(rundlerPriorityFee2) + BigInt(rundlerPriorityFee2) * prioBump / 100n;
-      const bufferedBaseFee = baseFeePerGas + baseFeePerGas * 50n / 100n;
-      return { maxFeePerGas: bufferedBaseFee + maxPriorityFeePerGas, maxPriorityFeePerGas };
-    }
-    const [gasPrice, rundlerPriorityFee] = await Promise.all([
+  async getGasPrice(bundlerUrl, publicClient) {
+    const [gasPrice, latestBlock] = await Promise.all([
       publicClient.getGasPrice(),
-      (0, import_sdk8.fetchRundlerPriorityFee)(bundlerUrl)
+      publicClient.getBlock({ blockTag: "latest" })
     ]);
-    const fees = {
-      maxFeePerGas: gasPrice + gasPrice * MAX_FEE_BUMP_PERCENT / 100n,
-      maxPriorityFeePerGas: gasPrice + gasPrice * PRIORITY_FEE_BUMP_PERCENT / 100n
-    };
-    if (rundlerPriorityFee === null) return fees;
-    const latestBlock = await publicClient.getBlock({ blockTag: "latest" });
-    return (0, import_sdk8.applyRundlerPriorityFee)(fees, {
-      rundlerPriorityFee,
-      baseFeePerGas: latestBlock.baseFeePerGas ?? gasPrice,
-      priorityFeeBumpPercent: PRIORITY_FEE_BUMP_PERCENT,
-      maxFeeBumpPercent: MAX_FEE_BUMP_PERCENT
-    });
+    return (0, import_sdk8.rundlerUserOperationFees)(
+      bundlerUrl,
+      {
+        maxFeePerGas: gasPrice + gasPrice * MAX_FEE_BUMP_PERCENT / 100n,
+        maxPriorityFeePerGas: gasPrice + gasPrice * PRIORITY_FEE_BUMP_PERCENT / 100n
+      },
+      {
+        baseFeePerGas: latestBlock.baseFeePerGas ?? gasPrice,
+        priorityFeeBumpPercent: PRIORITY_FEE_BUMP_PERCENT,
+        maxFeeBumpPercent: MAX_FEE_BUMP_PERCENT
+      }
+    );
   }
   async sendBundlerRpc(bundlerUrl, method, params) {
     const response = await fetch(bundlerUrl, {
@@ -21004,7 +20908,7 @@ var BinanceRebalancer = class {
 // src/services/rebalancers/cctp.ts
 var import_bridge_kit = require("@circle-fin/bridge-kit");
 var import_adapter_viem_v2 = require("@circle-fin/adapter-viem-v2");
-var import_chains2 = require("@circle-fin/bridge-kit/chains");
+var import_chains = require("@circle-fin/bridge-kit/chains");
 var import_sdk11 = require("@hyperbridge/sdk");
 var CHAIN_ID_TO_CCTP = {
   1: "Ethereum",
@@ -21057,18 +20961,18 @@ var CctpRebalancer = class {
       {
         addressContext: "user-controlled",
         supportedChains: [
-          import_chains2.Ethereum,
-          import_chains2.EthereumSepolia,
-          import_chains2.Arbitrum,
-          import_chains2.ArbitrumSepolia,
-          import_chains2.Base,
-          import_chains2.BaseSepolia,
-          import_chains2.Optimism,
-          import_chains2.OptimismSepolia,
-          import_chains2.Polygon,
-          import_chains2.PolygonAmoy,
-          import_chains2.Unichain,
-          import_chains2.UnichainSepolia
+          import_chains.Ethereum,
+          import_chains.EthereumSepolia,
+          import_chains.Arbitrum,
+          import_chains.ArbitrumSepolia,
+          import_chains.Base,
+          import_chains.BaseSepolia,
+          import_chains.Optimism,
+          import_chains.OptimismSepolia,
+          import_chains.Polygon,
+          import_chains.PolygonAmoy,
+          import_chains.Unichain,
+          import_chains.UnichainSepolia
         ]
       }
     );
@@ -23913,6 +23817,82 @@ var TokenSender = class {
   }
 };
 
+// src/services/bundler-preflight.ts
+var BUNDLER_PREFLIGHT_TIMEOUT_MS = 1e4;
+async function assertBundlersServeEntryPoint(chains, configService, options = {}) {
+  const timeoutMs = options.timeoutMs ?? BUNDLER_PREFLIGHT_TIMEOUT_MS;
+  const logger = moduleLogger(configService.loggers, "bundler-preflight");
+  const failures = await Promise.all(
+    chains.map(async ({ chainId, bundlerUrl }) => {
+      if (options.watchOnly?.[chainId] === true) return void 0;
+      if (!bundlerUrl?.trim()) {
+        return `Hyperbridge runs no bundler for ${chainName(chainId)}, so simplex cannot fill there; set it watch-only`;
+      }
+      const entryPoint = configService.getEntryPointAddress(formatChainKey(chainId));
+      if (!entryPoint) return void 0;
+      return checkBundler(chainId, bundlerUrl.trim(), entryPoint, timeoutMs, logger);
+    })
+  );
+  const messages = failures.filter((failure) => failure !== void 0);
+  if (messages.length > 0) throw new Error(messages.join("; "));
+}
+function servesEntryPoint(listed, entryPoint) {
+  return Array.isArray(listed) && listed.some((address) => String(address).toLowerCase() === entryPoint.toLowerCase());
+}
+function describeEntryPoints(listed) {
+  return Array.isArray(listed) && listed.length > 0 ? listed.map(String).join(", ") : "none";
+}
+function bundlerHost(url) {
+  try {
+    return new URL(url).host || "an unparseable URL";
+  } catch {
+    return "an unparseable URL";
+  }
+}
+function chainName(chainId) {
+  const label = chainByChainId(chainId)?.label;
+  return label ? `${label} (${formatChainKey(chainId)})` : formatChainKey(chainId);
+}
+async function checkBundler(chainId, bundlerUrl, entryPoint, timeoutMs, logger) {
+  const host = bundlerHost(bundlerUrl);
+  const subject = `Bundler ${host} for ${chainName(chainId)}`;
+  const signal = AbortSignal.timeout(timeoutMs);
+  let listed;
+  try {
+    listed = await supportedEntryPoints(bundlerUrl, signal);
+  } catch (err) {
+    const reason = signal.aborted ? `timed out after ${timeoutMs}ms` : errorReason(err);
+    logger.warn(
+      { chain: formatChainKey(chainId), bundler: host },
+      `${subject} did not answer eth_supportedEntryPoints: ${reason.split(bundlerUrl).join(host)}. Continuing without confirming it serves EntryPoint ${entryPoint}`
+    );
+    return void 0;
+  }
+  if (servesEntryPoint(listed, entryPoint)) return void 0;
+  return `${subject} does not support EntryPoint ${entryPoint}; it lists ${describeEntryPoints(listed)}`;
+}
+async function supportedEntryPoints(bundlerUrl, signal) {
+  const response = await fetch(bundlerUrl, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ jsonrpc: "2.0", id: 1, method: "eth_supportedEntryPoints", params: [] }),
+    signal
+  });
+  if (!response.ok) throw new Error(`HTTP ${response.status}`);
+  const json = await response.json();
+  if (json.error) throw new Error(json.error.message ?? JSON.stringify(json.error));
+  const { result } = json;
+  if (!Array.isArray(result) || !result.every((address) => typeof address === "string")) {
+    throw new Error("the result is not a list of addresses");
+  }
+  return result;
+}
+function errorReason(err) {
+  if (!(err instanceof Error)) return String(err);
+  const { cause } = err;
+  return cause instanceof Error ? `${err.message} (${cause.message})` : err.message;
+}
+
 // src/orderbook/lifecycle.ts
 var EXPIRY_SWEEP_MS = 3e4;
 var LimitOrderLifecycle = class {
@@ -25989,7 +25969,7 @@ var OrderScanner = class _OrderScanner {
   async addChainNow(chain) {
     if (this.closed) throw new Error("This OrderScanner is closed");
     const rpcUrls = validateRpcUrls(chain.rpcUrls);
-    const chainId = chain.chainId ?? (await resolveChainConfigs([{ rpcUrls, bundlerUrl: chain.bundlerUrl ?? "" }], {
+    const chainId = chain.chainId ?? (await resolveChainConfigs([{ rpcUrls }], {
       loggers: this.loggers,
       tolerateUnreachable: true
     }))[0].chainId;
@@ -26421,10 +26401,7 @@ var ChainController = class {
   async add(chain) {
     return this.serialise(async () => {
       validateRpcUrls(chain.rpcUrls);
-      if (!chain.bundlerUrl?.trim()) {
-        throw new Error("A bundler URL is required to submit fill UserOperations");
-      }
-      const [resolved] = await resolveChainConfigs([{ rpcUrls: chain.rpcUrls, bundlerUrl: chain.bundlerUrl }]);
+      const [resolved] = await resolveChainConfigs([{ rpcUrls: chain.rpcUrls }]);
       const { chainId } = resolved;
       const { configService, config, intentFiller } = this.runtime;
       if (configService.getConfiguredChainIds().includes(chainId)) {
@@ -26453,7 +26430,7 @@ var ChainController = class {
       if (watchOnly) intentFiller.setWatchOnly(chainId, true);
       try {
         if (!inScanner) {
-          await this.scanner.addChain({ rpcUrls: chain.rpcUrls, bundlerUrl: chain.bundlerUrl, chainId });
+          await this.scanner.addChain({ rpcUrls: chain.rpcUrls, chainId });
         }
         this.runtime.chainClientManager.invalidate(formatChainKey(chainId));
         await intentFiller.addChain(configService.getChainConfig(formatChainKey(chainId)));
@@ -26470,7 +26447,7 @@ var ChainController = class {
         this.runtime.confirmationPolicy.adopt(chainId, resolvedPolicy);
       }
       this.runtime.resolvedChains.push(resolved);
-      config.chains = [...config.chains, { rpcUrls: chain.rpcUrls, bundlerUrl: chain.bundlerUrl }];
+      config.chains = [...config.chains, { rpcUrls: chain.rpcUrls }];
       if (Object.keys(confirmationPolicies).length > 0) config.confirmationPolicies = confirmationPolicies;
       this.syncWatchOnlyToConfig();
       await this.persist();
@@ -26515,9 +26492,7 @@ var ChainController = class {
       validateRpcUrls(rpcUrls);
       const index = this.runtime.resolvedChains.findIndex((chain) => chain.chainId === chainId);
       if (index < 0) throw new Error(`Chain ${chainId} is not configured`);
-      const [probed] = await resolveChainConfigs([
-        { rpcUrls, bundlerUrl: this.runtime.resolvedChains[index].bundlerUrl ?? "" }
-      ]);
+      const [probed] = await resolveChainConfigs([{ rpcUrls }]);
       if (probed.chainId !== chainId) {
         throw new Error(`Those endpoints answer for chain ${probed.chainId}, not ${chainId}`);
       }
@@ -26536,20 +26511,6 @@ var ChainController = class {
       await this.persist();
     });
   }
-  async setBundlerUrl(chainId, bundlerUrl) {
-    return this.serialise(async () => {
-      if (!bundlerUrl?.trim()) throw new Error("A bundler URL is required");
-      const index = this.runtime.resolvedChains.findIndex((chain) => chain.chainId === chainId);
-      if (index < 0) throw new Error(`Chain ${chainId} is not configured`);
-      await assertBundlersServeEntryPoint([{ chainId, bundlerUrl }], this.runtime.configService, {
-        watchOnly: this.runtime.intentFiller.getWatchOnly()
-      });
-      this.runtime.configService.setBundlerUrl(chainId, bundlerUrl);
-      this.runtime.resolvedChains[index].bundlerUrl = bundlerUrl;
-      this.runtime.config.chains[index].bundlerUrl = bundlerUrl;
-      await this.persist();
-    });
-  }
   /** Monitor without filling. Takes effect on the next order. */
   async setWatchOnly(chainId, watchOnly) {
     return this.serialise(async () => {