@hyperbridge/simplex 0.17.0 → 0.17.1

package/dist/bin/simplex.js

@@ -235283,31 +235283,73 @@ function userOperationLogs(logs, entryPoint, userOpHash) {
   while (start >= 0 && !isBoundary(logs[start])) start--;
   return logs.slice(start + 1, end);
 }
-async function fetchRundlerPriorityFee(bundlerUrl) {
-  if (bundlersWithoutRundlerFees.has(bundlerUrl)) return null;
+async function rundlerRequest(bundlerUrl, method, unsupported) {
+  if (unsupported.has(bundlerUrl)) return null;
   try {
     const response = await fetch(bundlerUrl, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        jsonrpc: "2.0",
-        id: 1,
-        method: BundlerMethod.RUNDLER_MAX_PRIORITY_FEE_PER_GAS,
-        params: []
-      })
+      body: JSON.stringify({ jsonrpc: "2.0", id: 1, method, params: [] })
     });
     const { result, error } = await response.json();
     if (error) {
       if (error.code !== void 0 && UNSUPPORTED_REQUEST_CODES.has(error.code)) {
-        bundlersWithoutRundlerFees.add(bundlerUrl);
+        unsupported.add(bundlerUrl);
       }
       return null;
     }
+    return result ?? null;
+  } catch {
+    return null;
+  }
+}
+async function fetchRundlerPriorityFee(bundlerUrl) {
+  const result = await rundlerRequest(
+    bundlerUrl,
+    BundlerMethod.RUNDLER_MAX_PRIORITY_FEE_PER_GAS,
+    bundlersWithoutRundlerFees
+  );
+  try {
     return result == null ? null : BigInt(result);
   } catch {
     return null;
   }
 }
+async function fetchRundlerSuggestedFees(bundlerUrl) {
+  const result = await rundlerRequest(
+    bundlerUrl,
+    BundlerMethod.RUNDLER_GET_USER_OPERATION_GAS_PRICE,
+    bundlersWithoutRundlerGasPrice
+  );
+  const suggested = result?.suggested;
+  if (suggested?.maxFeePerGas == null || suggested.maxPriorityFeePerGas == null) return null;
+  try {
+    return {
+      maxFeePerGas: BigInt(suggested.maxFeePerGas),
+      maxPriorityFeePerGas: BigInt(suggested.maxPriorityFeePerGas)
+    };
+  } catch {
+    return null;
+  }
+}
+async function rundlerUserOperationFees(bundlerUrl, fees4, params) {
+  const { baseFeePerGas, priorityFeeBumpPercent, maxFeeBumpPercent } = params;
+  const suggested = await fetchRundlerSuggestedFees(bundlerUrl);
+  if (suggested) {
+    return {
+      maxFeePerGas: suggested.maxFeePerGas + suggested.maxFeePerGas * maxFeeBumpPercent / 100n,
+      maxPriorityFeePerGas: suggested.maxPriorityFeePerGas + suggested.maxPriorityFeePerGas * priorityFeeBumpPercent / 100n
+    };
+  }
+  const rundlerPriorityFee = await fetchRundlerPriorityFee(bundlerUrl);
+  if (rundlerPriorityFee === null) return fees4;
+  return applyRundlerPriorityFee(fees4, {
+    rundlerPriorityFee,
+    baseFeePerGas,
+    priorityFeeBumpPercent,
+    maxFeeBumpPercent
+  });
+}
 function applyRundlerPriorityFee(fees4, params) {
   const { rundlerPriorityFee, baseFeePerGas, priorityFeeBumpPercent, maxFeeBumpPercent } = params;
   const priorityFloor = rundlerPriorityFee + rundlerPriorityFee * priorityFeeBumpPercent / 100n;
@@ -235502,7 +235544,7 @@ function encodePhantomBidDeclaration(declaration) {
   }
   return u8aToHex(new Uint8Array(bytes5));
 }
