@hyperbridge/simplex 0.17.0 → 0.18.0

package/dist/index.cjs

@@ -37,7 +37,6 @@ __export(src_exports, {
   LoggerContext: () => LoggerContext,
   MemoryDataStore: () => MemoryDataStore,
   OrderScanner: () => OrderScanner,
-  PairController: () => PairController,
   RebalanceController: () => RebalanceController,
   SignerType: () => SignerType,
   Simplex: () => Simplex,
@@ -56,14 +55,12 @@ __export(src_exports, {
   mpcVaultSigner: () => mpcVaultSigner,
   normalizeSymbol: () => normalizeSymbol,
   parseChainKey: () => parseChainKey,
-  pickAnchorStable: () => pickAnchorStable,
   privateKeySigner: () => privateKeySigner,
   registrySymbols: () => registrySymbols,
   secretPhraseSigner: () => secretPhraseSigner,
   turnkeySigner: () => turnkeySigner,
   validateAssetDefinitions: () => validateAssetDefinitions,
   validateConfig: () => validateConfig,
-  validatePairConfigs: () => validatePairConfigs,
   validateSecretPhrase: () => validateSecretPhrase,
   validateSignerConfig: () => validateSignerConfig,
   validateVaultToml: () => validateVaultToml,
@@ -75,7 +72,8 @@ module.exports = __toCommonJS(src_exports);
 var import_node_events3 = require("node:events");
 
 // src/core/boot.ts
-var import_viem32 = require("viem");
+var import_node_path = require("node:path");
+var import_viem34 = require("viem");
 
 // src/core/filler.ts
 var import_util_crypto = require("@polkadot/util-crypto");
@@ -625,6 +623,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 = {
@@ -755,92 +767,6 @@ var AssetRegistry = class {
   }
 };
 
-// src/config/pairs.ts
-var RETIRED_PAIR_KEYS = ["bidPriceCurve", "askPriceCurve", "maxOrderSize", "referenceOnly"];
-function retiredPairKeys(pairs) {
-  const carried = /* @__PURE__ */ new Set();
-  for (const pair of pairs) {
-    for (const key of RETIRED_PAIR_KEYS) {
-      if (pair[key] !== void 0) carried.add(key);
-    }
-  }
-  return RETIRED_PAIR_KEYS.filter((key) => carried.has(key));
-}
-function isKnownSymbol(symbol, userAssets) {
-  const normalized = normalizeSymbol(symbol);
-  if (isRegistrySymbol(normalized)) return true;
-  return Object.keys(userAssets ?? {}).some((key) => normalizeSymbol(key) === normalized);
-}
-function assertPairSymbolsResolve(pairs, registry, chainNames) {
-  const pairSymbols = new Set(pairs.flatMap((pair) => [pair.token0, pair.token1]));
-  for (const pair of pairs) {
-    for (const symbol of [pair.token0, pair.token1]) {
-      const resolvesSomewhere = chainNames.some((chainName2) => registry.getAddress(symbol, chainName2) !== null);
-      if (!resolvesSomewhere) {
-        throw new Error(
-          `pairs.${pair.token0}/${pair.token1}: '${symbol}' does not resolve to a deployed contract on any configured chain`
-        );
-      }
-    }
-  }
-  for (const chainName2 of chainNames) {
-    const addressOwner = /* @__PURE__ */ new Map();
-    for (const symbol of pairSymbols) {
-      const address = registry.getAddress(symbol, chainName2)?.toLowerCase();
-      if (!address) continue;
-      const owner = addressOwner.get(address);
-      if (owner && normalizeSymbol(owner) !== normalizeSymbol(symbol)) {
-        throw new Error(
-          `assets: '${symbol}' and '${owner}' both resolve to ${address} on ${chainName2} \u2014 symbols must map to distinct contracts`
-        );
-      }
-      addressOwner.set(address, symbol);
-    }
-  }
-}
-function pickAnchorStable(pairs, symbol) {
-  const target = normalizeSymbol(symbol);
-  for (const stable of USD_STABLE_SYMBOLS) {
-    const taken = pairs.some((pair) => {
-      const token0 = normalizeSymbol(pair.token0);
-      const token1 = normalizeSymbol(pair.token1);
-      return token0 === stable && token1 === target || token0 === target && token1 === stable;
-    });
-    if (!taken) return stable;
-  }
-  return null;
-}
-function validatePairConfigs(pairs, userAssets) {
-  if (!Array.isArray(pairs) || pairs.length === 0) {
-    throw new Error("pairs: at least one [[pairs]] entry is required");
-  }
-  const seen = /* @__PURE__ */ new Set();
-  for (const pair of pairs) {
-    if (!pair.token0 || !pair.token1) {
-      throw new Error("pairs: each entry needs 'token0' and 'token1' symbols");
-    }
-    const token0 = normalizeSymbol(pair.token0);
-    const token1 = normalizeSymbol(pair.token1);
-    const label = `${token0}/${token1}`;
-    if (seen.has(label)) {
-      throw new Error(`pairs.${label}: pair is declared twice`);
-    }
-    if (seen.has(`${token1}/${token0}`)) {
-      throw new Error(
-        `pairs.${label}: ${token1}/${token0} is already declared \u2014 a market has one orientation, and a limit order on either side trades it`
-      );
-    }
-    seen.add(label);
-    for (const symbol of [token0, token1]) {
-      if (!isKnownSymbol(symbol, userAssets)) {
-        throw new Error(
-          `pairs.${label}: unknown symbol '${symbol}' \u2014 the registry ships ${registrySymbols().join(", ")}; anything else needs an [assets.${symbol}] entry`
-        );
-      }
-    }
-  }
-}
-
 // src/config/abis/ERC20.ts
 var ERC20_ABI = [
   {
@@ -1245,7 +1171,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 +1240,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;
@@ -1664,7 +1584,7 @@ function validateOrderbookConfig(orderbook) {
 function validateConfig(config, cliWatchOnly = false) {
   if ("strategies" in config) {
     throw new Error(
-      "[[strategies]] was removed \u2014 declare top-level [[pairs]] instead (a same-token pair like USDC/USDC with an ask curve below par replaces the stable strategy; engine settings moved to [confirmationPolicies])"
+      "[[strategies]] was removed \u2014 simplex prices every fill from the limit orders you post. Run `simplex init` to migrate this config; per-strategy confirmation policies move to [confirmationPolicies]"
     );
   }
   const allChainsWatchOnly2 = cliWatchOnly || config.simplex?.watchOnly === true;
@@ -1681,9 +1601,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) {
@@ -1732,9 +1649,6 @@ function validateConfig(config, cliWatchOnly = false) {
   if (config.assets) {
     validateAssetDefinitions(config.assets);
   }
-  if ((config.pairs?.length ?? 0) > 0) {
-    validatePairConfigs(config.pairs, config.assets);
-  }
   if (config.confirmationPolicies) {
     void new ConfirmationPolicy(config.confirmationPolicies);
   }
@@ -2545,13 +2459,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 +2560,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 +2569,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 +4367,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);
@@ -18543,6 +18378,10 @@ var import_viem22 = require("viem");
 var import_viem18 = require("viem");
 var RECOMMENDED_AMOUNT_USD = 5n;
 var VERIFICATION_GAS_LIMIT_PERMIT2 = 200000n;
+var PERMIT2_VERIFICATION_GAS_BY_CHAIN = { 137: 300000n };
+function permit2VerificationGasLimit(chainId) {
+  return PERMIT2_VERIFICATION_GAS_BY_CHAIN[chainId] ?? VERIFICATION_GAS_LIMIT_PERMIT2;
+}
 var VERIFICATION_GAS_LIMIT_PERMIT = 250000n;
 var PERMIT2_DEADLINE_SECONDS = 3600n;
 var POST_OP_GAS_LIMIT_SIMPLEX = 40000n;
@@ -18574,6 +18413,13 @@ var EIP2612_ABI = [
     outputs: [{ internalType: "string", name: "", type: "string" }],
     stateMutability: "view",
     type: "function"
+  },
+  {
+    inputs: [],
+    name: "DOMAIN_SEPARATOR",
+    outputs: [{ internalType: "bytes32", name: "", type: "bytes32" }],
+    stateMutability: "view",
+    type: "function"
   }
 ];
 
@@ -18635,25 +18481,73 @@ function normalizeSignature65(signature) {
 }
 
 // src/services/paymaster/permit.ts
+var DOMAIN_SHAPES = [
+  {
+    fields: [
+      { name: "name", type: "string" },
+      { name: "version", type: "string" },
+      { name: "chainId", type: "uint256" },
+      { name: "verifyingContract", type: "address" }
+    ],
+    domain: (name, version, chainId, verifyingContract) => ({ name, version, chainId, verifyingContract })
+  },
+  // USDT0 on Polygon: the chain id goes in a salt instead of a chainId field.
+  {
+    fields: [
+      { name: "name", type: "string" },
+      { name: "version", type: "string" },
+      { name: "verifyingContract", type: "address" },
+      { name: "salt", type: "bytes32" }
+    ],
+    domain: (name, version, chainId, verifyingContract) => ({
+      name,
+      version,
+      verifyingContract,
+      salt: (0, import_viem21.pad)((0, import_viem21.toHex)(chainId), { size: 32 })
+    })
+  }
+];
+var FALLBACK_VERSIONS = ["1", "2"];
+async function readIfPresent(read) {
+  try {
+    return await read();
+  } catch (error) {
+    const isRevert = error instanceof import_viem21.BaseError && error.walk((e) => e instanceof import_viem21.ContractFunctionRevertedError || e instanceof import_viem21.ContractFunctionZeroDataError);
+    if (isRevert) return void 0;
+    throw error;
+  }
+}
+async function resolvePermitDomain(client, tokenAddress, chainId) {
+  const read = (functionName) => readIfPresent(() => client.readContract({ address: tokenAddress, abi: EIP2612_ABI, functionName }));
+  const separator = await read("DOMAIN_SEPARATOR");
+  if (!separator) return null;
+  const name = await read("name");
+  if (name === void 0) return null;
+  const version = await read("version");
+  for (const candidate of version === void 0 ? FALLBACK_VERSIONS : [version]) {
+    for (const shape of DOMAIN_SHAPES) {
+      const domain = shape.domain(name, candidate, chainId, tokenAddress);
+      const hash = (0, import_viem21.hashDomain)({ domain, types: { EIP712Domain: shape.fields } });
+      if (hash.toLowerCase() === separator.toLowerCase()) return { domain, fields: shape.fields };
+    }
+  }
+  return null;
+}
 async function signEip2612Permit(client, signer, owner, spender, tokenAddress, value, chainId) {
-  const token = (0, import_viem21.getContract)({
-    client,
+  const permitDomain = await resolvePermitDomain(client, tokenAddress, chainId);
+  if (!permitDomain) {
+    throw new Error(`${tokenAddress} on chain ${chainId} has no EIP-2612 permit domain Simplex can sign for`);
+  }
+  const nonce = await client.readContract({
     address: tokenAddress,
-    abi: EIP2612_ABI
+    abi: EIP2612_ABI,
+    functionName: "nonces",
+    args: [owner]
   });
-  const [name, version, nonce] = await Promise.all([
-    token.read.name(),
-    token.read.version(),
-    token.read.nonces([owner])
-  ]);
   const typedData = {
     types: {
-      EIP712Domain: [
-        { name: "name", type: "string" },
-        { name: "version", type: "string" },
-        { name: "chainId", type: "uint256" },
-        { name: "verifyingContract", type: "address" }
-      ],
+      // Listed explicitly: custody backends hash the domain from this entry, not from `domain`.
+      EIP712Domain: permitDomain.fields,
       Permit: [
         { name: "owner", type: "address" },
         { name: "spender", type: "address" },
@@ -18663,12 +18557,7 @@ async function signEip2612Permit(client, signer, owner, spender, tokenAddress, v
       ]
     },
     primaryType: "Permit",
-    domain: {
-      name,
-      version,
-      chainId,
-      verifyingContract: tokenAddress
-    },
+    domain: permitDomain.domain,
     message: {
       owner,
       spender,
@@ -18742,7 +18631,7 @@ async function buildSimplexPaymasterData(client, walletClient, signer, solverAcc
     );
   }
   if (permit2Allowance < recommended) {
-    if (permitBootstrap && await tokenSupportsPermit(client, tokenAddress)) {
+    if (permitBootstrap && await tokenSupportsPermit(client, tokenAddress, chainId)) {
       const pm = await buildPermitMode(
         client,
         signer,
@@ -18778,7 +18667,7 @@ async function resolvePendingPermit2Approval(client, solverAccount, paymasterAdd
   return {
     token: selected.address,
     spender: permit2,
-    permitCapable: await tokenSupportsPermit(client, selected.address)
+    permitCapable: await tokenSupportsPermit(client, selected.address, configService.getChainId(chain))
   };
 }
 function isConfigured(address) {
@@ -18798,7 +18687,7 @@ function configuredFeeTokens(chain, configService) {
 }
 async function selectToken(client, solverAccount, tokens, permit2) {
   const balances = [];
-  let fallback2 = null;
+  let fallback3 = null;
   for (const token of tokens) {
     const balance = await client.readContract({
       address: token.address,
@@ -18812,12 +18701,12 @@ async function selectToken(client, solverAccount, tokens, permit2) {
       const permit2Allowance = await readAllowance(client, token.address, solverAccount, permit2);
       const candidate = { ...token, permit2Allowance };
       if (permit2Allowance >= RECOMMENDED_AMOUNT_USD * required) return { selected: candidate, balances };
-      fallback2 ?? (fallback2 = candidate);
+      fallback3 ?? (fallback3 = candidate);
     } else {
       balances.push({ symbol: token.symbol, balance, required });
     }
   }
-  return { selected: fallback2, balances };
+  return { selected: fallback3, balances };
 }
 var PERMIT2_SUPPORT_NEGATIVE_TTL_MS = 5 * 6e4;
 var permit2Support = /* @__PURE__ */ new Map();
@@ -18870,7 +18759,7 @@ async function buildPermit2Mode(signer, p) {
   return {
     paymaster: p.spender,
     paymasterData,
-    paymasterVerificationGasLimit: VERIFICATION_GAS_LIMIT_PERMIT2,
+    paymasterVerificationGasLimit: permit2VerificationGasLimit(p.chainId),
     paymasterPostOpGasLimit: POST_OP_GAS_LIMIT_SIMPLEX
   };
 }
@@ -18940,27 +18829,8 @@ async function sendApproveTx(client, walletClient, tokenAddress, spender, amount
   });
   await client.waitForTransactionReceipt({ hash, confirmations: 2 });
 }
-async function tokenSupportsPermit(client, tokenAddress) {
-  try {
-    await client.readContract({
-      address: tokenAddress,
-      abi: [
-        {
-          inputs: [],
-          name: "version",
-          outputs: [{ type: "string" }],
-          stateMutability: "view",
-          type: "function"
-        }
-      ],
-      functionName: "version"
-    });
-    return true;
-  } catch (error) {
-    const isRevert = error instanceof import_viem22.BaseError && error.walk((e) => e instanceof import_viem22.ContractFunctionRevertedError || e instanceof import_viem22.ContractFunctionZeroDataError);
-    if (isRevert) return false;
-    throw error;
-  }
+async function tokenSupportsPermit(client, tokenAddress, chainId) {
+  return await resolvePermitDomain(client, tokenAddress, chainId) !== null;
 }
 
 // src/services/paymaster/index.ts
@@ -18976,7 +18846,7 @@ async function buildPaymasterAndData(options) {
   const shortfall = await depositShortfall(
     options,
     simplexAddr,
-    (permitBootstrap ? VERIFICATION_GAS_LIMIT_PERMIT : VERIFICATION_GAS_LIMIT_PERMIT2) + POST_OP_GAS_LIMIT_SIMPLEX
+    (permitBootstrap ? VERIFICATION_GAS_LIMIT_PERMIT : permit2VerificationGasLimit(configService.getChainId(chain))) + POST_OP_GAS_LIMIT_SIMPLEX
   );
   if (shortfall) {
     return { paymasterAndData: "0x", type: "none", reason: shortfall };
@@ -19768,12 +19638,12 @@ var ContractInteractionService = class {
     const declared = declaredMs ? declaredMs / 1e3 : void 0;
     const seconds = this.measureBlockTimeSeconds(client).then((measured) => declared ? Math.min(measured, declared) : measured).catch((err) => {
       this.blockTimes.delete(chain);
-      const fallback2 = declared ?? FALLBACK_BLOCK_TIME_SECONDS;
+      const fallback3 = declared ?? FALLBACK_BLOCK_TIME_SECONDS;
       this.logger.warn(
-        { err, chain, seconds: fallback2 },
+        { err, chain, seconds: fallback3 },
         "Could not measure the block time; using the declared one"
       );
-      return fallback2;
+      return fallback3;
     });
     this.blockTimes.set(chain, seconds);
     return seconds;
@@ -19996,7 +19866,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 +20021,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 +20852,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 +20905,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
         ]
       }
     );
@@ -22979,18 +22827,17 @@ function adjustDecimalsFloor(amount, fromDecimals, toDecimals) {
   if (fromDecimals < toDecimals) return amount * BigInt(10 ** (toDecimals - fromDecimals));
   return amount / BigInt(10 ** (fromDecimals - toDecimals));
 }
-var FXFiller = class _FXFiller {
+var FXFiller = class {
   /**
    * @param signer          Filler's signing account for UserOp signatures.
    * @param configService   Network/config provider for addresses and decimals.
    * @param clientManager   Used to get viem PublicClients for chains.
    * @param contractService Shared contract interaction service.
-   * @param pairs           Trading pairs with their bid/ask price policies and per-order caps.
-   * @param registry        Asset symbol registry resolving pair symbols per chain.
+   * @param registry        Asset symbol registry resolving symbols per chain.
    * @param options.confirmationPolicy Optional per-chain confirmation policy for cross-chain orders.
    * @param options.fundingVenues  Optional funding venues for on-chain liquidity sourcing.
    */
-  constructor(signer, configService, clientManager, contractService, pairs, registry, options) {
+  constructor(signer, configService, clientManager, contractService, registry, options) {
     this.name = "FXFiller";
     /**
      * Consecutive orders where the overfill clamp activated. Dormant: the clamp
@@ -23003,17 +22850,9 @@ var FXFiller = class _FXFiller {
     this.logger = moduleLogger(configService.loggers, "fx-simplex");
     const { confirmationPolicy, fundingVenues = [], limitOrders } = options ?? {};
     this.limitOrders = limitOrders;
-    if (pairs.length === 0) {
-      throw new Error("FXFiller requires at least one trading pair");
-    }
-    const seenPairs = /* @__PURE__ */ new Set();
-    for (const pair of pairs) {
-      _FXFiller.assertPairValid(pair, seenPairs);
-    }
     this.configService = configService;
     this.clientManager = clientManager;
     this.contractService = contractService;
-    this.pairs = pairs;
     this.registry = registry;
     this.fundingVenues = fundingVenues;
     this.signer = signer;
@@ -23025,43 +22864,6 @@ var FXFiller = class _FXFiller {
       };
     }
   }
-  /** Per-pair invariants, shared by the constructor and addPair. Adds the accepted pair's label to `seenPairs`. */
-  static assertPairValid(pair, seenPairs) {
-    const label = `${normalizeSymbol(pair.token0)}/${normalizeSymbol(pair.token1)}`;
-    const reversed = `${normalizeSymbol(pair.token1)}/${normalizeSymbol(pair.token0)}`;
-    if (seenPairs.has(label) || seenPairs.has(reversed)) {
-      throw new Error(
-        `FXFiller pair ${pair.token0}/${pair.token1}: duplicate market (a pair and its reverse are the same market)`
-      );
-    }
-    seenPairs.add(label);
-  }
-  /**
-   * Adds a market to the running engine. All-or-nothing: the pair passes the
-   * same duplicate and reverse-orientation checks the constructor enforces
-   * before it is pushed.
-   */
-  addPair(pair) {
-    const seenPairs = new Set(this.pairs.map((p) => `${normalizeSymbol(p.token0)}/${normalizeSymbol(p.token1)}`));
-    _FXFiller.assertPairValid(pair, seenPairs);
-    this.pairs.push(pair);
-  }
-  /**
-   * Removes a market from the running engine. At least one market must remain.
-   * Matching reads the limit orders rather than the pairs, so removing a market
-   * changes what the dashboard lists, not what the filler fills.
-   */
-  removePair(pair) {
-    const index = this.pairs.indexOf(pair);
-    if (index < 0) {
-      throw new Error(`FXFiller pair ${pair.token0}/${pair.token1}: not a live market`);
-    }
-    const remaining = this.pairs.filter((_, i) => i !== index);
-    if (remaining.length === 0) {
-      throw new Error("FXFiller requires at least one trading pair \u2014 the last market cannot be removed live");
-    }
-    this.pairs.splice(index, 1);
-  }
   // =========================================================================
   // Lifecycle
   // =========================================================================
@@ -23824,7 +23626,7 @@ var TokenSender = class {
         });
       }
     }
-    const result = await this.submit(chain, calls);
+    const result = await this.submitCalls(chain, calls);
     this.logger.warn({ chain, token, amount, to, redeemed, ...result }, "Operator send executed");
     return { ...result, redeemed };
   }
@@ -23880,16 +23682,23 @@ var TokenSender = class {
     }
     return null;
   }
-  async submit(chain, calls) {
+  /**
+   * Executes a batch from the filler wallet: sponsored UserOp first, native tx
+   * when no sponsor is available. Shared by every operator-initiated outbound flow.
+   */
+  async submitCalls(chain, calls) {
     if (this.userOpSender?.canSponsor(chain)) {
+      const bootstrap = await this.permit2Bootstrap(chain);
+      const batch = bootstrap ? [bootstrap, ...calls] : calls;
       const result = await this.userOpSender.trySendSponsored({
         chain,
-        callData: (0, import_sdk16.encodeERC7821ExecuteBatch)(calls),
+        callData: (0, import_sdk16.encodeERC7821ExecuteBatch)(batch),
         gas: {
           verificationGasLimit: 60000n,
-          callGasLimit: 450000n * BigInt(calls.length),
+          callGasLimit: 450000n * BigInt(batch.length),
           preVerificationGas: 150000n
-        }
+        },
+        permitBootstrap: !!bootstrap
       });
       if (result) return { txHash: result.txHash, sponsored: true };
       this.logger.warn({ chain }, "Sponsored send unavailable, sending native tx");
@@ -23911,43 +23720,1121 @@ var TokenSender = class {
     if (receipt.status !== "success") throw new Error(`Send tx reverted: ${tx}`);
     return { txHash: tx, sponsored: false };
   }
-};
-
-// src/orderbook/lifecycle.ts
-var EXPIRY_SWEEP_MS = 3e4;
-var LimitOrderLifecycle = class {
-  constructor(service, options, loggers = defaultLoggerContext()) {
-    this.service = service;
-    this.options = options;
-    this.timers = [];
-    this.logger = loggers.get("limit-orders");
-  }
   /**
-   * Starts the clocks and kicks off the first reconciliation.
-   *
-   * That first pass is not awaited. It is a round trip to the orderbook for
-   * every page of the solver's orders, and boot has no reason to wait on it.
+   * The `approve(Permit2, max)` to run first when the wallet has never approved Permit2 for its fee
+   * token on this chain, and that token has an EIP-2612 permit. The op then pays its gas with a permit
+   * and installs the approval, so a wallet with no native can still send; later ops use Permit2.
+   * Undefined otherwise, or when the check fails, and the send goes ahead as before.
    */
-  async start() {
-    if (this.timers.length > 0) return;
-    const heartbeatMs = await this.service.heartbeatIntervalMs().catch((err) => {
-      this.logger.warn({ err }, "Could not read the orderbook's heartbeat interval; using the fallback");
-      return FALLBACK_HEARTBEAT_INTERVAL_MS;
-    });
-    const reconcileMs = this.options.reconcileIntervalSecs * 1e3;
-    this.every(heartbeatMs, "heartbeat", () => this.service.heartbeat());
-    this.every(EXPIRY_SWEEP_MS, "expiry", () => this.expire());
-    this.every(reconcileMs, "reconciliation", () => this.upkeep());
-    this.logger.info({ heartbeatMs, expiryMs: EXPIRY_SWEEP_MS, reconcileMs }, "Orderbook lifecycle started");
-    void this.upkeep();
-  }
-  stop() {
-    this.timers.forEach((timer) => clearInterval(timer));
-    this.timers = [];
+  async permit2Bootstrap(chain) {
+    const paymaster = this.configService?.getSimplexPaymasterAddress(chain);
+    if (!this.configService || !paymaster) return void 0;
+    try {
+      const pending = await resolvePendingPermit2Approval(
+        this.clientManager.getPublicClient(chain),
+        this.solver,
+        paymaster,
+        chain,
+        this.configService
+      );
+      if (!pending?.permitCapable) return void 0;
+      return {
+        target: pending.token,
+        value: 0n,
+        data: (0, import_viem30.encodeFunctionData)({
+          abi: ERC20_ABI,
+          functionName: "approve",
+          args: [pending.spender, import_viem30.maxUint256]
+        })
+      };
+    } catch (error) {
+      this.logger.warn({ chain, error }, "Could not check whether this send must install the Permit2 approval");
+      return void 0;
+    }
   }
-  /** Takes orders that have outlived their TTL off the book. */
-  async expire() {
-    const expired = await this.service.expireStale();
+};
+
+// src/services/BridgeTopUp.ts
+var import_sdk17 = require("@hyperbridge/sdk");
+var import_node_crypto2 = require("node:crypto");
+var import_promises = require("node:timers/promises");
+var import_viem31 = require("viem");
+var import_chains2 = require("viem/chains");
+var SIMPLEX_REFERRER = (0, import_viem31.stringToHex)("Simplex", { size: 32 });
+var BRIDGE_TOP_UP_CHAIN = "EVM-56";
+var BRIDGE_TOKEN_BSC = "0x5b0c50fDd52ECC0d4c682c441eaBaD41FfDEABBB";
+var BRIDGE_DECIMALS = 18;
+var NEXUS_STATE_MACHINE = "POLKADOT-3367";
+var NEXUS_CONSENSUS_STATE = "DOT0";
+var NEXUS_WS_URL = "wss://nexus.rpc.polytope.technology";
+var NEXUS_UNIT = 10n ** 6n;
+var QUOTE_SLIPPAGE_BPS = 100n;
+var ORDER_WINDOW_SECONDS = 30 * 60;
+var AUCTION_TIME_MS = 15e3;
+var REFUND_POLL_MS = 1e4;
+var RECEIPT_TIMEOUT_MS = 12e4;
+var MAX_EVENTS = 50;
+var DELIVERY_POLL_MS = 15e3;
+var DELIVERY_RETRY_MS = 6e4;
+var SELF_RELAY_GRACE_MS = 9e4;
+var RELAYER_DELIVERY_WAIT_MS = 3 * 6e4;
+var STATUS_BACKFILL_MS = 30 * 6e4;
+var NETWORK_TIMEOUT_MS = 3e4;
+var LOG_CHUNK_BLOCKS = 300n;
+var FILL_SEARCH_BEFORE_MS = 3 * 6e4;
+var FILL_SEARCH_AFTER_MS = 6e4;
+var ORDER_FILLED_EVENT = import_sdk17.IntentGatewayABI.find(
+  (item) => item.type === "event" && item.name === "OrderFilled"
+);
+var DELIVERY_REQUEST_QUERY = `query TopUpDelivery($hash: String!) {
+	requestV2s(
+		filter: {
+			source: { equalTo: "EVM-56" }
+			dest: { equalTo: "POLKADOT-3367" }
+			statusMetadata: { some: { transactionHash: { equalTo: $hash } } }
+		}
+	) {
+		nodes { commitment }
+	}
+}`;
+var ORDER_QUERY2 = `query TopUpOrder($commitment: String!) {
+	iOrderV3s(filter: { commitment: { equalTo: $commitment } }) {
+		nodes {
+			status
+			statusMetadata { nodes { status timestamp transactionHash filler } }
+		}
+	}
+}`;
+var CALL_TUPLE = [
+  {
+    type: "tuple[]",
+    components: [
+      { name: "to", type: "address" },
+      { name: "value", type: "uint256" },
+      { name: "data", type: "bytes" }
+    ]
+  }
+];
+var PENDING_STAGES = /* @__PURE__ */ new Set([
+  "placing",
+  "awaiting_bids",
+  "filling",
+  "delivering",
+  "unfilled",
+  "reclaiming"
+]);
+function isBridgeTopUpPending(stage) {
+  return PENDING_STAGES.has(stage);
+}
+function encodeBridgeTopUpCall(bridgeToken, recipient, amount) {
+  const data = (0, import_viem31.encodeFunctionData)({
+    abi: import_sdk17.HyperFungibleTokenABI,
+    functionName: "send",
+    args: [
+      {
+        dest: (0, import_viem31.toHex)(NEXUS_STATE_MACHINE),
+        to: recipient,
+        amount,
+        timeout: 0n,
+        relayerFee: 0n,
+        data: "0x"
+      }
+    ]
+  });
+  return (0, import_viem31.encodeAbiParameters)(CALL_TUPLE, [[{ to: bridgeToken, value: 0n, data }]]);
+}
+function bidPreview(bid) {
+  return {
+    solverAddress: bid.solverAddress,
+    outputs: bid.outputs.map((output) => ({ token: output.token, amount: output.amount.toString() }))
+  };
+}
+function bridgeTopUpOutput(quotedOut) {
+  const afterSlippage = quotedOut * (10000n - QUOTE_SLIPPAGE_BPS) / 10000n;
+  return afterSlippage / NEXUS_UNIT * NEXUS_UNIT;
+}
+function serializeOrder(order) {
+  return JSON.stringify(order, (_key, value) => typeof value === "bigint" ? { $bigint: value.toString() } : value);
+}
+function deserializeOrder(json) {
+  return JSON.parse(
+    json,
+    (_key, value) => value && typeof value === "object" && typeof value.$bigint === "string" ? BigInt(value.$bigint) : value
+  );
+}
+var BridgeTopUp = class {
+  constructor(deps) {
+    this.deps = deps;
+    this.gateways = /* @__PURE__ */ new Map();
+    /** Serializes state writes so a later stage never lands before an earlier one. */
+    this.writes = Promise.resolve();
+    this.logger = moduleLogger(deps.loggers, "bridge-top-up");
+  }
+  get bridgeToken() {
+    return this.deps.configService.getAssetBySymbol(BRIDGE_TOP_UP_CHAIN, "BRIDGE") ?? BRIDGE_TOKEN_BSC;
+  }
+  /** Loads the stored top-up and resumes driving it when it was left open. Never rejects. */
+  restore() {
+    this.loaded ?? (this.loaded = (async () => {
+      try {
+        this.record = (await this.deps.state.get()).bridgeTopUp;
+      } catch (err) {
+        this.logger.warn({ err }, "Could not read the stored BRIDGE top-up");
+        return;
+      }
+      const record = this.record;
+      if (record?.stage === "failed" && record.placeTxHash && !record.commitment && record.sessionPrivateKey) {
+        void this.recoverPlacement();
+        return;
+      }
+      if (!record || !isBridgeTopUpPending(record.stage)) return;
+      if (record.stage === "placing" && !record.placeTxHash) {
+        await this.update({
+          stage: "failed",
+          error: "Simplex restarted before the order was placed. Nothing was escrowed."
+        });
+        return;
+      }
+      if (record.stage === "placing") {
+        void this.recoverPlacement();
+        return;
+      }
+      if (record.stage === "awaiting_bids" || record.stage === "filling") void this.resumeOrder();
+      if (record.stage === "reclaiming") void this.driveReclaim();
+      if (record.stage === "delivering") void this.resumeDelivery();
+    })());
+    return this.loaded;
+  }
+  async current() {
+    await this.restore();
+    return this.record ? publicState(this.record) : void 0;
+  }
+  /** Networks the filler runs and has delegated its account on. */
+  async sourceChains() {
+    const chainIds = this.deps.configService.getConfiguredChainIds();
+    const delegated = await Promise.all(
+      chainIds.map((chainId) => this.deps.delegation.isDelegated(`EVM-${chainId}`).catch(() => false))
+    );
+    return chainIds.filter((_, index) => delegated[index]);
+  }
+  /** USDC and USDT wallet balances on every network a top-up can be paid from. */
+  async sources() {
+    const rows = (await this.sourceChains()).flatMap(
+      (chainId) => ["USDC", "USDT"].map(async (token) => {
+        const chain = `EVM-${chainId}`;
+        let tokenAddress;
+        let decimals;
+        try {
+          ;
+          ({ tokenAddress, decimals } = this.payToken(chain, token));
+        } catch {
+          return void 0;
+        }
+        const reserve = this.reserve(chain, tokenAddress);
+        const row = { chain, chainId, token, address: tokenAddress, reserve: (0, import_viem31.formatUnits)(reserve, decimals) };
+        try {
+          const balance = await this.walletBalance(chain, tokenAddress);
+          return {
+            ...row,
+            balance: (0, import_viem31.formatUnits)(balance, decimals),
+            spendable: (0, import_viem31.formatUnits)(balance > reserve ? balance - reserve : 0n, decimals)
+          };
+        } catch (err) {
+          this.logger.debug({ err, chain, token }, "Could not read a top-up source balance");
+          return { ...row, balance: null, spendable: null };
+        }
+      })
+    );
+    return (await Promise.all(rows)).filter((row) => row !== void 0);
+  }
+  async quote(params) {
+    const { tokenAddress, decimals } = this.payToken(params.chain, params.token);
+    const amountIn = (0, import_viem31.parseUnits)(params.amount, decimals);
+    if (amountIn <= 0n) throw new Error("Amount must be greater than 0");
+    const gateway = await this.gateway(params.chain);
+    const quote = await gateway.quoteIntent({ tokenIn: tokenAddress, tokenOut: this.bridgeToken, amountIn });
+    const bridgeOut = quote.fillable ? bridgeTopUpOutput(quote.amountOut) : 0n;
+    const rate = quote.amountIn > 0n ? Number((0, import_viem31.formatUnits)(quote.amountOut, BRIDGE_DECIMALS)) / Number((0, import_viem31.formatUnits)(quote.amountIn, decimals)) : 0;
+    return {
+      chain: params.chain,
+      token: params.token,
+      tokenAddress,
+      amountIn: (0, import_viem31.formatUnits)(amountIn, decimals),
+      bridgeOut: (0, import_viem31.formatUnits)(bridgeOut, BRIDGE_DECIMALS),
+      rate: rate.toString(),
+      fillable: quote.fillable && bridgeOut > 0n,
+      maxFillableIn: (0, import_viem31.formatUnits)(quote.maxFillableIn, decimals),
+      route: quote.route
+    };
+  }
+  /** Re-quotes, then places and drives the order in the background. Returns its state. */
+  async start(params) {
+    if (!(await this.sourceChains()).includes((0, import_sdk17.getChainId)(params.chain) ?? -1)) {
+      throw new Error(`${params.chain} is not a network the filler fills on`);
+    }
+    await this.restore();
+    if (this.record && isBridgeTopUpPending(this.record.stage)) {
+      throw new Error("A BRIDGE top-up is already pending");
+    }
+    const quote = await this.quote(params);
+    if (!quote.fillable) {
+      throw new Error(`The orderbook cannot fill ${quote.amountIn} ${params.token} (max ${quote.maxFillableIn})`);
+    }
+    const { tokenAddress, decimals } = this.payToken(params.chain, params.token);
+    const amountIn = (0, import_viem31.parseUnits)(quote.amountIn, decimals);
+    const balance = await this.balanceOf(params.chain, tokenAddress);
+    if (balance < amountIn) {
+      const reserve = (0, import_viem31.formatUnits)(this.reserve(params.chain, tokenAddress), decimals);
+      throw new Error(
+        `Not enough ${params.token}: ${(0, import_viem31.formatUnits)(balance, decimals)} spendable after the ${reserve} ${params.token} kept for gas, need ${quote.amountIn}`
+      );
+    }
+    const order = await this.buildOrder(params.chain, tokenAddress, amountIn, (0, import_viem31.parseUnits)(quote.bridgeOut, BRIDGE_DECIMALS));
+    if (this.record && isBridgeTopUpPending(this.record.stage)) {
+      throw new Error("A BRIDGE top-up is already pending");
+    }
+    const now = Date.now();
+    this.record = {
+      id: (0, import_node_crypto2.randomUUID)(),
+      chain: params.chain,
+      token: params.token,
+      amountIn: quote.amountIn,
+      bridgeOut: quote.bridgeOut,
+      stage: "placing",
+      createdAt: now,
+      updatedAt: now,
+      stageTimes: { placing: now },
+      order: serializeOrder(order)
+    };
+    await this.persist();
+    void this.place(order, tokenAddress);
+    return publicState(this.record);
+  }
+  /** Cancels an unfilled order and refunds its escrowed input to the filler wallet. */
+  async reclaim() {
+    await this.restore();
+    const record = this.record;
+    if (!record || record.stage !== "unfilled") throw new Error("There is no unfilled top-up to reclaim");
+    await this.update({ stage: "reclaiming", error: void 0 });
+    void this.driveReclaim();
+    return publicState(this.record);
+  }
+  /**
+   * Places the order, then tracks it. The SDK builds the `placeOrder` calldata and the
+   * session key; the receipt is read back here, through the filler's own multi-endpoint
+   * client, rather than by the SDK from one endpoint, where a node that has not caught up
+   * with the new block fails the read and loses track of an order that did land.
+   */
+  async place(order, tokenIn) {
+    await this.drive(async (gateway) => {
+      const gen = gateway.executeBest(order, SIMPLEX_REFERRER, { auctionTimeMs: AUCTION_TIME_MS });
+      const first = await gen.next();
+      await gen.return();
+      if (first.done || first.value.status !== "AWAITING_PLACE_ORDER") {
+        throw new Error("The SDK did not produce a placement transaction");
+      }
+      const placement = first.value;
+      await this.update({ sessionPrivateKey: placement.sessionPrivateKey });
+      const calls = this.placementCalls(order, tokenIn, placement);
+      const { txHash } = await this.deps.tokenSender.submitCalls(this.record.chain, calls);
+      await this.update({ placeTxHash: txHash });
+      await this.recordPlacement(order, txHash);
+      await this.trackOrder(gateway);
+    });
+  }
+  /**
+   * Reads the placement receipt and stores the order as the gateway committed it. Throws
+   * when the transaction placed no order, so the top-up is marked failed.
+   */
+  async recordPlacement(order, txHash) {
+    const receipt = await this.deps.clientManager.getPublicClient(this.record.chain).waitForTransactionReceipt({ hash: txHash, timeout: RECEIPT_TIMEOUT_MS });
+    const [placed] = (0, import_viem31.parseEventLogs)({ abi: import_sdk17.IntentGatewayABI, logs: receipt.logs, eventName: "OrderPlaced" });
+    if (!placed) throw new Error(`Transaction ${txHash} placed no order`);
+    const canonical = (0, import_sdk17.deriveCanonicalPlacedOrder)(order, placed.args);
+    await this.update({
+      stage: "awaiting_bids",
+      commitment: canonical.id,
+      order: serializeOrder(canonical),
+      error: void 0
+    });
+  }
+  /** Continues an order whose placement landed but was not recorded. */
+  async recoverPlacement() {
+    await this.drive(async (gateway) => {
+      const record = this.record;
+      await this.recordPlacement(deserializeOrder(record.order), record.placeTxHash);
+      await this.trackOrder(gateway);
+    });
+  }
+  async resumeDelivery() {
+    await this.drive(() => this.deliver());
+  }
+  async resumeOrder() {
+    await this.drive((gateway) => this.trackOrder(gateway));
+  }
+  /** Follows a placed order through bids to a fill, or to its deadline. */
+  async trackOrder(gateway) {
+    const record = this.record;
+    const order = deserializeOrder(record.order);
+    if (await gateway.isOrderFilled(order)) {
+      await this.update({ stage: "delivering" });
+      await this.deliver();
+      return;
+    }
+    if (!record.sessionPrivateKey) {
+      await this.update({ stage: "unfilled", error: "The order's session key was not saved, so it cannot be resumed" });
+      return;
+    }
+    const gen = gateway.resumeBest(order, {
+      sessionPrivateKey: record.sessionPrivateKey,
+      auctionTimeMs: AUCTION_TIME_MS
+    });
+    for await (const value of gen) {
+      if (await this.applyExecutionUpdate(value)) break;
+    }
+    if (this.record.stage === "delivering") await this.deliver();
+  }
+  /**
+   * Carries the bought BRIDGE to Hyperbridge. The order's output call dispatched it from
+   * BSC with no relayer fee. Relayers may still deliver it; when none has shortly after BSC
+   * is final on Hyperbridge, the filler relays it itself: a request into Hyperbridge goes
+   * in as an unsigned extrinsic and costs nothing. Runs until the request is delivered.
+   */
+  async deliver() {
+    let relayedAt = 0;
+    while (!await this.syncDelivery()) {
+      const finalized = this.record.deliveryStatuses?.find((status2) => status2.status === "SOURCE_FINALIZED");
+      const due = finalized && Date.now() - finalized.timestamp > SELF_RELAY_GRACE_MS;
+      if (due && Date.now() - relayedAt > DELIVERY_RETRY_MS) {
+        relayedAt = Date.now();
+        await this.selfRelay(this.record.deliveryCommitment).catch((err) => {
+          this.logger.warn({ err }, "Self-relay of the BRIDGE to Hyperbridge failed; retrying");
+        });
+      }
+      await (0, import_promises.setTimeout)(DELIVERY_POLL_MS);
+    }
+    const id = this.record.id;
+    while (this.record?.id === id && this.needsStatusBackfill()) {
+      await (0, import_promises.setTimeout)(DELIVERY_POLL_MS);
+      await this.syncDelivery().catch((err) => this.logger.debug({ err }, "BRIDGE delivery backfill failed"));
+    }
+  }
+  /** Delivered, but the indexer has yet to record the delivery, and not for too long. */
+  needsStatusBackfill() {
+    const record = this.record;
+    if (!record || record.stage !== "delivered" || !record.deliveryCommitment) return false;
+    if (record.deliveryStatuses?.some((status2) => status2.status === "DESTINATION")) return false;
+    return Date.now() - (record.stageTimes?.delivered ?? 0) < STATUS_BACKFILL_MS;
+  }
+  /**
+   * Reads where the order and its BRIDGE are, from the indexer and the chains, and records
+   * it. Shared by the driver and {@link sync}, and never runs twice at once. True once the
+   * BRIDGE has reached Hyperbridge.
+   */
+  syncDelivery() {
+    this.deliverySync ?? (this.deliverySync = this.readDelivery().finally(() => {
+      this.deliverySync = void 0;
+    }));
+    return this.deliverySync;
+  }
+  async readDelivery() {
+    const record = this.record;
+    if (record.stage !== "delivering" && record.stage !== "delivered") return false;
+    if (!record.fillTxHash) {
+      const fillTxHash = await this.findFill();
+      if (!fillTxHash) return false;
+      await this.update({ fillTxHash });
+    }
+    if (!record.deliveryCommitment) {
+      await this.update({ deliveryCommitment: await this.deliveryRequest(record.fillTxHash) });
+    }
+    const hyperbridge = await this.hyperbridge();
+    const request = await withTimeout(
+      this.ismpClient(hyperbridge).queryRequestWithStatus(record.deliveryCommitment),
+      "the BRIDGE request status"
+    );
+    const statuses = (request?.statuses ?? []).filter((status2) => DELIVERY_STATUSES.has(status2.status)).map((status2) => ({
+      status: status2.status,
+      timestamp: toMs(status2.metadata.timestamp),
+      txHash: status2.metadata.transactionHash
+    }));
+    if (statuses.length > 0) await this.update({ deliveryStatuses: statuses });
+    const delivered = statuses.some((status2) => status2.status === "DESTINATION") || !!await withTimeout(hyperbridge.queryRequestReceipt(record.deliveryCommitment), "the request receipt");
+    if (delivered && record.stage !== "delivered") await this.update({ stage: "delivered", error: void 0 });
+    return delivered;
+  }
+  /**
+   * The HyperFungibleToken request the fill dispatched to Hyperbridge. The indexer finds it by
+   * the fill's transaction, as the explorer's search does; the fill's own `Sent` log is the
+   * fallback while the indexer catches up.
+   */
+  async deliveryRequest(fillTxHash) {
+    const response = await withTimeout(
+      fetch(this.deps.indexerUrl, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ query: DELIVERY_REQUEST_QUERY, variables: { hash: fillTxHash } })
+      }),
+      "the indexer"
+    );
+    const body = await response.json();
+    const indexed = body.data?.requestV2s?.nodes[0]?.commitment;
+    if (indexed) return indexed;
+    const fill = await withTimeout(this.bsc().getTransactionReceipt({ hash: fillTxHash }), "the fill receipt");
+    const [sent] = (0, import_viem31.parseEventLogs)({ abi: import_sdk17.HyperFungibleTokenABI, logs: fill.logs, eventName: "Sent" });
+    if (!sent) throw new Error(`The fill ${fillTxHash} sent no BRIDGE to Hyperbridge`);
+    return sent.args.commitment;
+  }
+  /**
+   * BSC, read through every endpoint there is: the filler need not run it, and a single public
+   * endpoint refuses receipts it considers old.
+   */
+  bsc() {
+    this.bscClient ?? (this.bscClient = (0, import_viem31.createPublicClient)({
+      chain: import_chains2.bsc,
+      transport: (0, import_viem31.fallback)(this.bscProofRpcUrls().map((url) => (0, import_viem31.http)(url, { timeout: 1e4, retryCount: 0 })))
+    }));
+    return this.bscClient;
+  }
+  /**
+   * The transaction that filled the order. The executor reports it only for a fill this
+   * process selected, so it comes from the indexer, or, while the indexer has yet to reach
+   * BSC's latest blocks, from the gateway's `OrderFilled` log around when the fill was seen.
+   */
+  async findFill() {
+    const record = this.record;
+    const indexed = (await this.indexedOrder())?.find((status2) => status2.status === "FILLED");
+    if (indexed) {
+      if (indexed.filler && !record.filler) await this.update({ filler: indexed.filler });
+      return indexed.transactionHash;
+    }
+    const seenAt = record.events?.find((event) => event.status === "FILLED")?.timestamp ?? record.stageTimes?.delivering;
+    if (!seenAt) return void 0;
+    const client = this.bsc();
+    const [latest, blockTime] = await Promise.all([
+      withTimeout(client.getBlock(), "the latest BSC block"),
+      this.blockTimeSeconds()
+    ]);
+    const blockAt = (ms) => latest.number - BigInt(Math.ceil((Number(latest.timestamp) - ms / 1e3) / blockTime));
+    const from = blockAt(seenAt - FILL_SEARCH_BEFORE_MS);
+    const to = (() => {
+      const end = blockAt(seenAt + FILL_SEARCH_AFTER_MS);
+      return end < latest.number ? end : latest.number;
+    })();
+    for (let start = from; start <= to; start += LOG_CHUNK_BLOCKS) {
+      const end = start + LOG_CHUNK_BLOCKS - 1n < to ? start + LOG_CHUNK_BLOCKS - 1n : to;
+      const logs = await withTimeout(
+        client.getLogs({
+          address: this.deps.configService.getIntentGatewayAddress(BRIDGE_TOP_UP_CHAIN),
+          event: ORDER_FILLED_EVENT,
+          args: { commitment: record.commitment },
+          fromBlock: start,
+          toBlock: end
+        }),
+        "the fill on BSC"
+      );
+      if (logs[0]) return logs[0].transactionHash;
+    }
+    return void 0;
+  }
+  /** The order's statuses as the indexer has them: placed, filled, redeemed or refunded. */
+  async indexedOrder() {
+    const response = await withTimeout(
+      fetch(this.deps.indexerUrl, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ query: ORDER_QUERY2, variables: { commitment: this.record.commitment } })
+      }),
+      "the indexer"
+    );
+    const body = await response.json();
+    return body.data?.iOrderV3s?.nodes[0]?.statusMetadata.nodes.map((node) => ({
+      status: node.status,
+      timestamp: toMs(node.timestamp),
+      transactionHash: node.transactionHash,
+      filler: node.filler ?? void 0
+    }));
+  }
+  /**
+   * Brings a pending top-up up to date from the chains and the indexer, for a dashboard that
+   * is showing it: someone may have filled, delivered or refunded it while this process was
+   * not looking. One sync at a time; a call made while one runs waits for that one.
+   */
+  sync() {
+    this.syncing ?? (this.syncing = this.reconcile().catch((err) => this.logger.debug({ err }, "BRIDGE top-up sync failed")).finally(() => {
+      this.syncing = void 0;
+    }));
+    return this.syncing;
+  }
+  async reconcile() {
+    await this.restore();
+    const record = this.record;
+    if (this.needsStatusBackfill()) {
+      await this.syncDelivery();
+      return;
+    }
+    if (!record || !isBridgeTopUpPending(record.stage) || !record.commitment) return;
+    if (record.stage === "awaiting_bids" || record.stage === "filling") {
+      const statuses = await this.indexedOrder();
+      const fill = statuses?.find((status2) => status2.status === "FILLED");
+      if (fill) {
+        await this.update({
+          stage: "delivering",
+          fillTxHash: fill.transactionHash,
+          filler: fill.filler ?? record.filler,
+          stageTimes: { ...record.stageTimes, delivering: fill.timestamp }
+        });
+        void this.resumeDelivery();
+      } else if (statuses?.some((status2) => status2.status === "REFUNDED")) {
+        await this.update({ stage: "reclaimed" });
+      }
+      return;
+    }
+    if (record.stage === "delivering") {
+      await this.syncDelivery();
+      return;
+    }
+    if (record.stage === "unfilled" || record.stage === "reclaiming") {
+      const gateway = await this.gateway(record.chain);
+      await this.refunded(gateway, deserializeOrder(record.order));
+    }
+  }
+  /**
+   * Submits the request to Hyperbridge with a proof from BSC state. Public BSC endpoints
+   * differ in whether they serve `eth_getProof` for recent blocks, so each is tried in turn.
+   */
+  async selfRelay(commitment) {
+    const hyperbridge = await this.hyperbridge();
+    const failures = [];
+    for (const rpcUrl of this.bscProofRpcUrls()) {
+      if (await withTimeout(hyperbridge.queryRequestReceipt(commitment), "the request receipt")) return;
+      try {
+        const client = this.ismpClient(hyperbridge, rpcUrl);
+        const receipt = await withTimeout(client.aggregateTransactionWithCommitment(commitment), "the relay", 12e4);
+        await this.update({ deliveryTxHash: receipt.transactionHash });
+        return;
+      } catch (err) {
+        const reason = err instanceof Error ? err.message.split("\n")[0] : String(err);
+        failures.push(`${new URL(rpcUrl).host}: ${reason}`);
+      }
+    }
+    throw new Error(`Could not relay the BRIDGE to Hyperbridge (${failures.join("; ")})`);
+  }
+  /** The operator's BSC endpoints first, then the free public ones. */
+  bscProofRpcUrls() {
+    const urls = [
+      ...this.deps.configService.getRpcUrls(BRIDGE_TOP_UP_CHAIN),
+      ...chainByChainId((0, import_sdk17.getChainId)(BRIDGE_TOP_UP_CHAIN))?.defaultRpcUrls ?? []
+    ];
+    return urls.filter((url, index) => url && urls.indexOf(url) === index);
+  }
+  /** Records an executor update. True when the order reached a final state. */
+  async applyExecutionUpdate(value) {
+    switch (value.status) {
+      case "NEW_BID":
+      case "BIDS_RECEIVED": {
+        const bids = value.status === "NEW_BID" ? [value.bid] : value.bids;
+        const bidCount = value.status === "BIDS_RECEIVED" ? Number(value.bidCount ?? bids.length) : void 0;
+        await this.recordEvent({ status: value.status, bidCount, bids: bids.map(bidPreview) });
+        if (bidCount !== void 0) await this.update({ bidCount: Math.max(this.record.bidCount ?? 0, bidCount) });
+        return false;
+      }
+      case "BID_SELECTED":
+        await this.recordEvent({
+          status: "BID_SELECTED",
+          selectedSolver: value.selectedSolver,
+          userOpHash: value.userOpHash,
+          txHash: value.transactionHash
+        });
+        await this.update({ stage: "filling", fillTxHash: value.transactionHash });
+        return false;
+      case "FILLED":
+        await this.recordEvent({
+          status: "FILLED",
+          selectedSolver: value.selectedSolver,
+          userOpHash: value.userOpHash,
+          txHash: value.transactionHash
+        });
+        await this.update({
+          stage: "delivering",
+          fillTxHash: value.transactionHash ?? this.record.fillTxHash,
+          error: void 0
+        });
+        return true;
+      case "EXPIRED":
+      case "FAILED":
+        await this.update({ stage: "unfilled", error: value.error });
+        return true;
+      case "CANCELLED":
+        await this.update({ stage: "reclaimed" });
+        return true;
+      default:
+        return false;
+    }
+  }
+  /**
+   * Recovers an unfilled order's escrow, following the Hyperbridge app's recovery: the SDK
+   * cancel flow from the paying chain (BSC's expiry height finalized, the cancel sent, the
+   * cancellation finalized on the source, verified and finalized on Hyperbridge), then the
+   * refund. A relayer normally delivers that refund; if none has within a few minutes of
+   * Hyperbridge finalizing, the filler submits Hyperbridge's response itself. Each step is
+   * recorded as it lands, and a restart resumes from the SDK's persisted progress.
+   */
+  async driveReclaim() {
+    await this.drive(async (gateway) => {
+      const record = this.record;
+      const order = deserializeOrder(record.order);
+      if (await this.refunded(gateway, order)) return;
+      const sameChain = record.chain === BRIDGE_TOP_UP_CHAIN;
+      const ismp = await this.cancelClient(record.chain);
+      const gen = gateway.cancelOrder(order, ismp);
+      let input;
+      while (true) {
+        const { value, done } = await gen.next(input);
+        input = void 0;
+        if (done) break;
+        switch (value.status) {
+          case "DESTINATION_FINALIZED":
+            await this.recordRecoveryStep("DESTINATION_FINALIZED");
+            break;
+          case "AWAITING_CANCEL_TRANSACTION": {
+            if (this.record.reclaimTxHash && !this.hasRecoveryStep("ORDER_CANCELED")) {
+              input = this.record.reclaimTxHash;
+              break;
+            }
+            const calls = [];
+            const quote = await gateway.quoteCancelOrder(order);
+            if (value.value === 0n && quote.relayerFee > 0n) {
+              const feeToken = await this.feeToken(record.chain);
+              calls.push({
+                target: feeToken,
+                value: 0n,
+                data: (0, import_viem31.encodeFunctionData)({
+                  abi: ERC20_ABI,
+                  functionName: "approve",
+                  args: [value.to, quote.relayerFee]
+                })
+              });
+            }
+            calls.push({ target: value.to, value: value.value, data: value.data });
+            const { txHash } = await this.deps.tokenSender.submitCalls(record.chain, calls);
+            await this.update({ reclaimTxHash: txHash });
+            input = txHash;
+            break;
+          }
+          case "CANCEL_STARTED":
+            await this.recordRecoveryStep("ORDER_CANCELED", value.receipt.transactionHash);
+            break;
+          case "SOURCE_FINALIZED":
+          case "HYPERBRIDGE_DELIVERED":
+          case "HYPERBRIDGE_FINALIZED": {
+            const metadata = value.metadata;
+            await this.recordRecoveryStep(
+              value.status,
+              metadata.transactionHash,
+              metadata.timestamp ? toMs(metadata.timestamp) : void 0
+            );
+            if (value.status === "HYPERBRIDGE_FINALIZED" && metadata.calldata) {
+              await this.update({ claimCalldata: metadata.calldata });
+            }
+            break;
+          }
+          case "CANCELLATION_COMPLETE":
+            await this.recordRecoveryStep("ORDER_CANCELED", value.transactionHash);
+            await this.recordRecoveryStep("FUNDS_CLAIMED", value.transactionHash);
+            break;
+        }
+      }
+      if (sameChain && this.hasRecoveryStep("FUNDS_CLAIMED")) {
+        await this.update({ stage: "reclaimed", error: void 0 });
+        return;
+      }
+      while (!await this.refunded(gateway, order)) {
+        const finalizedAt = this.record.recoverySteps?.find((s) => s.step === "HYPERBRIDGE_FINALIZED")?.timestamp;
+        const claimable = this.record.claimCalldata && finalizedAt && Date.now() - finalizedAt > RELAYER_DELIVERY_WAIT_MS;
+        if (claimable && !this.record.claimTxHash) {
+          await this.claimRefund(record.chain, this.record.claimCalldata);
+          continue;
+        }
+        await (0, import_promises.setTimeout)(REFUND_POLL_MS);
+      }
+    });
+  }
+  /**
+   * Submits Hyperbridge's finalized response to the source chain's ISMP handler, which
+   * refunds the escrow, as the Hyperbridge app's "Claim funds" does.
+   */
+  async claimRefund(chain, calldata) {
+    const params = await withTimeout(
+      this.deps.clientManager.getPublicClient(chain).readContract({
+        abi: EVM_HOST,
+        address: this.deps.configService.getHostAddress(chain),
+        functionName: "hostParams"
+      }),
+      "the host's handler"
+    );
+    const { txHash } = await this.deps.tokenSender.submitCalls(chain, [
+      { target: params.handler, value: 0n, data: calldata }
+    ]);
+    await this.update({ claimTxHash: txHash });
+  }
+  /**
+   * Whether the escrow is back with the filler, from the source gateway or the indexer's
+   * REFUNDED status; records the refund as the recovery's last step when it is.
+   */
+  async refunded(gateway, order) {
+    const onChain = await withTimeout(gateway.isOrderRefunded(order), "the refund").catch(() => false);
+    const indexed = (await this.indexedOrder().catch(() => void 0))?.find((s) => s.status === "REFUNDED");
+    if (!onChain && !indexed) return false;
+    if (!this.hasRecoveryStep("FUNDS_CLAIMED")) {
+      await this.recordRecoveryStep(
+        "FUNDS_CLAIMED",
+        this.record.claimTxHash ?? indexed?.transactionHash,
+        indexed?.timestamp
+      );
+    }
+    await this.update({ stage: "reclaimed", error: void 0 });
+    return true;
+  }
+  hasRecoveryStep(step) {
+    return !!this.record?.recoverySteps?.some((entry) => entry.step === step);
+  }
+  /** Records a recovery step once, at the time it landed (or now). */
+  async recordRecoveryStep(step, txHash, timestamp) {
+    if (this.hasRecoveryStep(step)) return;
+    const steps = [...this.record.recoverySteps ?? [], { step, txHash, timestamp: timestamp ?? Date.now() }];
+    await this.update({ recoverySteps: steps });
+  }
+  /** Runs one background flow for the record; a failure is recorded rather than thrown. */
+  async drive(flow) {
+    const record = this.record;
+    if (!record || this.driving === record.id) return;
+    this.driving = record.id;
+    try {
+      await flow(await this.gateway(record.chain));
+    } catch (err) {
+      const error = err instanceof Error ? err.message : String(err);
+      this.logger.warn({ err, id: record.id, stage: record.stage }, "BRIDGE top-up step failed");
+      if (record.stage === "placing" && !record.placeTxHash) {
+        await this.update({ stage: "failed", error });
+      } else if (record.stage === "delivering") {
+        await this.update({ error: `Delivery to Hyperbridge is retrying: ${error}` });
+        setTimeout(() => void this.resumeDelivery(), DELIVERY_RETRY_MS);
+      } else if (record.stage === "reclaiming") {
+        await this.update({ error: `Recovery is retrying: ${error}` });
+        setTimeout(() => void this.driveReclaim(), DELIVERY_RETRY_MS);
+      } else if (record.stage === "placing") {
+        await this.update({ stage: "failed", error: `${error} (placement tx ${record.placeTxHash})` });
+      } else {
+        await this.update({ stage: "unfilled", error });
+      }
+    } finally {
+      if (this.driving === record.id) this.driving = void 0;
+      this.logger.info(publicState(record), "BRIDGE top-up step finished");
+    }
+  }
+  /** Keeps what the executor reported, for the timeline's offers and its links. */
+  async recordEvent(event) {
+    const events = [...this.record.events ?? [], { ...event, timestamp: Date.now() }];
+    await this.update({ events: events.slice(-MAX_EVENTS) });
+  }
+  async update(patch) {
+    if (!this.record) return;
+    const now = Date.now();
+    if (patch.stage && patch.stage !== this.record.stage) {
+      patch = { ...patch, stageTimes: { ...this.record.stageTimes, [patch.stage]: now } };
+    }
+    Object.assign(this.record, patch, { updatedAt: now });
+    await this.persist();
+  }
+  persist() {
+    const snapshot = this.record ? { ...this.record } : void 0;
+    const write = this.writes.then(() => patchRuntimeState(this.deps.state, { bridgeTopUp: snapshot }));
+    this.writes = write.catch((err) => this.logger.warn({ err }, "Could not save the BRIDGE top-up"));
+    return write.then(
+      () => void 0,
+      () => void 0
+    );
+  }
+  async buildOrder(chain, tokenIn, amountIn, bridgeOut) {
+    const dispatcher = await this.callDispatcher();
+    const bsc = this.bsc();
+    const [block, blockTime] = await Promise.all([bsc.getBlockNumber(), this.blockTimeSeconds()]);
+    return {
+      user: (0, import_sdk17.bytes20ToBytes32)(this.deps.solver),
+      source: chain,
+      destination: BRIDGE_TOP_UP_CHAIN,
+      deadline: block + BigInt(Math.ceil(ORDER_WINDOW_SECONDS / blockTime)),
+      nonce: 0n,
+      fees: 0n,
+      session: "0x0000000000000000000000000000000000000000",
+      predispatch: { assets: [], call: "0x" },
+      inputs: [{ token: (0, import_sdk17.bytes20ToBytes32)(tokenIn), amount: amountIn }],
+      output: {
+        beneficiary: (0, import_sdk17.bytes20ToBytes32)(dispatcher),
+        assets: [{ token: (0, import_sdk17.bytes20ToBytes32)(this.bridgeToken), amount: bridgeOut }],
+        call: encodeBridgeTopUpCall(this.bridgeToken, this.deps.substratePublicKey, bridgeOut)
+      }
+    };
+  }
+  /**
+   * Approvals for the gateway to pull the input and the order fee, then `placeOrder`.
+   * The fee token is often the input token itself; one approval then covers both.
+   */
+  placementCalls(order, tokenIn, placement) {
+    const amountIn = order.inputs[0].amount;
+    const approvals = /* @__PURE__ */ new Map([[tokenIn.toLowerCase(), amountIn]]);
+    if (placement.feeTokenAmount > 0n) {
+      const fee = placement.feeTokenAddress.toLowerCase();
+      approvals.set(fee, (approvals.get(fee) ?? 0n) + placement.feeTokenAmount);
+    }
+    const calls = [...approvals].map(([token, amount]) => ({
+      target: token,
+      value: 0n,
+      data: (0, import_viem31.encodeFunctionData)({ abi: ERC20_ABI, functionName: "approve", args: [placement.to, amount] })
+    }));
+    calls.push({ target: placement.to, value: placement.value, data: placement.data });
+    return calls;
+  }
+  payToken(chain, token) {
+    const { configService } = this.deps;
+    const tokenAddress = token === "USDC" ? configService.getUsdcAsset(chain) : configService.getUsdtAsset(chain);
+    if (!tokenAddress || /^0x0+$/.test(tokenAddress)) throw new Error(`${token} is not configured on ${chain}`);
+    const decimals = token === "USDC" ? configService.getUsdcDecimals(chain) : configService.getUsdtDecimals(chain);
+    return { tokenAddress, decimals };
+  }
+  async walletBalance(chain, token) {
+    return await this.deps.clientManager.getPublicClient(chain).readContract({
+      abi: ERC20_ABI,
+      address: token,
+      functionName: "balanceOf",
+      args: [this.deps.solver]
+    });
+  }
+  /** What the paymaster pulls for gas on the sponsored path, which a top-up must leave. */
+  reserve(chain, token) {
+    return paymasterReserveForToken(chain, token.toLowerCase(), this.deps.configService);
+  }
+  /** Spendable wallet balance: the paymaster's gas reserve is held back. */
+  async balanceOf(chain, token) {
+    const balance = await this.walletBalance(chain, token);
+    const reserve = this.reserve(chain, token);
+    return balance > reserve ? balance - reserve : 0n;
+  }
+  async feeToken(chain) {
+    return await this.deps.clientManager.getPublicClient(chain).readContract({
+      abi: [{ type: "function", name: "feeToken", stateMutability: "view", inputs: [], outputs: [{ type: "address" }] }],
+      address: this.deps.configService.getHostAddress(chain),
+      functionName: "feeToken"
+    });
+  }
+  /** The CallDispatcher the BSC gateway runs output calls through, read from the gateway itself. */
+  callDispatcher() {
+    this.dispatcher ?? (this.dispatcher = (async () => {
+      const params = await this.bsc().readContract({
+        abi: INTENT_GATEWAY_V2_ABI,
+        address: this.deps.configService.getIntentGatewayAddress(BRIDGE_TOP_UP_CHAIN),
+        functionName: "params"
+      });
+      return params.dispatcher;
+    })().catch((err) => {
+      this.dispatcher = void 0;
+      throw err;
+    }));
+    return this.dispatcher;
+  }
+  async blockTimeSeconds() {
+    const client = this.bsc();
+    const latest = await client.getBlock();
+    const earlier = await client.getBlock({ blockNumber: latest.number - 100n });
+    const seconds = Number(latest.timestamp - earlier.timestamp) / 100;
+    return seconds > 0 ? seconds : 1;
+  }
+  evmChain(chain, rpcUrl) {
+    const { configService } = this.deps;
+    const bundlerUrl = chain === BRIDGE_TOP_UP_CHAIN ? configService.getBundlerUrl(chain) ?? hyperbridgeBundlerUrl((0, import_sdk17.getChainId)(chain)) : void 0;
+    return import_sdk17.EvmChain.fromParams({
+      chainId: (0, import_sdk17.getChainId)(chain),
+      host: configService.getHostAddress(chain),
+      rpcUrl: rpcUrl ?? configService.getRpcUrl(chain),
+      bundlerUrl
+    });
+  }
+  gateway(source) {
+    let gateway = this.gateways.get(source);
+    if (!gateway) {
+      gateway = (async () => import_sdk17.IntentGateway.create(
+        this.evmChain(source),
+        this.evmChain(BRIDGE_TOP_UP_CHAIN),
+        await this.deps.hyperbridge,
+        { storagePath: this.deps.storagePath }
+      ))().catch((err) => {
+        this.gateways.delete(source);
+        throw err;
+      });
+      this.gateways.set(source, gateway);
+    }
+    return gateway;
+  }
+  hyperbridge() {
+    this.hyperbridgeChain ?? (this.hyperbridgeChain = withTimeout(import_sdk17.SubstrateChain.connect({
+      wsUrl: this.deps.configService.getHyperbridgeWsUrl() ?? NEXUS_WS_URL,
+      consensusStateId: NEXUS_CONSENSUS_STATE,
+      hasher: "Keccak",
+      stateMachineId: NEXUS_STATE_MACHINE
+    }), "Hyperbridge").catch((err) => {
+      this.hyperbridgeChain = void 0;
+      throw err;
+    }));
+    return this.hyperbridgeChain;
+  }
+  /** Tracks requests from BSC into Hyperbridge, the route the bought BRIDGE takes. */
+  ismpClient(hyperbridge, rpcUrl) {
+    return new import_sdk17.IsmpClient({
+      queryClient: (0, import_sdk17.createQueryClient)({ url: this.deps.indexerUrl }),
+      source: this.evmChain(BRIDGE_TOP_UP_CHAIN, rpcUrl),
+      dest: hyperbridge,
+      hyperbridge
+    });
+  }
+  /** Tracks the reclaim's cancellation, which runs between the paying chain and BSC. */
+  async cancelClient(source) {
+    return new import_sdk17.IsmpClient({
+      queryClient: (0, import_sdk17.createQueryClient)({ url: this.deps.indexerUrl }),
+      source: this.evmChain(source),
+      dest: this.evmChain(BRIDGE_TOP_UP_CHAIN),
+      hyperbridge: await this.hyperbridge()
+    });
+  }
+};
+function publicState(record) {
+  const { order: _order, sessionPrivateKey: _key, ...rest } = record;
+  return { ...rest, pending: isBridgeTopUpPending(record.stage) };
+}
+var DELIVERY_STATUSES = /* @__PURE__ */ new Set(["SOURCE", "SOURCE_FINALIZED", "DESTINATION"]);
+function toMs(timestamp) {
+  const value = Number(timestamp ?? 0);
+  return value > 0 && value < 1e12 ? value * 1e3 : value;
+}
+function withTimeout(promise, what, ms = NETWORK_TIMEOUT_MS) {
+  let timer;
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(new Error(`Timed out reading ${what}`)), ms);
+  });
+  return Promise.race([promise, timeout]).finally(() => clearTimeout(timer));
+}
+
+// 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 {
+  constructor(service, options, loggers = defaultLoggerContext()) {
+    this.service = service;
+    this.options = options;
+    this.timers = [];
+    this.logger = loggers.get("limit-orders");
+  }
+  /**
+   * Starts the clocks and kicks off the first reconciliation.
+   *
+   * That first pass is not awaited. It is a round trip to the orderbook for
+   * every page of the solver's orders, and boot has no reason to wait on it.
+   */
+  async start() {
+    if (this.timers.length > 0) return;
+    const heartbeatMs = await this.service.heartbeatIntervalMs().catch((err) => {
+      this.logger.warn({ err }, "Could not read the orderbook's heartbeat interval; using the fallback");
+      return FALLBACK_HEARTBEAT_INTERVAL_MS;
+    });
+    const reconcileMs = this.options.reconcileIntervalSecs * 1e3;
+    this.every(heartbeatMs, "heartbeat", () => this.service.heartbeat());
+    this.every(EXPIRY_SWEEP_MS, "expiry", () => this.expire());
+    this.every(reconcileMs, "reconciliation", () => this.upkeep());
+    this.logger.info({ heartbeatMs, expiryMs: EXPIRY_SWEEP_MS, reconcileMs }, "Orderbook lifecycle started");
+    void this.upkeep();
+  }
+  stop() {
+    this.timers.forEach((timer) => clearInterval(timer));
+    this.timers = [];
+  }
+  /** Takes orders that have outlived their TTL off the book. */
+  async expire() {
+    const expired = await this.service.expireStale();
     if (expired > 0) this.logger.info({ expired }, "Withdrew limit orders that had outlived their expiry");
   }
   /**
@@ -23993,7 +24880,30 @@ var LimitOrderLifecycle = class {
 
 // src/services/BalanceProvider.ts
 var import_node_events = require("node:events");
-var import_viem31 = require("viem");
+var import_viem33 = require("viem");
+
+// src/services/native-setup.ts
+var import_viem32 = require("viem");
+async function nativeSetupNeed(client, configService, wallet, chain, nativeBalance) {
+  const paymaster = configService.getSimplexPaymasterAddress(chain);
+  if (!paymaster) return null;
+  const gasPrice = await client.getGasPrice();
+  if (nativeBalance >= (DELEGATION_TX_GAS_FLOOR + BATCHED_APPROVE_GAS) * gasPrice) return null;
+  const pending = await resolvePendingPermit2Approval(client, wallet, paymaster, chain, configService);
+  if (!pending || pending.permitCapable) return null;
+  const solverAccount = configService.getSolverAccountContractAddress(chain);
+  const code = await client.getCode({ address: wallet });
+  const delegated = !!solverAccount && code?.toLowerCase() === (0, import_viem32.concat)(["0xef0100", solverAccount]).toLowerCase();
+  const cost = (delegated ? APPROVE_TX_GAS : DELEGATION_TX_GAS_FLOOR + BATCHED_APPROVE_GAS) * gasPrice;
+  if (nativeBalance >= cost) return null;
+  const usdc = configService.getUsdcAsset(chain);
+  return {
+    required: Number((0, import_viem32.formatEther)(cost * 2n)),
+    feeToken: pending.token.toLowerCase() === usdc.toLowerCase() ? "USDC" : "USDT"
+  };
+}
+
+// src/services/BalanceProvider.ts
 var BalanceProvider = class extends import_node_events.EventEmitter {
   constructor(options) {
     super();
@@ -24041,8 +24951,14 @@ var BalanceProvider = class extends import_node_events.EventEmitter {
         })
       );
     }
+    let tokens = {};
+    try {
+      tokens = await this.options.tokens();
+    } catch (err) {
+      this.logger.warn({ err }, "Could not read the orderbook's books; reading USDC and USDT balances only");
+    }
     const fxExoticByChain = /* @__PURE__ */ new Map();
-    for (const [chainKey, addrs] of Object.entries(this.options.token1)) {
+    for (const [chainKey, addrs] of Object.entries(tokens)) {
       const id = Number.parseInt(chainKey.replace("EVM-", ""), 10);
       if (!isNaN(id)) fxExoticByChain.set(id, addrs);
     }
@@ -24086,7 +25002,14 @@ var BalanceProvider = class extends import_node_events.EventEmitter {
     try {
       const native = await client.getBalance({ address: fillerAddr });
       const symbol = nativeTokenSymbol(chainId);
-      row.native = { symbol, amount: Number.parseFloat((0, import_viem31.formatUnits)(native, 18)) };
+      row.native = { symbol, amount: Number.parseFloat((0, import_viem33.formatUnits)(native, 18)) };
+      const setup = await nativeSetupNeed(client, this.options.configService, fillerAddr, chain, native).catch(
+        (err) => {
+          this.logger.debug({ err, chainId }, "Could not check whether the chain needs native gas for setup");
+          return null;
+        }
+      );
+      if (setup) row.nativeSetup = setup;
     } catch (err) {
       issues.push({ chainId, source: "native", message: errorMessage(err) });
     }
@@ -24157,7 +25080,7 @@ var BalanceProvider = class extends import_node_events.EventEmitter {
               functionName: "balanceOf",
               args: [fillerAddr]
             });
-            wallet = Number.parseFloat((0, import_viem31.formatUnits)(balance, definition.decimals));
+            wallet = Number.parseFloat((0, import_viem33.formatUnits)(balance, definition.decimals));
           } catch (err) {
             issues.push({
               chainId,
@@ -24185,8 +25108,8 @@ var BalanceProvider = class extends import_node_events.EventEmitter {
           available: wallet !== null && vaultDataAvailable ? Math.max(wallet - walletReserve, 0) + vaultAvailable : null,
           vaults: positions.map((position) => ({
             address: position.vault,
-            position: Number.parseFloat((0, import_viem31.formatUnits)(position.positionAssets, position.decimals)),
-            available: Number.parseFloat((0, import_viem31.formatUnits)(position.availableAssets, position.decimals)),
+            position: Number.parseFloat((0, import_viem33.formatUnits)(position.positionAssets, position.decimals)),
+            available: Number.parseFloat((0, import_viem33.formatUnits)(position.availableAssets, position.decimals)),
             acceptsDeposits: position.acceptsDeposits
           })),
           status: complete ? "fresh" : wallet !== null || positions.length > 0 ? "partial" : "unavailable"
@@ -24229,8 +25152,8 @@ var BalanceProvider = class extends import_node_events.EventEmitter {
         const api = await coprocessor.queryApi();
         const account = await api.query.system.account(address);
         const decimals = api.registry.chainDecimals[0] ?? 12;
-        const free = Number.parseFloat((0, import_viem31.formatUnits)(BigInt(account.data.free.toString()), decimals));
-        const reserved = Number.parseFloat((0, import_viem31.formatUnits)(BigInt(account.data.reserved.toString()), decimals));
+        const free = Number.parseFloat((0, import_viem33.formatUnits)(BigInt(account.data.free.toString()), decimals));
+        const reserved = Number.parseFloat((0, import_viem33.formatUnits)(BigInt(account.data.reserved.toString()), decimals));
         this.snapshot = { ...this.snapshot, hyperbridge: { address, free, reserved } };
       } catch (err) {
         this.logger.warn({ err }, "Failed to fetch Hyperbridge balance");
@@ -24250,7 +25173,7 @@ function isConfiguredAddress(address) {
 }
 function sumFormatted(positions, field) {
   return positions.reduce(
-    (total, position) => total + Number.parseFloat((0, import_viem31.formatUnits)(position[field], position.decimals)),
+    (total, position) => total + Number.parseFloat((0, import_viem33.formatUnits)(position[field], position.decimals)),
     0
   );
 }
@@ -24494,7 +25417,7 @@ var DEFAULT_INDEXER_URLS = {
   mainnet: "https://nexus.indexer.polytope.technology/",
   testnet: "https://gargantua.indexer.polytope.technology/"
 };
-var ORDER_QUERY2 = `
+var ORDER_QUERY3 = `
 query OrderSummary($commitment: String!) {
   iOrderV3s(filter: { commitment: { equalTo: $commitment } }) {
     nodes {
@@ -24587,7 +25510,7 @@ async function fetchOrder(fetchImpl, indexerUrl, commitment) {
   const response = await fetchImpl(indexerUrl, {
     method: "POST",
     headers: { "content-type": "application/json" },
-    body: JSON.stringify({ query: ORDER_QUERY2, variables: { commitment } }),
+    body: JSON.stringify({ query: ORDER_QUERY3, variables: { commitment } }),
     signal: AbortSignal.timeout(15e3)
   });
   if (!response.ok) throw new Error(`Indexer responded ${response.status}`);
@@ -24693,12 +25616,8 @@ async function bootFiller(config, options) {
       }
     }
   };
-  const retired = retiredPairKeys(config.pairs ?? []);
-  if (retired.length > 0) {
-    logger.warn(
-      { keys: retired },
-      "These [[pairs]] keys are no longer read; prices come from limit orders, and the filler fills nothing until one is posted"
-    );
+  if ("pairs" in config) {
+    logger.warn("[[pairs]] is no longer read and can be deleted from the config");
   }
   logger.info("Resolving chain IDs from RPC endpoints...");
   const resolvedChains = await resolveChainConfigs(config.chains, {
@@ -24803,25 +25722,6 @@ async function bootFiller(config, options) {
   }
   logger.info("Initializing trading engine...");
   const assetRegistry = new AssetRegistry(configService, config.assets);
-  const configuredChainNames = resolvedChains.map((chain) => `EVM-${chain.chainId}`);
-  if (config.pairs?.length) {
-    assertPairSymbolsResolve(config.pairs, assetRegistry, configuredChainNames);
-  }
-  const adminStrategies = [];
-  const tradingPairs = (config.pairs ?? []).map((pair) => ({
-    token0: pair.token0,
-    token1: pair.token1
-  }));
-  tradingPairs.forEach((pair, pairIndex) => {
-    adminStrategies.push({
-      index: pairIndex,
-      pairIndex,
-      exotic: `${pair.token0}/${pair.token1}`,
-      token0: pair.token0,
-      token1: pair.token1,
-      sameToken: normalizeSymbol(pair.token0) === normalizeSymbol(pair.token1)
-    });
-  });
   const confirmationPolicy = assertConfirmationCoverage(
     config.confirmationPolicies,
     resolvedChains.map((c) => c.chainId)
@@ -24832,7 +25732,6 @@ async function bootFiller(config, options) {
     configService,
     chainClientManager,
     contractService,
-    tradingPairs,
     assetRegistry,
     { confirmationPolicy, fundingVenues, limitOrders: options.data.limitOrders }
   );
@@ -24940,8 +25839,8 @@ async function bootFiller(config, options) {
   if (vaultVenue) {
     vaultVenue.onTx = ({ chain, kind, txHash, sponsored, movements }) => {
       const rows = movements.length > 0 ? movements.map((move) => {
-        const underlying = { token: move.symbol, amount: (0, import_viem32.formatUnits)(move.amount, move.decimals) };
-        const shares = move.shares === void 0 ? { token: null, amount: null } : { token: move.shareSymbol, amount: (0, import_viem32.formatUnits)(move.shares, move.shareDecimals) };
+        const underlying = { token: move.symbol, amount: (0, import_viem34.formatUnits)(move.amount, move.decimals) };
+        const shares = move.shares === void 0 ? { token: null, amount: null } : { token: move.shareSymbol, amount: (0, import_viem34.formatUnits)(move.shares, move.shareDecimals) };
         const out = kind === "sweep" ? underlying : shares;
         const back = kind === "sweep" ? shares : underlying;
         return { token: out.token, amount: out.amount, to: move.vault, tokenIn: back.token, amountIn: back.amount };
@@ -24951,21 +25850,21 @@ async function bootFiller(config, options) {
       }
     };
   }
-  const token1 = {};
-  for (const pair of config.pairs ?? []) {
-    if (normalizeSymbol(pair.token0) === normalizeSymbol(pair.token1)) continue;
-    for (const chainName2 of configuredChainNames) {
-      const address = assetRegistry.getAddress(pair.token1, chainName2);
-      if (!address) continue;
-      const list = token1[chainName2] ?? (token1[chainName2] = []);
-      if (!list.includes(address)) list.push(address);
+  const bookTokens = async () => {
+    const { books } = await limitOrderService.books();
+    const symbols = new Set(books.flatMap((book) => [normalizeSymbol(book.base), normalizeSymbol(book.quote)]));
+    const tokens = {};
+    for (const chainId of configService.getConfiguredChainIds()) {
+      const chainName2 = `EVM-${chainId}`;
+      tokens[chainName2] = [...symbols].flatMap((symbol) => assetRegistry.getAddress(symbol, chainName2) ?? []);
     }
-  }
+    return tokens;
+  };
   const balanceProvider = new BalanceProvider({
     chainClientManager,
     configService,
     fillerAddress: runtimeSigner.address,
-    token1,
+    tokens: bookTokens,
     vaultBalances: vaultVenue,
     hyperbridge: intentFiller.hyperbridgeConnection,
     substratePrivateKey: config.simplex.substratePrivateKey
@@ -25008,7 +25907,6 @@ async function bootFiller(config, options) {
   logger.info(
     {
       chains: resolvedChains.map((c) => c.chainId),
-      pairs: (config.pairs ?? []).map((p) => `${p.token0}/${p.token1}`),
       maxConcurrentOrders: config.simplex.maxConcurrentOrders ?? DEFAULT_MAX_CONCURRENT_ORDERS,
       watchOnlyChains: watchOnlyChains.length > 0 ? watchOnlyChains : void 0
     },
@@ -25026,12 +25924,32 @@ async function bootFiller(config, options) {
     activity.detach();
     if (options.ownsData) await options.data.close?.();
   };
+  const tokenSender = new TokenSender(
+    chainClientManager,
+    runtimeSigner.address,
+    () => config.vault?.vaults ?? [],
+    userOpSender,
+    configService
+  );
+  const bridgeTopUp = config.simplex.substratePrivateKey && network === "mainnet" ? new BridgeTopUp({
+    clientManager: chainClientManager,
+    delegation: new DelegationService(chainClientManager, configService, runtimeSigner),
+    configService,
+    tokenSender,
+    state: options.data.state,
+    storagePath: (0, import_node_path.join)(options.data.dataDir ?? process.cwd(), ".hyperbridge-cache"),
+    indexerUrl,
+    solver: runtimeSigner.address,
+    substratePublicKey: (0, import_viem34.toHex)((await deriveSubstrateKeyPair(config.simplex.substratePrivateKey)).publicKey),
+    hyperbridge: intentFiller.hyperbridgeConnection,
+    loggers: options.loggers
+  }) : void 0;
+  void bridgeTopUp?.restore();
   return {
     intentFiller,
     limitOrders: limitOrderService,
     balanceProvider,
     vaultVenue,
-    adminStrategies,
     haltControls,
     activity,
     data: options.data,
@@ -25043,9 +25961,6 @@ async function bootFiller(config, options) {
     confirmationPolicy,
     loggers: options.loggers,
     assetRegistry,
-    engine,
-    tradingPairs,
-    balanceTokens: token1,
     rebalancingService,
     resolvedChains,
     fillerAddress: runtimeSigner.address,
@@ -25055,13 +25970,8 @@ async function bootFiller(config, options) {
     config,
     configPath: options.configPath,
     startedAt: Date.now(),
-    tokenSender: new TokenSender(
-      chainClientManager,
-      runtimeSigner.address,
-      () => config.vault?.vaults ?? [],
-      userOpSender,
-      configService
-    ),
+    tokenSender,
+    bridgeTopUp,
     vaultPreflight: async (vaults) => {
       const byChain = {};
       for (const row of vaults) {
@@ -25473,11 +26383,11 @@ var MemoryDataStore = class {
 };
 
 // src/scanner/order-scanner.ts
-var import_sdk18 = require("@hyperbridge/sdk");
+var import_sdk19 = require("@hyperbridge/sdk");
 
 // src/scanner/chain-scanner.ts
 var import_async_mutex2 = require("async-mutex");
-var import_sdk17 = require("@hyperbridge/sdk");
+var import_sdk18 = require("@hyperbridge/sdk");
 var GATEWAY_EVENTS = INTENT_GATEWAY_V2_ABI.filter(
   (item) => item.type === "event" && (item.name === "OrderPlaced" || item.name === "OrderFilled" || item.name === "PartialFill")
 );
@@ -25659,7 +26569,7 @@ var ChainScanner = class {
     return { trace: (message) => this.logger.warn({ chainId: this.target.chainId }, message) };
   }
   async scan() {
-    const currentBlock = await (0, import_sdk17.retryPromise)(() => this.quorumClient.getBlockNumber(), {
+    const currentBlock = await (0, import_sdk18.retryPromise)(() => this.quorumClient.getBlockNumber(), {
       maxRetries: 1,
       backoffMs: 250,
       logMessage: `Failed to get current block number on chain ${this.target.chainId}`,
@@ -25680,7 +26590,7 @@ var ChainScanner = class {
     this.enter("logs");
     let logs;
     try {
-      logs = await (0, import_sdk17.retryPromise)(
+      logs = await (0, import_sdk18.retryPromise)(
         () => this.quorumClient.getLogs({
           address: this.target.gateway,
           events: GATEWAY_EVENTS,
@@ -25989,7 +26899,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;
@@ -25998,7 +26908,7 @@ var OrderScanner = class _OrderScanner {
       throw new Error(`Chain ${chainId} is already in this scanner`);
     }
     const name = `EVM-${chainId}`;
-    const gateway = chain.gateway ?? new import_sdk18.ChainConfigService({}).getIntentGatewayAddress(name);
+    const gateway = chain.gateway ?? new import_sdk19.ChainConfigService({}).getIntentGatewayAddress(name);
     const scanner = new ChainScanner(
       { chain: name, chainId, gateway, rpcUrls },
       this.loggers,
@@ -26074,7 +26984,7 @@ var OrderScanner = class _OrderScanner {
 };
 
 // src/data/indexer-inventory.ts
-var import_viem33 = require("viem");
+var import_viem35 = require("viem");
 var READ_TIMEOUT_MS = 1e4;
 var SETTLED_AFTER_MS = 10 * 6e4;
 var BATCH = 40;
@@ -26151,7 +27061,7 @@ ${queries.join("\n")}
       if (!token) continue;
       let amount;
       try {
-        amount = Number((0, import_viem33.formatUnits)(BigInt(row.balance), token.decimals));
+        amount = Number((0, import_viem35.formatUnits)(BigInt(row.balance), token.decimals));
       } catch {
         continue;
       }
@@ -26266,7 +27176,7 @@ var LimitOrderController = class {
     }));
     return this.indexed;
   }
-  /** The pairs the orderbook lists, the smallest payout each token may carry, and its tokens per chain. */
+  /** The books the orderbook lists, the smallest payout each token may carry, and its tokens per chain. */
   books() {
     return this.service.books();
   }
@@ -26298,85 +27208,6 @@ var LimitOrderController = class {
     return cancelled;
   }
 };
-var PairController = class {
-  constructor(runtime, persist) {
-    this.runtime = runtime;
-    this.persist = persist;
-  }
-  get pairs() {
-    return this.runtime.config.pairs ?? [];
-  }
-  list() {
-    return this.pairs.map((pair, index) => ({
-      index,
-      token0: pair.token0,
-      token1: pair.token1,
-      sameToken: normalizeSymbol(pair.token0) === normalizeSymbol(pair.token1)
-    }));
-  }
-  /**
-   * Opens a new market on the running engine.
-   *
-   * Validated against the same rules boot applies, so a pair accepted here is
-   * one a restart would also accept. New `assets` are registered first, because
-   * the pair's symbols have to resolve before the market can be hydrated.
-   */
-  async add(pair, options) {
-    const { engine, assetRegistry, adminStrategies, balanceTokens, config } = this.runtime;
-    const assets = options?.assets;
-    const nextAssets = { ...config.assets ?? {}, ...assets ?? {} };
-    const nextPairs = [...this.pairs, pair];
-    validatePairConfigs(nextPairs, nextAssets);
-    if (assets && Object.keys(assets).length > 0) assetRegistry.addAssets(assets);
-    assertPairSymbolsResolve(
-      [pair],
-      assetRegistry,
-      this.runtime.resolvedChains.map((chain) => formatChainKey(chain.chainId))
-    );
-    const tradingPair = { token0: pair.token0, token1: pair.token1 };
-    engine.addPair(tradingPair);
-    config.pairs = nextPairs;
-    if (assets && Object.keys(assets).length > 0) config.assets = nextAssets;
-    if (normalizeSymbol(pair.token0) !== normalizeSymbol(pair.token1)) {
-      for (const chain of this.runtime.resolvedChains) {
-        const chainName2 = formatChainKey(chain.chainId);
-        const address = assetRegistry.getAddress(pair.token1, chainName2);
-        if (!address) continue;
-        const list = balanceTokens[chainName2] ?? (balanceTokens[chainName2] = []);
-        if (!list.includes(address)) list.push(address);
-      }
-    }
-    const pairIndex = nextPairs.length - 1;
-    adminStrategies.push({
-      index: adminStrategies.reduce((max, s) => Math.max(max, s.index), -1) + 1,
-      pairIndex,
-      exotic: `${pair.token0}/${pair.token1}`,
-      token0: pair.token0,
-      token1: pair.token1,
-      sameToken: normalizeSymbol(pair.token0) === normalizeSymbol(pair.token1)
-    });
-    await this.persist();
-    return this.list()[pairIndex];
-  }
-  /** Closes a market. Orders already in flight against it still complete. */
-  async remove(index) {
-    const { engine, tradingPairs, adminStrategies, config } = this.runtime;
-    if (index < 0 || index >= this.pairs.length) throw new Error(`Unknown pair ${index}`);
-    engine.removePair(tradingPairs[index]);
-    config.pairs = this.pairs.filter((_, i) => i !== index);
-    const position = adminStrategies.findIndex((s) => s.pairIndex === index);
-    if (position >= 0) adminStrategies.splice(position, 1);
-    for (const strategy of adminStrategies) {
-      if (strategy.pairIndex > index) strategy.pairIndex -= 1;
-    }
-    await this.persist();
-  }
-  livePair(index) {
-    const pair = this.runtime.tradingPairs[index];
-    if (!pair) throw new Error(`Unknown pair ${index}`);
-    return pair;
-  }
-};
 var ChainController = class {
   constructor(runtime, persist, scanner, ownsScanner) {
     this.runtime = runtime;
@@ -26421,10 +27252,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 +27281,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 +27298,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 +27343,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 +27362,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 () => {
@@ -26701,7 +27513,6 @@ var Simplex = class _Simplex extends import_node_events3.EventEmitter {
     this.stopped = false;
     this.logger = runtime.loggers.get("simplex");
     const persist = () => this.persistConfig();
-    this.pairs = new PairController(runtime, persist);
     this.chains = new ChainController(runtime, persist, runtime.orderScanner, ownedScanners.orders !== void 0);
     this.vaults = new VaultController(runtime, persist);
     this.assets = new AssetController(runtime, persist);
@@ -26851,8 +27662,7 @@ var Simplex = class _Simplex extends import_node_events3.EventEmitter {
       startedAt: this.runtime.startedAt,
       uptimeSec: (Date.now() - this.runtime.startedAt) / 1e3,
       chains: this.runtime.resolvedChains.map((chain) => chain.chainId),
-      watchOnly: this.runtime.intentFiller.getWatchOnly(),
-      pairs: this.runtime.config.pairs?.length ?? 0
+      watchOnly: this.runtime.intentFiller.getWatchOnly()
     };
   }
   /** Order-activity history, newest first; pass `beforeId` to page backwards. */
@@ -26930,7 +27740,6 @@ var Simplex = class _Simplex extends import_node_events3.EventEmitter {
   LoggerContext,
   MemoryDataStore,
   OrderScanner,
-  PairController,
   RebalanceController,
   SignerType,
   Simplex,
@@ -26949,14 +27758,12 @@ var Simplex = class _Simplex extends import_node_events3.EventEmitter {
   mpcVaultSigner,
   normalizeSymbol,
   parseChainKey,
-  pickAnchorStable,
   privateKeySigner,
   registrySymbols,
   secretPhraseSigner,
   turnkeySigner,
   validateAssetDefinitions,
   validateConfig,
-  validatePairConfigs,
   validateSecretPhrase,
   validateSignerConfig,
   validateVaultToml,