-var import_merge_race, __defProp3, __getOwnPropNames2, __esm2, __export2, node_exports, wasm, full_path, __dirname$1, cachedTextDecoder, cachedUint8ArrayMemory0, WASM_VECTOR_LEN, cachedTextEncoder, encodeString5, cachedDataViewMemory0, KeccakMergeFinalization, KeccakMerge, wasmPath, wasmBytes2, bindings, wasmModule, wasmInstance, __wasm, init_node11, RequestStatus, TimeoutStatus, IntentOrderStatus, ABI, evmHost_default, ABI2, handlerV2_default, polkadotAssetHubPaseo, polkadotHubMainnet, pharosMainnet, pharosAtlantic, tronNile, ENTRY_POINT_V08, ENTRY_POINT_V09, KNOWN_ENTRY_POINTS, chainConfigs, configsByStateMachineId, getConfigByStateMachineId, getChainId3, getViemChain, hyperbridgeAddress, ABI3, IntentGatewayV2_default, ChainConfigService, ABI4, uniswapRouterV2_default, chains, DEFAULT_ADDRESS, EvmChain, REQUEST_COMMITMENTS_SLOT, RESPONSE_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, STATE_COMMITMENTS_SLOT, MISSING_CONSENSUS_UPDATE_TIME_MESSAGE, MissingConsensusUpdateTimeError, TokenBucket, BATCHES_NOT_SUPPORTED_CODE, TOO_BIG_BATCH_REQUEST_CODE, DEFAULT_MAX_BATCH_SIZE, _endpoint2, _headers3, _limiter, _maxBatchSize, _batchingSupported, _pending2, _flushTimer, _flushing, _nextId, __BatchingHttpProvider_instances, scheduleFlush_fn, flushNow_fn, flush_fn, post_fn, settleBatch_fn, settle_fn, handleBatchRefusal_fn, requeue_fn, _a5, BatchingHttpProvider, OFFCHAIN_BID_PREFIX, HYPERBRIDGE_TYPES_BUNDLE, BASE_TIP, HTTP_CONNECT_TIMEOUT_MS, INCLUSION_TIMEOUT_MS, DEFAULT_RPC_MAX_RPS, rpcLimiters, BidCodec, PackedUserOperationCodec, IntentsCoprocessor, ReviveContractInfo, ReviveAccountType, ReviveAccountInfo, H256, EvmStateProof, SubstrateHashing, SubstrateStateMachineProof, BasicProof, LeafIndexAndPos, MmrProof, ConsensusStateId, ConsensusMessage, FraudProofMessage, StateMachine, StateMachineId, StateMachineHeight, Proof, PostRequest, PostResponse, GetRequest, StorageValue, GetResponse, Request3, Response2, RequestMessage, RequestResponse, ResponseMessage, TimeoutMessage, GetRequestsWithProof, Message, DEFAULT_CHILD_STORAGE_PREFIX, PharosProofNodeCodec, SiblingLeftmostLeafProofCodec, NonExistenceProofCodec, AccountProofDataCodec, PharosStateProof, DEFAULT_POLL_INTERVAL, ADDRESS_ZERO2, DEFAULT_GRAFFITI, DEFAULT_LOGGER, REQUEST_STATUS_WEIGHTS, TIMEOUT_STATUS_WEIGHTS, COMBINED_STATUS_WEIGHTS, CHAIN_ID_TO_COINGECKO_NATIVE, TESTNET_CHAINS, ORDER_STATUS, loadDriver, detectEnvironment, STORAGE_KEYS, LEGACY_STORAGE_KEYS, ABI5, uniswapV3Quoter_default, UNISWAP_V4_QUOTER_ABI, ABI6, universalRouter_default, PERMIT2_ABI, UniswapQuoteEngine, COMMON_FEE_TIERS, Swap, ABI7, erc7281_default, DEFAULT_GRAFFITI2, ERC7821_BATCH_MODE, BundlerMethod, SELECT_SOLVER_TYPEHASH, LEGACY_SELECT_SOLVER_TYPEHASH, PACKED_USEROP_TYPEHASH, DOMAIN_TYPEHASH, CryptoUtils, FEE_TOKEN_CACHE_TTL_MS, OrderPlacer, TOKEN_KEYED_GATEWAY_ABI, keyingByClient, PARTIAL_FILLS_SLOT, USED_USEROPS_STORAGE_KEY, OrderExecutor, _a6, OrderCanceller, FILL_ORDER_SELECTOR, SUPPORTED_INTENTS_VERSION, TESTNET_INTENTS_VERSIONS, CONTRACT_VERSION_ABI, CANONICAL_EVM_TOKEN, formats, SELECTION_PARAMS_SLOT, SOLVER_SELECTION_CLEARED, SELECTION_FORMAT_BY_ENTRY_POINT, ENTRY_POINT_EVENT_ABI, BidImpl, BidManager, UNSUPPORTED_REQUEST_CODES, bundlersWithoutRundlerFees, RELAYER_MESSAGE_GAS, NO_BUNDLER_FILL_GAS_BASE, NO_BUNDLER_FILL_GAS_PER_OUTPUT, NO_BUNDLER_PAYMASTER_VERIFICATION_GAS, NO_BUNDLER_PAYMASTER_POST_OP_GAS, BID_PVG_ESTIMATION_ACCOUNT_CODE, BID_PVG_ESTIMATION_PAYMASTER_CODE, SELECTED_BID_SIGNATURE_BYTES, BID_PVG_HEADROOM_PERCENT, ESCROW_MAPPING_SLOT, GasEstimator, OrderStatusChecker, ORDERBOOK_URLS, ORDERBOOK_DECIMALS, ORDERBOOK_SCALE, OrderbookRequestError, RATE_FIELDS, TOP_OF_BOOK_QUERY, ROUTE_LIQUIDITY_QUERY, QUOTE_QUERY, QUOTE_PESSIMISTIC_QUERY, HyperFxOrderbook, UnsupportedLiquidityAssetError, UnsupportedLiquidityChainError, OrderbookQuoteNotConvergedError, MAX_EXACT_OUTPUT_ROUNDS, OrderbookMarket, ETHEREUM_ORDER_FEE_GAS_PRICE_BUMP_PERCENT, DEFAULT_ORDER_FEE_GAS_PRICE_BUMP_PERCENT, IntentGateway, DECLARATION_V1, DECLARATION_V2, PAYMASTER_ADDRESS_BYTES, PAYMASTER_GAS_LIMIT_BYTES, PAYMASTER_DATA_OFFSET, PERMIT2_DATA_BYTES, PERMIT2_SPONSORSHIP_BYTES, MAX_DECLARED_ENTRIES, MAX_TOKEN_ID_BYTES, TeleportParams, MultiAccount;
+var import_merge_race, __defProp3, __getOwnPropNames2, __esm2, __export2, node_exports, wasm, full_path, __dirname$1, cachedTextDecoder, cachedUint8ArrayMemory0, WASM_VECTOR_LEN, cachedTextEncoder, encodeString5, cachedDataViewMemory0, KeccakMergeFinalization, KeccakMerge, wasmPath, wasmBytes2, bindings, wasmModule, wasmInstance, __wasm, init_node11, RequestStatus, TimeoutStatus, IntentOrderStatus, ABI, evmHost_default, ABI2, handlerV2_default, polkadotAssetHubPaseo, polkadotHubMainnet, pharosMainnet, pharosAtlantic, tronNile, ENTRY_POINT_V08, ENTRY_POINT_V09, KNOWN_ENTRY_POINTS, chainConfigs, configsByStateMachineId, getConfigByStateMachineId, getChainId3, getViemChain, hyperbridgeAddress, ABI3, IntentGatewayV2_default, ChainConfigService, ABI4, uniswapRouterV2_default, chains, DEFAULT_ADDRESS, EvmChain, REQUEST_COMMITMENTS_SLOT, RESPONSE_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, STATE_COMMITMENTS_SLOT, MISSING_CONSENSUS_UPDATE_TIME_MESSAGE, MissingConsensusUpdateTimeError, TokenBucket, BATCHES_NOT_SUPPORTED_CODE, TOO_BIG_BATCH_REQUEST_CODE, DEFAULT_MAX_BATCH_SIZE, _endpoint2, _headers3, _limiter, _maxBatchSize, _batchingSupported, _pending2, _flushTimer, _flushing, _nextId, __BatchingHttpProvider_instances, scheduleFlush_fn, flushNow_fn, flush_fn, post_fn, settleBatch_fn, settle_fn, handleBatchRefusal_fn, requeue_fn, _a5, BatchingHttpProvider, OFFCHAIN_BID_PREFIX, HYPERBRIDGE_TYPES_BUNDLE, BASE_TIP, HTTP_CONNECT_TIMEOUT_MS, INCLUSION_TIMEOUT_MS, DEFAULT_RPC_MAX_RPS, rpcLimiters, BidCodec, PackedUserOperationCodec, IntentsCoprocessor, ReviveContractInfo, ReviveAccountType, ReviveAccountInfo, H256, EvmStateProof, SubstrateHashing, SubstrateStateMachineProof, BasicProof, LeafIndexAndPos, MmrProof, ConsensusStateId, ConsensusMessage, FraudProofMessage, StateMachine, StateMachineId, StateMachineHeight, Proof, PostRequest, PostResponse, GetRequest, StorageValue, GetResponse, Request3, Response2, RequestMessage, RequestResponse, ResponseMessage, TimeoutMessage, GetRequestsWithProof, Message, DEFAULT_CHILD_STORAGE_PREFIX, PharosProofNodeCodec, SiblingLeftmostLeafProofCodec, NonExistenceProofCodec, AccountProofDataCodec, PharosStateProof, DEFAULT_POLL_INTERVAL, ADDRESS_ZERO2, DEFAULT_GRAFFITI, DEFAULT_LOGGER, REQUEST_STATUS_WEIGHTS, TIMEOUT_STATUS_WEIGHTS, COMBINED_STATUS_WEIGHTS, CHAIN_ID_TO_COINGECKO_NATIVE, TESTNET_CHAINS, ORDER_STATUS, loadDriver, detectEnvironment, STORAGE_KEYS, LEGACY_STORAGE_KEYS, ABI5, uniswapV3Quoter_default, UNISWAP_V4_QUOTER_ABI, ABI6, universalRouter_default, PERMIT2_ABI, UniswapQuoteEngine, COMMON_FEE_TIERS, Swap, ABI7, erc7281_default, DEFAULT_GRAFFITI2, ERC7821_BATCH_MODE, BundlerMethod, SELECT_SOLVER_TYPEHASH, LEGACY_SELECT_SOLVER_TYPEHASH, PACKED_USEROP_TYPEHASH, DOMAIN_TYPEHASH, CryptoUtils, FEE_TOKEN_CACHE_TTL_MS, OrderPlacer, TOKEN_KEYED_GATEWAY_ABI, keyingByClient, PARTIAL_FILLS_SLOT, USED_USEROPS_STORAGE_KEY, OrderExecutor, _a6, OrderCanceller, FILL_ORDER_SELECTOR, SUPPORTED_INTENTS_VERSION, TESTNET_INTENTS_VERSIONS, CONTRACT_VERSION_ABI, CANONICAL_EVM_TOKEN, formats, SELECTION_PARAMS_SLOT, SOLVER_SELECTION_CLEARED, SELECTION_FORMAT_BY_ENTRY_POINT, ENTRY_POINT_EVENT_ABI, BidImpl, BidManager, UNSUPPORTED_REQUEST_CODES, bundlersWithoutRundlerFees, bundlersWithoutRundlerGasPrice, RELAYER_MESSAGE_GAS, NO_BUNDLER_FILL_GAS_BASE, NO_BUNDLER_FILL_GAS_PER_OUTPUT, NO_BUNDLER_PAYMASTER_VERIFICATION_GAS, NO_BUNDLER_PAYMASTER_POST_OP_GAS, BID_PVG_ESTIMATION_ACCOUNT_CODE, BID_PVG_ESTIMATION_PAYMASTER_CODE, SELECTED_BID_SIGNATURE_BYTES, BID_PVG_HEADROOM_PERCENT, ESCROW_MAPPING_SLOT, GasEstimator, OrderStatusChecker, ORDERBOOK_URLS, ORDERBOOK_DECIMALS, ORDERBOOK_SCALE, OrderbookRequestError, RATE_FIELDS, TOP_OF_BOOK_QUERY, ROUTE_LIQUIDITY_QUERY, QUOTE_QUERY, QUOTE_PESSIMISTIC_QUERY, HyperFxOrderbook, UnsupportedLiquidityAssetError, UnsupportedLiquidityChainError, OrderbookQuoteNotConvergedError, MAX_EXACT_OUTPUT_ROUNDS, OrderbookMarket, ETHEREUM_ORDER_FEE_GAS_PRICE_BUMP_PERCENT, DEFAULT_ORDER_FEE_GAS_PRICE_BUMP_PERCENT, IntentGateway, DECLARATION_V1, DECLARATION_V2, PAYMASTER_ADDRESS_BYTES, PAYMASTER_GAS_LIMIT_BYTES, PAYMASTER_DATA_OFFSET, PERMIT2_DATA_BYTES, PERMIT2_SPONSORSHIP_BYTES, MAX_DECLARED_ENTRIES, MAX_TOKEN_ID_BYTES, TeleportParams, MultiAccount;
 var init_node10 = __esm({
   "../sdk/dist/node/index.js"() {
     "use strict";
@@ -237897,6 +237939,7 @@ var init_node10 = __esm({
         },
         rpcEnvKey: "BSC_CHAPEL",
         defaultRpcUrl: "https://bnb-testnet.api.onfinality.io/public",
+        bundlerUrl: "https://bundler.polytope.technology/bsc-chapel",
         consensusStateId: "BSC0",
         coingeckoId: "binance-smart-chain",
         popularTokens: [
@@ -238040,6 +238083,7 @@ var init_node10 = __esm({
         },
         rpcEnvKey: "ETH_MAINNET",
         defaultRpcUrl: "https://eth-mainnet.g.alchemy.com/v2/demo",
+        bundlerUrl: "https://bundler.polytope.technology/ethereum",
         consensusStateId: "ETH0",
         coingeckoId: "ethereum",
         layerZeroEid: 30101,
@@ -238109,6 +238153,7 @@ var init_node10 = __esm({
         },
         rpcEnvKey: "BSC_MAINNET",
         defaultRpcUrl: "https://bsc-rpc.publicnode.com",
+        bundlerUrl: "https://bundler.polytope.technology/bsc",
         consensusStateId: "BSC0",
         coingeckoId: "binance-smart-chain",
         erc4626Vaults: [
@@ -238171,6 +238216,7 @@ var init_node10 = __esm({
         },
         rpcEnvKey: "ARBITRUM_MAINNET",
         defaultRpcUrl: "https://arbitrum-one.public.blastapi.io",
+        bundlerUrl: "https://bundler.polytope.technology/arbitrum",
         consensusStateId: "ETH0",
         coingeckoId: "arbitrum-one",
         layerZeroEid: 30110,
@@ -238246,6 +238292,7 @@ var init_node10 = __esm({
         },
         rpcEnvKey: "BASE_MAINNET",
         defaultRpcUrl: "https://base-mainnet.public.blastapi.io",
+        bundlerUrl: "https://bundler.polytope.technology/base",
         consensusStateId: "ETH0",
         coingeckoId: "base",
         layerZeroEid: 30184,
@@ -238322,6 +238369,7 @@ var init_node10 = __esm({
         },
         rpcEnvKey: "POLYGON_MAINNET",
         defaultRpcUrl: "https://polygon-bor-rpc.publicnode.com",
+        bundlerUrl: "https://bundler.polytope.technology/polygon",
         consensusStateId: "POLY",
         coingeckoId: "polygon-pos",
         layerZeroEid: 30109,
@@ -238400,6 +238448,7 @@ var init_node10 = __esm({
         },
         rpcEnvKey: "POLYGON_AMOY",
         defaultRpcUrl: "https://rpc-amoy.polygon.technology",
+        bundlerUrl: "https://bundler.polytope.technology/polygon-amoy",
         consensusStateId: "POLY",
         coingeckoId: "polygon-pos"
       },
@@ -242145,7 +242194,7 @@ var init_node10 = __esm({
        * This is the only public way to construct an `EvmChain` — the constructor is private.
        *
        * @param rpcUrl - HTTP(S) RPC URL of the EVM node
-       * @param bundlerUrl - Optional ERC-4337 bundler URL for account abstraction support
+       * @param bundlerUrl - Optional ERC-4337 bundler URL; defaults to Hyperbridge's bundler for the chain
        * @returns A fully initialised `EvmChain` ready for use
        * @throws If the chain ID returned by the RPC is not a known Hyperbridge deployment
        *
@@ -242171,8 +242220,12 @@ var init_node10 = __esm({
       get host() {
         return this.params.host;
       }
+      /**
+       * The bundler given to this chain, or else the one Hyperbridge runs for it.
+       * Undefined on a chain Hyperbridge runs no bundler for.
+       */
       get bundlerUrl() {
-        return this.params.bundlerUrl;
+        return this.params.bundlerUrl ?? chainConfigs[this.params.chainId]?.bundlerUrl;
       }
       get config() {
         return {
@@ -246782,10 +246835,10 @@ query OrderStatus($commitment: String!) {
       ETH_GET_USER_OPERATION_RECEIPT: "eth_getUserOperationReceipt",
       /** Estimates gas limits for a UserOperation before submission. */
       ETH_ESTIMATE_USER_OPERATION_GAS: "eth_estimateUserOperationGas",
-      /** Pimlico-specific method to fetch recommended EIP-1559 gas prices for UserOperations. */
-      PIMLICO_GET_USER_OPERATION_GAS_PRICE: "pimlico_getUserOperationGasPrice",
-      /** Alchemy (Rundler) method to fetch recommended priority fee for UserOperations. */
-      RUNDLER_MAX_PRIORITY_FEE_PER_GAS: "rundler_maxPriorityFeePerGas"
+      /** Rundler method returning the priority fee it requires of UserOperations. */
+      RUNDLER_MAX_PRIORITY_FEE_PER_GAS: "rundler_maxPriorityFeePerGas",
+      /** Rundler method returning the fees it requires and suggests for UserOperations. */
+      RUNDLER_GET_USER_OPERATION_GAS_PRICE: "rundler_getUserOperationGasPrice"
     };
     SELECT_SOLVER_TYPEHASH = keccak2563(toHex3("SelectSolver(bytes32 commitment,bytes32 userOpHash)"));
     LEGACY_SELECT_SOLVER_TYPEHASH = keccak2563(toHex3("SelectSolver(bytes32 commitment,address solver)"));
@@ -249066,6 +249119,7 @@ query OrderStatus($commitment: String!) {
     };
     UNSUPPORTED_REQUEST_CODES = /* @__PURE__ */ new Set([-32600, -32601, -32602]);
     bundlersWithoutRundlerFees = /* @__PURE__ */ new Set();
+    bundlersWithoutRundlerGasPrice = /* @__PURE__ */ new Set();
     RELAYER_MESSAGE_GAS = 1000000n;
     NO_BUNDLER_FILL_GAS_BASE = 700000n;
     NO_BUNDLER_FILL_GAS_PER_OUTPUT = 150000n;
@@ -249106,11 +249160,9 @@ query OrderStatus($commitment: String!) {
        * **Bundler path:** constructs a mock `PackedUserOperation` signed by an
        * ephemeral keypair, applies state overrides, and calls
        * `eth_estimateUserOperationGas`. Gas limits are bumped by 5-10% for
-       * headroom. If the bundler is Pimlico, gas prices are refined with
-       * `pimlico_getUserOperationGasPrice`, and if it is Alchemy, with
-       * `rundler_maxPriorityFeePerGas`. For any other bundler that answers
-       * `rundler_maxPriorityFeePerGas`, the fees are raised to at least that
-       * priority fee (see {@link applyRundlerPriorityFee}). If the bundler rejects the estimate,
+       * headroom. Fees are the rundler bundler's suggested fees raised by the bumps,
+       * or the chain's gas price raised to the priority fee it requires where it
+       * suggests none (see {@link rundlerUserOperationFees}). If the bundler rejects the estimate,
        * fixed gas limits are returned in its place, or the call throws when
        * `params.requireBundlerEstimate` is set.
        *
@@ -249266,46 +249318,19 @@ query OrderStatus($commitment: String!) {
               sessionSignature
             ]);
             const bundlerUserOp = CryptoUtils.prepareBundlerCall(preliminaryUserOp);
-            const bundlerUrlLower = this.ctx.bundlerUrl.toLowerCase();
-            const isPimlico = bundlerUrlLower.includes("pimlico.io");
-            const isAlchemy = bundlerUrlLower.includes("alchemy.com");
-            const rundlerPriorityFeeRequest = isPimlico || isAlchemy ? Promise.resolve(null) : fetchRundlerPriorityFee(this.ctx.bundlerUrl);
-            const bundlerRequests = [
+            const rundlerFeesRequest = rundlerUserOperationFees(
+              this.ctx.bundlerUrl,
+              { maxFeePerGas, maxPriorityFeePerGas },
               {
-                method: BundlerMethod.ETH_ESTIMATE_USER_OPERATION_GAS,
-                params: [bundlerUserOp, entryPointAddress, bundlerStateOverrides]
-              }
-            ];
-            if (isPimlico) {
-              bundlerRequests.push({
-                method: BundlerMethod.PIMLICO_GET_USER_OPERATION_GAS_PRICE,
-                params: []
-              });
-            }
-            if (isAlchemy) {
-              bundlerRequests.push({
-                method: BundlerMethod.RUNDLER_MAX_PRIORITY_FEE_PER_GAS,
-                params: []
-              });
-            }
-            let gasEstimate;
-            let pimlicoGasPrices = null;
-            let alchemyMaxPriorityFee = null;
-            try {
-              const batchResults = await this.crypto.sendBundlerBatch(bundlerRequests);
-              gasEstimate = batchResults[0];
-              if (isPimlico && batchResults.length > 1) {
-                pimlicoGasPrices = batchResults[1];
+                baseFeePerGas,
+                priorityFeeBumpPercent: BigInt(priorityFeeBumpPercent),
+                maxFeeBumpPercent: BigInt(maxFeeBumpPercent)
               }
-              if (isAlchemy && batchResults.length > 1) {
-                alchemyMaxPriorityFee = batchResults[1];
-              }
-            } catch {
-              gasEstimate = await this.crypto.sendBundler(
-                BundlerMethod.ETH_ESTIMATE_USER_OPERATION_GAS,
-                [bundlerUserOp, entryPointAddress, bundlerStateOverrides]
-              );
-            }
+            );
+            const gasEstimate = await this.crypto.sendBundler(
+              BundlerMethod.ETH_ESTIMATE_USER_OPERATION_GAS,
+              [bundlerUserOp, entryPointAddress, bundlerStateOverrides]
+            );
             callGasLimit = BigInt(gasEstimate.callGasLimit) * 160n / 100n;
             verificationGasLimit = BigInt(gasEstimate.verificationGasLimit) * 105n / 100n;
             preVerificationGas = BigInt(gasEstimate.preVerificationGas) * 105n / 100n;
@@ -249315,37 +249340,9 @@ query OrderStatus($commitment: String!) {
             if (gasEstimate.paymasterPostOpGasLimit) {
               paymasterPostOpGasLimit = BigInt(gasEstimate.paymasterPostOpGasLimit) * 105n / 100n;
             }
-            if (pimlicoGasPrices) {
-              const level = pimlicoGasPrices.fast ?? pimlicoGasPrices.standard ?? pimlicoGasPrices.slow ?? null;
-              if (level) {
-                const pimMaxFeePerGas = BigInt(level.maxFeePerGas);
-                const pimMaxPriorityFeePerGas = BigInt(level.maxPriorityFeePerGas);
-                maxFeePerGas = pimMaxFeePerGas + pimMaxFeePerGas * BigInt(maxFeeBumpPercent) / 100n;
-                maxPriorityFeePerGas = pimMaxPriorityFeePerGas + pimMaxPriorityFeePerGas * BigInt(priorityFeeBumpPercent) / 100n;
-              }
-            }
-            if (alchemyMaxPriorityFee) {
-              const rundlerPriorityFee2 = BigInt(alchemyMaxPriorityFee);
-              const isArbitrum = chainId === 42161n;
-              const alchemyPrioBump = isArbitrum ? 0n : 25n;
-              maxPriorityFeePerGas = rundlerPriorityFee2 + rundlerPriorityFee2 * alchemyPrioBump / 100n;
-              const bufferedBaseFee = baseFeePerGas + baseFeePerGas * 50n / 100n;
-              maxFeePerGas = bufferedBaseFee + maxPriorityFeePerGas;
-            }
-            const rundlerPriorityFee = await rundlerPriorityFeeRequest;
-            if (rundlerPriorityFee !== null) {
-              const rundlerFees = applyRundlerPriorityFee(
-                { maxFeePerGas, maxPriorityFeePerGas },
-                {
-                  rundlerPriorityFee,
-                  baseFeePerGas,
-                  priorityFeeBumpPercent: BigInt(priorityFeeBumpPercent),
-                  maxFeeBumpPercent: BigInt(maxFeeBumpPercent)
-                }
-              );
-              maxFeePerGas = rundlerFees.maxFeePerGas;
-              maxPriorityFeePerGas = rundlerFees.maxPriorityFeePerGas;
-            }
+            const rundlerFees = await rundlerFeesRequest;
+            maxFeePerGas = rundlerFees.maxFeePerGas;
+            maxPriorityFeePerGas = rundlerFees.maxPriorityFeePerGas;
           } catch (e4) {
             if (params.requireBundlerEstimate) {
               throw new Error(`Bundler gas estimation failed: ${e4 instanceof Error ? e4.message : String(e4)}`, {
@@ -250133,6 +250130,7 @@ query QuotePessimistic($route: RouteInput!, $amountIn: BigInt!) {
        *
        * The ERC-4337 bundler URL is read from `dest.bundlerUrl`, set when constructing
        * the destination chain via {@link EvmChain.create} or {@link EvmChainParams.bundlerUrl}.
+       * An `EvmChain` given none uses the bundler Hyperbridge runs for it.
        *
        * @param source - Source chain for order placement
        * @param dest - Destination chain for order fulfillment
@@ -250822,6 +250820,27 @@ query QuotePessimistic($route: RouteInput!, $amountIn: BigInt!) {
   }
 });
 
+// src/config/bundlers.ts
+function hyperbridgeBundlerUrl(chainId) {
+  return HYPERBRIDGE_BUNDLER_URLS[chainId];
+}
+var HYPERBRIDGE_BUNDLER_URLS;
+var init_bundlers = __esm({
+  "src/config/bundlers.ts"() {
+    "use strict";
+    init_esm_shims();
+    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"
+    };
+  }
+});
+
 // src/services/FillerConfigService.ts
 function validateRpcUrls(rpcUrls) {
   if (rpcUrls.length === 0) {
@@ -250901,7 +250920,7 @@ async function resolveChainConfigs(chains2, options = {}) {
           "RPC endpoint could not report its chainId at startup; keeping it for the quorum to judge per call"
         );
       }
-      return { chainId: first3.chainId, rpcUrls, bundlerUrl: chain2.bundlerUrl };
+      return { chainId: first3.chainId, rpcUrls, bundlerUrl: hyperbridgeBundlerUrl(first3.chainId) };
     })
   );
 }
@@ -250912,6 +250931,7 @@ var init_FillerConfigService = __esm({
     init_esm_shims();
     init_Logger();
     init_node10();
+    init_bundlers();
     DEFAULT_BLOCK_SCAN_INTERVAL_SECONDS = 3;
     MIN_BLOCK_SCAN_INTERVAL_SECONDS = 0.1;
     DEFAULT_MIN_ORDER_SIZE_USD = 20;
@@ -250980,12 +251000,6 @@ var init_FillerConfigService = __esm({
         }
         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;
@@ -251356,9 +251370,6 @@ function validateConfig(config5, cliWatchOnly = false) {
     if (!Array.isArray(chain2.rpcUrls) || chain2.rpcUrls.length === 0 || chain2.rpcUrls.some((u6) => !u6)) {
       throw new Error("Each chain configuration must have rpcUrls (a non-empty array of strings)");
     }
-    if (!chain2.bundlerUrl) {
-      throw new Error("Each chain configuration must have bundlerUrl");
-    }
   }
   const concurrent = config5.simplex.maxConcurrentOrders;
   if (concurrent !== void 0) {
@@ -251606,7 +251617,7 @@ function nativeTokenSymbol(chainId) {
   return CHAIN_NATIVE_SYMBOLS[chainId] ?? "ETH";
 }
 function chainsForNetwork(network) {
-  return INIT_CHAINS.filter((chain2) => chain2.network === network);
+  return INIT_CHAINS.filter((chain2) => chain2.network === network && chain2.hyperbridgeBundlerUrl);
 }
 function chainByChainId(chainId) {
   return INIT_CHAINS.find((chain2) => chain2.chainId === chainId);
@@ -251614,12 +251625,13 @@ function chainByChainId(chainId) {
 function chainByAlchemySubdomain(subdomain) {
   return INIT_CHAINS.find((chain2) => chain2.alchemySubdomain === subdomain);
 }
-var FREE_RPC_URLS, HYPERBRIDGE_BUNDLER_URLS, CHAIN_NATIVE_SYMBOLS, INIT_CHAINS, HYPERBRIDGE_WS_DEFAULTS;
+var FREE_RPC_URLS, CHAIN_NATIVE_SYMBOLS, INIT_CHAINS, HYPERBRIDGE_WS_DEFAULTS;
 var init_chains2 = __esm({
   "src/cli/init/chains.ts"() {
     "use strict";
     init_esm_shims();
     init_external_links();
+    init_bundlers();
     FREE_RPC_URLS = {
       1: [
         "https://mainnet.gateway.tenderly.co",
@@ -251666,13 +251678,6 @@ var init_chains2 = __esm({
         "https://arb1.arbitrum.io/rpc"
       ]
     };
-    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"
-    };
     CHAIN_NATIVE_SYMBOLS = {
       1: "ETH",
       56: "BNB",
@@ -251771,7 +251776,8 @@ var init_chains2 = __esm({
         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,
@@ -251779,7 +251785,8 @@ var init_chains2 = __esm({
         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]
       }
     ];
     HYPERBRIDGE_WS_DEFAULTS = {
@@ -252021,8 +252028,6 @@ function emitFillerToml(config5, options = {}) {
     push("[[chains]]");
     push("# List 2+ organisationally independent RPC providers to enable quorum log scanning.");
     push(kv("rpcUrls", chain2.rpcUrls));
-    push("# ERC-4337 bundler used to submit fill UserOperations on this chain.");
-    push(kv("bundlerUrl", chain2.bundlerUrl));
     push();
   });
   return `${out.join("\n").trimEnd()}
@@ -336953,9 +336958,6 @@ function parseAlchemyUrl(url2) {
   if (!match) return null;
   return { subdomain, apiKey: match[1] };
 }
-function isAlchemyUrl(url2) {
-  return parseAlchemyUrl(url2) !== null;
-}
 function deriveAlchemyRpc(apiKey, chainId) {
   const chain2 = chainByChainId(chainId);
   if (!chain2?.alchemySubdomain) return null;
@@ -337806,10 +337808,9 @@ var init_help_text = __esm({
     "use strict";
     init_esm_shims();
     WHY = {
-      chains: "Simplex listens for orders and fills only on the chains you pick. Each chain needs its own RPC, an ERC-4337 bundler, and funded balances (native gas + stablecoins).",
+      chains: "Simplex listens for orders and fills only on the chains you pick. Each chain needs its own RPC and funded balances (native gas + stablecoins); fills go through Hyperbridge's bundler.",
       rpc: "The RPC is used to scan order events, read balances and simulate fills. Use a premium endpoint with archive access (Alchemy, Infura, QuickNode) \u2014 free tiers rate-limit and break event scanning.",
       quorum: "Listing a second, organisationally independent RPC enables quorum log scanning: every event batch must match across providers, so one lying or compromised RPC can't feed you fake orders.",
-      bundler: "Fills execute as ERC-4337 UserOperations; the bundler submits them on-chain. Hyperbridge runs no bundler for these chains, so use a provider such as Pimlico.",
       signer: "This wallet signs every fill and holds your stablecoin float on each chain. It's the identity of your filler.",
       secretPhrase: "A secret phrase is a BIP-39 mnemonic of 12 to 24 English words. The filler signs with the wallet at m/44'/60'/0'/0/0 unless you pick another account index. The phrase is written to the config file in plain text, protected only by the file's permissions, the same as a private key.",
       substrateKey: "Solver-selection orders are won by submitting signed bids to Hyperbridge. This Substrate account signs those bid extrinsics and must hold BRIDGE tokens for fees \u2014 the fees are claimed back automatically after fills.",
@@ -337871,8 +337872,7 @@ function detectPrefillNetwork(prefill) {
   if (!prefill) return void 0;
   for (const chainId of prefill.chainIds) {
     if (chainId === null) continue;
-    const meta = chainsForNetwork("testnet").find((c6) => c6.chainId === chainId);
-    if (meta) return "testnet";
+    if (chainByChainId(chainId)?.network === "testnet") return "testnet";
   }
   return "mainnet";
 }
@@ -338066,122 +338066,6 @@ var init_chains3 = __esm({
   }
 });
 
-// src/cli/init/derive/pimlico.ts
-function parsePimlicoUrl(url2) {
-  let parsed;
-  try {
-    parsed = new URL(url2);
-  } catch {
-    return null;
-  }
-  if (parsed.protocol !== "https:") return null;
-  if (parsed.hostname !== "api.pimlico.io") return null;
-  const match = parsed.pathname.match(/^\/v2\/([^/]+)\/rpc$/);
-  if (!match) return null;
-  const chainId = Number(match[1]);
-  if (!Number.isInteger(chainId) || chainId <= 0) return null;
-  const apiKey = parsed.searchParams.get("apikey");
-  if (!apiKey) return null;
-  return { chainId, apiKey };
-}
-function derivePimlicoBundler(apiKey, chainId) {
-  return `https://api.pimlico.io/v2/${chainId}/rpc?apikey=${encodeURIComponent(apiKey)}`;
-}
-var init_pimlico = __esm({
-  "src/cli/init/derive/pimlico.ts"() {
-    "use strict";
-    init_esm_shims();
-  }
-});
-
-// src/cli/init/steps/bundlers.ts
-async function stepBundlers(state, prefill) {
-  for (const chain2 of state.chains) {
-    if (chain2.meta.hyperbridgeBundlerUrl) chain2.bundlerUrl = chain2.meta.hyperbridgeBundlerUrl;
-  }
-  if (state.chains.every((chain2) => chain2.bundlerUrl)) return;
-  why(WHY.bundler);
-  const alchemyChains = state.chains.filter((chain2) => {
-    if (chain2.bundlerUrl || !isAlchemyUrl(chain2.rpcUrls[0])) return false;
-    const existing = prefillBundlerFor(chain2.meta.chainId, prefill);
-    return !existing || existing === chain2.rpcUrls[0];
-  });
-  if (alchemyChains.length > 0) {
-    const reuse = guard(
-      await confirm({
-        message: `Reuse the Alchemy RPC as the ERC-4337 bundler for ${alchemyChains.map((c6) => c6.meta.label).join(", ")}?`,
-        initialValue: true
-      })
-    );
-    if (reuse) {
-      for (const chain2 of alchemyChains) chain2.bundlerUrl = chain2.rpcUrls[0];
-    }
-  }
-  const alchemyCapable = state.chains.filter((chain2) => !chain2.bundlerUrl && chain2.meta.alchemySubdomain);
-  if (alchemyCapable.length > 0) {
-    const useKey = guard(
-      await confirm({
-        message: `Configure the bundler for ${alchemyCapable.map((c6) => c6.meta.label).join(", ")} from one Alchemy API key?`,
-        initialValue: true
-      })
-    );
-    if (useKey) {
-      const apiKey = await askSecret("Alchemy API key");
-      for (const chain2 of alchemyCapable) {
-        const url2 = deriveAlchemyRpc(apiKey, chain2.meta.chainId);
-        if (url2) chain2.bundlerUrl = url2;
-      }
-    }
-  }
-  const pimlico = new ProviderDerivation({
-    detect: (url2) => parsePimlicoUrl(url2)?.apiKey ?? null,
-    derive: derivePimlicoBundler,
-    confirmMessage: (remaining) => `Pimlico key detected \u2014 derive bundler URLs for ${remaining} from the same key?`
-  });
-  for (const chain2 of state.chains) {
-    if (chain2.bundlerUrl) continue;
-    const existing = prefillBundlerFor(chain2.meta.chainId, prefill);
-    const derived2 = pimlico.candidate(chain2.meta.chainId);
-    const url2 = derived2 ? await askDerivedOrCustom(
-      `Bundler for ${chain2.meta.label}`,
-      derived2,
-      "Use the derived Pimlico URL",
-      () => askBundlerUrl(chain2.meta.label, existing)
-    ) : await askBundlerUrl(chain2.meta.label, existing);
-    chain2.bundlerUrl = url2;
-    const remaining = state.chains.filter((c6) => !c6.bundlerUrl);
-    await pimlico.offer(
-      url2,
-      remaining.map((c6) => c6.meta.label)
-    );
-  }
-}
-function prefillBundlerFor(chainId, prefill) {
-  if (!prefill) return void 0;
-  const index3 = prefill.chainIds.indexOf(chainId);
-  if (index3 === -1) return void 0;
-  return prefill.config.chains[index3]?.bundlerUrl || void 0;
-}
-function askBundlerUrl(label, initial) {
-  return askUrl(`ERC-4337 bundler URL for ${label}`, {
-    initial,
-    placeholder: "https://api.pimlico.io/v2/<chainId>/rpc?apikey=<your-key>",
-    required: "Bundler URL is required \u2014 fills are submitted through it"
-  });
-}
-var init_bundlers = __esm({
-  "src/cli/init/steps/bundlers.ts"() {
-    "use strict";
-    init_esm_shims();
-    init_dist11();
-    init_alchemy();
-    init_pimlico();
-    init_derive_flow();
-    init_prompt_utils();
-    init_help_text();
-  }
-});
-
 // src/cli/init/steps/signer.ts
 async function stepSigner(state, prefill) {
   why(WHY.signer);
@@ -338663,7 +338547,7 @@ function assembleConfig(state) {
     // would otherwise shadow the fresh entry (last [[chains]] wins at load).
     chains: [
       ...state.passthroughChains,
-      ...state.chains.map((chain2) => ({ rpcUrls: chain2.rpcUrls, bundlerUrl: chain2.bundlerUrl ?? "" }))
+      ...state.chains.map((chain2) => ({ rpcUrls: chain2.rpcUrls }))
     ],
     rebalancing,
     vault: hasVault ? vault : void 0,
@@ -338685,10 +338569,7 @@ function chainComments(state) {
 function showSummary(state, outputPath) {
   const lines = [];
   for (const chain2 of state.chains) {
-    const bundlerHost2 = chain2.bundlerUrl ? new URL(chain2.bundlerUrl).hostname : "?";
-    lines.push(
-      `${chain2.meta.label}: ${chain2.rpcUrls.length} RPC${chain2.rpcUrls.length > 1 ? "s (quorum)" : ""}, bundler ${bundlerHost2}`
-    );
+    lines.push(`${chain2.meta.label}: ${chain2.rpcUrls.length} RPC${chain2.rpcUrls.length > 1 ? "s (quorum)" : ""}`);
   }
   if (state.passthroughChains.length > 0) {
     lines.push(`+ ${state.passthroughChains.length} unmanaged chain(s) kept from the previous config`);
@@ -338780,7 +338661,6 @@ async function runInit(options) {
   const state = newWizardState();
   state.prefillConfig = prefill?.config;
   await stepChains(state, prefill);
-  await stepBundlers(state, prefill);
   await stepSigner(state, prefill);
   await stepHyperbridge(state, prefill);
   for (; ; ) {
@@ -338880,7 +338760,6 @@ var init_init3 = __esm({
     init_migrate_legacy();
     init_state();
     init_chains3();
-    init_bundlers();
     init_signer2();
     init_hyperbridge();
     init_finetune();
@@ -339170,6 +339049,7 @@ init_dist4();
 // src/services/server/UiServer.ts
 init_esm_shims();
 init_interpolated_curve();
+init_bundlers();
 init_asset_registry();
 init_pairs();
 import { randomUUID as randomUUID2 } from "node:crypto";
@@ -343586,86 +343466,6 @@ init_pairs();
 init_interpolated_curve();
 init_asset_registry();
 init_FillerConfigService();
-
-// src/services/bundler-preflight.ts
-init_esm_shims();
-init_chains2();
-init_interpolated_curve();
-init_Logger();
-var BUNDLER_PREFLIGHT_TIMEOUT_MS = 1e4;
-async function assertBundlersServeEntryPoint(chains2, configService, options = {}) {
-  const timeoutMs = options.timeoutMs ?? BUNDLER_PREFLIGHT_TIMEOUT_MS;
-  const logger8 = moduleLogger(configService.loggers, "bundler-preflight");
-  const failures = await Promise.all(
-    chains2.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, logger8);
-    })
-  );
-  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(url2) {
-  try {
-    return new URL(url2).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, logger8) {
-  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);
-    logger8.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/server/setup-api.ts
 init_wallet3();
 
 // src/services/substrate-key.ts
@@ -343781,8 +343581,6 @@ async function handleSetupRequest(server, setup, req, res, path2, method) {
         return sendJson(res, 200, await validateAlchemyKey(body, deps));
       case "validate-rpc":
         return sendJson(res, 200, await validateRpc(body, deps));
-      case "validate-bundler":
-        return sendJson(res, 200, await validateBundler(body, deps));
       case "validate-token":
         return sendJson(res, 200, await validateToken(body));
       case "derive-evm-address":
@@ -343815,9 +343613,7 @@ async function validateAlchemyKey(body, deps) {
       stateMachineId: meta.stateMachineId,
       label: meta.label,
       note: meta.note,
-      rpcUrl,
-      // Alchemy serves ERC-4337 bundler methods on the same endpoint.
-      bundlerUrl: rpcUrl
+      rpcUrl
     };
   });
   const probe = chains2.find((c6) => c6.rpcUrl);
@@ -343855,40 +343651,6 @@ async function validateRpc(body, deps) {
   );
   return { ok: results.every((r7) => !r7.error), results };
 }
-async function validateBundler(body, deps) {
-  const url2 = String(body.url ?? "").trim();
-  if (!url2) return { ok: false, warning: "Bundler URL is empty" };
-  try {
-    const entryPoints = await withTimeout3(
-      deps.rpcRequest(url2, "eth_supportedEntryPoints", []),
-      PROBE_TIMEOUT_MS,
-      "Bundler probe"
-    );
-    const chainId = Number(body.chainId);
-    const required2 = Number.isInteger(chainId) ? new ChainConfigService({}).getEntryPointAddress(formatChainKey(chainId)) : void 0;
-    if (!required2) return { ok: true, entryPoints };
-    if (!Array.isArray(entryPoints) || !entryPoints.every((address) => typeof address === "string")) {
-      return {
-        ok: true,
-        entryPoints,
-        warning: `Bundler's eth_supportedEntryPoints answer is not a list of addresses, so it could not be confirmed to support EntryPoint ${required2}, which this chain's solver account uses. Simplex will use it and warn.`
-      };
-    }
-    if (!servesEntryPoint(entryPoints, required2)) {
-      return {
-        ok: true,
-        entryPoints,
-        warning: `Bundler does not support EntryPoint ${required2}, which this chain's solver account uses; it lists ${describeEntryPoints(entryPoints)}. Simplex will refuse to use it.`
-      };
-    }
-    return { ok: true, entryPoints };
-  } catch (err) {
-    return {
-      ok: true,
-      warning: `Bundler did not answer eth_supportedEntryPoints: ${err instanceof Error ? err.message : err}`
-    };
-  }
-}
 async function validateToken(body) {
   const rpcUrl = String(body.rpcUrl ?? "").trim();
   const address = String(body.address ?? "").trim();
@@ -344026,7 +343788,6 @@ function maskToml(config5, chainLabels) {
   }
   for (const chain2 of masked.chains) {
     chain2.rpcUrls = chain2.rpcUrls.map(maskUrlKey);
-    chain2.bundlerUrl = maskUrlKey(chain2.bundlerUrl);
   }
   return emitFillerToml(masked, { chainComments: chainLabels });
 }
@@ -344100,12 +343861,7 @@ function openSseStream(req, res, clients) {
   res.once("close", cleanup);
   res.once("error", cleanup);
 }
-var OPERATOR_PROBES = [
-  "/api/setup/validate-token",
-  "/api/setup/validate-rpc",
-  "/api/setup/validate-bundler",
-  "/api/setup/validate-alchemy-key"
-];
+var OPERATOR_PROBES = ["/api/setup/validate-token", "/api/setup/validate-rpc", "/api/setup/validate-alchemy-key"];
 var LOGS_UNAVAILABLE = "Log capture is not enabled for this filler";
 var MAX_LOG_STREAM_QUEUE = 5e3;
 var MAX_LOG_PAGE = 2e3;
@@ -344555,9 +344311,6 @@ var UiServer = class {
           const body = JSON.parse(await readBody(req));
           if (path2 === "/api/setup/validate-rpc")
             return sendJson(res, 200, await validateRpc(body, this.deps));
-          if (path2 === "/api/setup/validate-bundler") {
-            return sendJson(res, 200, await validateBundler(body, this.deps));
-          }
           if (path2 === "/api/setup/validate-alchemy-key") {
             return sendJson(res, 200, await validateAlchemyKey(body, this.deps));
           }
@@ -345273,7 +345026,7 @@ var UiServer = class {
         stateMachineId: formatChainKey(chainId),
         label: chainLabel(chainId),
         rpcUrls: chain2.rpcUrls,
-        bundlerUrl: chain2.bundlerUrl,
+        bundlerUrl: hyperbridgeBundlerUrl(chainId) ?? "",
         watchOnly: globalWatchOnly ? watchOnly : Boolean(watchOnly?.[String(chainId)]),
         running: running.has(chainId)
       };
@@ -345320,11 +345073,11 @@ var UiServer = class {
         }
         const rpcUrls = (Array.isArray(row.rpcUrls) ? row.rpcUrls : []).map((url2) => String(url2).trim()).filter(Boolean);
         validateRpcUrls(rpcUrls);
-        const bundlerUrl = String(row.bundlerUrl ?? "").trim();
-        if (!bundlerUrl) {
-          throw new Error(`${chainLabel(chainId)} needs a bundler URL to submit fill UserOperations`);
+        const watchOnly = row.watchOnly === true;
+        if (!watchOnly && op.config.simplex.watchOnly !== true && !hyperbridgeBundlerUrl(chainId)) {
+          throw new Error(`Hyperbridge runs no bundler for ${chainLabel(chainId)}, so it can only be watched`);
         }
-        rows.push({ chainId, rpcUrls, bundlerUrl, watchOnly: row.watchOnly === true });
+        rows.push({ chainId, rpcUrls, watchOnly });
       }
     } catch (err) {
       return sendJson(res, 400, { error: err instanceof Error ? err.message : String(err) });
@@ -345356,7 +345109,7 @@ var UiServer = class {
     } catch (err) {
       return sendJson(res, 400, { error: err instanceof Error ? err.message : String(err) });
     }
-    op.config.chains = rows.map(({ rpcUrls, bundlerUrl }) => ({ rpcUrls, bundlerUrl }));
+    op.config.chains = rows.map(({ rpcUrls }) => ({ rpcUrls }));
     if (Object.keys(confirmationPolicies).length > 0) op.config.confirmationPolicies = confirmationPolicies;
     if (typeof op.config.simplex.watchOnly !== "boolean") {
       const perChain = Object.fromEntries(rows.filter((r7) => r7.watchOnly).map((r7) => [String(r7.chainId), true]));
@@ -352242,7 +351995,7 @@ var UserOpSender = class {
     let auth;
     let fees4;
     try {
-      fees4 = await this.getGasPrice(bundlerUrl, publicClient, chainId);
+      fees4 = await this.getGasPrice(bundlerUrl, publicClient);
       const gasForPrefund = gas ?? {
         verificationGasLimit: FALLBACK_VERIFICATION_GAS_LIMIT,
         callGasLimit: FALLBACK_CALL_GAS_LIMIT,
@@ -352397,48 +352150,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 lower2 = bundlerUrl.toLowerCase();
-    if (lower2.includes("pimlico.io")) {
-      const res = await this.sendBundlerRpc(
-        bundlerUrl,
-        BundlerMethod.PIMLICO_GET_USER_OPERATION_GAS_PRICE,
-        []
-      );
-      return { maxFeePerGas: BigInt(res.fast.maxFeePerGas), maxPriorityFeePerGas: BigInt(res.fast.maxPriorityFeePerGas) };
-    }
-    if (lower2.includes("alchemy.com")) {
-      const [rundlerPriorityFee2, latestBlock2] = await Promise.all([
-        this.sendBundlerRpc(bundlerUrl, 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(),
-      fetchRundlerPriorityFee(bundlerUrl)
+      publicClient.getBlock({ blockTag: "latest" })
     ]);
-    const fees4 = {
-      maxFeePerGas: gasPrice + gasPrice * MAX_FEE_BUMP_PERCENT / 100n,
-      maxPriorityFeePerGas: gasPrice + gasPrice * PRIORITY_FEE_BUMP_PERCENT / 100n
-    };
-    if (rundlerPriorityFee === null) return fees4;
-    const latestBlock = await publicClient.getBlock({ blockTag: "latest" });
-    return applyRundlerPriorityFee(fees4, {
-      rundlerPriorityFee,
-      baseFeePerGas: latestBlock.baseFeePerGas ?? gasPrice,
-      priorityFeeBumpPercent: PRIORITY_FEE_BUMP_PERCENT,
-      maxFeeBumpPercent: MAX_FEE_BUMP_PERCENT
-    });
+    return 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, {
@@ -386836,6 +386567,86 @@ init_FillerConfigService();
 init_filler_toml();
 init_defaults8();
 
+// src/services/bundler-preflight.ts
+init_esm_shims();
+init_chains2();
+init_interpolated_curve();
+init_Logger();
+var BUNDLER_PREFLIGHT_TIMEOUT_MS = 1e4;
+async function assertBundlersServeEntryPoint(chains2, configService, options = {}) {
+  const timeoutMs = options.timeoutMs ?? BUNDLER_PREFLIGHT_TIMEOUT_MS;
+  const logger8 = moduleLogger(configService.loggers, "bundler-preflight");
+  const failures = await Promise.all(
+    chains2.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, logger8);
+    })
+  );
+  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(url2) {
+  try {
+    return new URL(url2).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, logger8) {
+  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);
+    logger8.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
 init_esm_shims();
 init_Logger();
@@ -388943,7 +388754,7 @@ var OrderScanner = class _OrderScanner {
   async addChainNow(chain2) {
     if (this.closed) throw new Error("This OrderScanner is closed");
     const rpcUrls = validateRpcUrls(chain2.rpcUrls);
-    const chainId = chain2.chainId ?? (await resolveChainConfigs([{ rpcUrls, bundlerUrl: chain2.bundlerUrl ?? "" }], {
+    const chainId = chain2.chainId ?? (await resolveChainConfigs([{ rpcUrls }], {
       loggers: this.loggers,
       tolerateUnreachable: true
     }))[0].chainId;
@@ -389376,10 +389187,7 @@ var ChainController = class {
   async add(chain2) {
     return this.serialise(async () => {
       validateRpcUrls(chain2.rpcUrls);
-      if (!chain2.bundlerUrl?.trim()) {
-        throw new Error("A bundler URL is required to submit fill UserOperations");
-      }
-      const [resolved] = await resolveChainConfigs([{ rpcUrls: chain2.rpcUrls, bundlerUrl: chain2.bundlerUrl }]);
+      const [resolved] = await resolveChainConfigs([{ rpcUrls: chain2.rpcUrls }]);
       const { chainId } = resolved;
       const { configService, config: config5, intentFiller } = this.runtime;
       if (configService.getConfiguredChainIds().includes(chainId)) {
@@ -389408,7 +389216,7 @@ var ChainController = class {
       if (watchOnly) intentFiller.setWatchOnly(chainId, true);
       try {
         if (!inScanner) {
-          await this.scanner.addChain({ rpcUrls: chain2.rpcUrls, bundlerUrl: chain2.bundlerUrl, chainId });
+          await this.scanner.addChain({ rpcUrls: chain2.rpcUrls, chainId });
         }
         this.runtime.chainClientManager.invalidate(formatChainKey(chainId));
         await intentFiller.addChain(configService.getChainConfig(formatChainKey(chainId)));
@@ -389425,7 +389233,7 @@ var ChainController = class {
         this.runtime.confirmationPolicy.adopt(chainId, resolvedPolicy);
       }
       this.runtime.resolvedChains.push(resolved);
-      config5.chains = [...config5.chains, { rpcUrls: chain2.rpcUrls, bundlerUrl: chain2.bundlerUrl }];
+      config5.chains = [...config5.chains, { rpcUrls: chain2.rpcUrls }];
       if (Object.keys(confirmationPolicies).length > 0) config5.confirmationPolicies = confirmationPolicies;
       this.syncWatchOnlyToConfig();
       await this.persist();
@@ -389470,9 +389278,7 @@ var ChainController = class {
       validateRpcUrls(rpcUrls);
       const index3 = this.runtime.resolvedChains.findIndex((chain2) => chain2.chainId === chainId);
       if (index3 < 0) throw new Error(`Chain ${chainId} is not configured`);
-      const [probed] = await resolveChainConfigs([
-        { rpcUrls, bundlerUrl: this.runtime.resolvedChains[index3].bundlerUrl ?? "" }
-      ]);
+      const [probed] = await resolveChainConfigs([{ rpcUrls }]);
       if (probed.chainId !== chainId) {
         throw new Error(`Those endpoints answer for chain ${probed.chainId}, not ${chainId}`);
       }
@@ -389491,20 +389297,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 index3 = this.runtime.resolvedChains.findIndex((chain2) => chain2.chainId === chainId);
-      if (index3 < 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[index3].bundlerUrl = bundlerUrl;
-      this.runtime.config.chains[index3].bundlerUrl = bundlerUrl;
-      await this.persist();
-    });
-  }
   /** Monitor without filling. Takes effect on the next order. */
   async setWatchOnly(chainId, watchOnly) {
     return this.serialise(async () => {