@hyperbridge/simplex 0.16.7 → 0.16.8

package/dist/bin/simplex.js

@@ -214220,6 +214220,12 @@ function userOperationLogs(logs, entryPoint, userOpHash) {
   while (start >= 0 && !isBoundary(logs[start])) start--;
   return logs.slice(start + 1, end);
 }
+function escrowSlot(commitment, leg) {
+  const byCommitment = keccak2563(
+    encodeAbiParameters2([{ type: "bytes32" }, { type: "uint256" }], [commitment, ESCROW_MAPPING_SLOT])
+  );
+  return keccak2563(encodeAbiParameters2([{ type: "uint256" }, { type: "bytes32" }], [BigInt(leg), byCommitment]));
+}
 function destinationStateMachine(order) {
   return isHex3(order.destination) ? hexToString2(order.destination) : order.destination;
 }
@@ -214399,7 +214405,7 @@ function encodePhantomBidDeclaration(declaration) {
   }
   return u8aToHex(new Uint8Array(bytes4));
 }
-var import_merge_race, __defProp3, __getOwnPropNames2, __esm2, __export2, node_exports, wasm, full_path, __dirname$1, cachedTextDecoder, cachedUint8ArrayMemory0, WASM_VECTOR_LEN, cachedTextEncoder, encodeString5, cachedDataViewMemory0, KeccakMergeFinalization, KeccakMerge, wasmPath, wasmBytes2, bindings, wasmModule, wasmInstance, __wasm, init_node11, RequestStatus, TimeoutStatus, IntentOrderStatus, ABI, evmHost_default, ABI2, handlerV2_default, polkadotAssetHubPaseo, polkadotHubMainnet, pharosMainnet, pharosAtlantic, tronNile, chainConfigs, configsByStateMachineId, getConfigByStateMachineId, getChainId3, getViemChain, hyperbridgeAddress, ABI3, IntentGatewayV2_default, ChainConfigService, ABI4, uniswapRouterV2_default, chains, DEFAULT_ADDRESS, EvmChain, REQUEST_COMMITMENTS_SLOT, RESPONSE_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, STATE_COMMITMENTS_SLOT, MISSING_CONSENSUS_UPDATE_TIME_MESSAGE, MissingConsensusUpdateTimeError, TokenBucket, BATCHES_NOT_SUPPORTED_CODE, TOO_BIG_BATCH_REQUEST_CODE, DEFAULT_MAX_BATCH_SIZE, _endpoint2, _headers3, _limiter, _maxBatchSize, _batchingSupported, _pending2, _flushTimer, _flushing, _nextId, __BatchingHttpProvider_instances, scheduleFlush_fn, flushNow_fn, flush_fn, post_fn, settleBatch_fn, settle_fn, handleBatchRefusal_fn, requeue_fn, _a5, BatchingHttpProvider, OFFCHAIN_BID_PREFIX, HYPERBRIDGE_TYPES_BUNDLE, BASE_TIP, HTTP_CONNECT_TIMEOUT_MS, INCLUSION_TIMEOUT_MS, DEFAULT_RPC_MAX_RPS, rpcLimiters, BidCodec, PackedUserOperationCodec, IntentsCoprocessor, ReviveContractInfo, ReviveAccountType, ReviveAccountInfo, H256, EvmStateProof, SubstrateHashing, SubstrateStateMachineProof, BasicProof, LeafIndexAndPos, MmrProof, ConsensusStateId, ConsensusMessage, FraudProofMessage, StateMachine, StateMachineId, StateMachineHeight, Proof, PostRequest, PostResponse, GetRequest, StorageValue, GetResponse, Request3, Response2, RequestMessage, RequestResponse, ResponseMessage, TimeoutMessage, GetRequestsWithProof, Message, DEFAULT_CHILD_STORAGE_PREFIX, PharosProofNodeCodec, SiblingLeftmostLeafProofCodec, NonExistenceProofCodec, AccountProofDataCodec, PharosStateProof, DEFAULT_POLL_INTERVAL, ADDRESS_ZERO2, DEFAULT_GRAFFITI, DEFAULT_LOGGER, REQUEST_STATUS_WEIGHTS, TIMEOUT_STATUS_WEIGHTS, COMBINED_STATUS_WEIGHTS, CHAIN_ID_TO_COINGECKO_NATIVE, TESTNET_CHAINS, ORDER_STATUS, loadDriver, detectEnvironment, STORAGE_KEYS, LEGACY_STORAGE_KEYS, ABI5, uniswapV3Quoter_default, UNISWAP_V4_QUOTER_ABI, ABI6, universalRouter_default, PERMIT2_ABI, UniswapQuoteEngine, COMMON_FEE_TIERS, Swap, ABI7, erc7281_default, DEFAULT_GRAFFITI2, ERC7821_BATCH_MODE, BundlerMethod, SELECT_SOLVER_TYPEHASH, PACKED_USEROP_TYPEHASH, DOMAIN_TYPEHASH, CryptoUtils, FEE_TOKEN_CACHE_TTL_MS, OrderPlacer, TOKEN_KEYED_GATEWAY_ABI, keyingByClient, PARTIAL_FILLS_SLOT, USED_USEROPS_STORAGE_KEY, OrderExecutor, _a6, OrderCanceller, FILL_ORDER_SELECTOR, SUPPORTED_INTENTS_VERSION, CONTRACT_VERSION_ABI, CANONICAL_EVM_TOKEN, ENTRY_POINT_EVENT_ABI, BidImpl, BidManager, RELAYER_MESSAGE_GAS, NO_BUNDLER_FILL_GAS_BASE, NO_BUNDLER_FILL_GAS_PER_OUTPUT, NO_BUNDLER_PAYMASTER_VERIFICATION_GAS, NO_BUNDLER_PAYMASTER_POST_OP_GAS, GasEstimator, OrderStatusChecker, ORDERBOOK_URLS, ORDERBOOK_DECIMALS, ORDERBOOK_SCALE, OrderbookRequestError, RATE_FIELDS, TOP_OF_BOOK_QUERY, ROUTE_LIQUIDITY_QUERY, QUOTE_QUERY, QUOTE_PESSIMISTIC_QUERY, HyperFxOrderbook, UnsupportedLiquidityAssetError, UnsupportedLiquidityChainError, OrderbookQuoteNotConvergedError, MAX_EXACT_OUTPUT_ROUNDS, OrderbookMarket, ORDER_FEE_GAS_PRICE_BUMP_POLICY, IntentGateway, DECLARATION_V1, DECLARATION_V2, PAYMASTER_ADDRESS_BYTES, PAYMASTER_GAS_LIMIT_BYTES, PAYMASTER_DATA_OFFSET, PERMIT2_DATA_BYTES, PERMIT2_SPONSORSHIP_BYTES, MAX_DECLARED_ENTRIES, MAX_TOKEN_ID_BYTES, TeleportParams, MultiAccount;
+var import_merge_race, __defProp3, __getOwnPropNames2, __esm2, __export2, node_exports, wasm, full_path, __dirname$1, cachedTextDecoder, cachedUint8ArrayMemory0, WASM_VECTOR_LEN, cachedTextEncoder, encodeString5, cachedDataViewMemory0, KeccakMergeFinalization, KeccakMerge, wasmPath, wasmBytes2, bindings, wasmModule, wasmInstance, __wasm, init_node11, RequestStatus, TimeoutStatus, IntentOrderStatus, ABI, evmHost_default, ABI2, handlerV2_default, polkadotAssetHubPaseo, polkadotHubMainnet, pharosMainnet, pharosAtlantic, tronNile, chainConfigs, configsByStateMachineId, getConfigByStateMachineId, getChainId3, getViemChain, hyperbridgeAddress, ABI3, IntentGatewayV2_default, ChainConfigService, ABI4, uniswapRouterV2_default, chains, DEFAULT_ADDRESS, EvmChain, REQUEST_COMMITMENTS_SLOT, RESPONSE_COMMITMENTS_SLOT, REQUEST_RECEIPTS_SLOT, STATE_COMMITMENTS_SLOT, MISSING_CONSENSUS_UPDATE_TIME_MESSAGE, MissingConsensusUpdateTimeError, TokenBucket, BATCHES_NOT_SUPPORTED_CODE, TOO_BIG_BATCH_REQUEST_CODE, DEFAULT_MAX_BATCH_SIZE, _endpoint2, _headers3, _limiter, _maxBatchSize, _batchingSupported, _pending2, _flushTimer, _flushing, _nextId, __BatchingHttpProvider_instances, scheduleFlush_fn, flushNow_fn, flush_fn, post_fn, settleBatch_fn, settle_fn, handleBatchRefusal_fn, requeue_fn, _a5, BatchingHttpProvider, OFFCHAIN_BID_PREFIX, HYPERBRIDGE_TYPES_BUNDLE, BASE_TIP, HTTP_CONNECT_TIMEOUT_MS, INCLUSION_TIMEOUT_MS, DEFAULT_RPC_MAX_RPS, rpcLimiters, BidCodec, PackedUserOperationCodec, IntentsCoprocessor, ReviveContractInfo, ReviveAccountType, ReviveAccountInfo, H256, EvmStateProof, SubstrateHashing, SubstrateStateMachineProof, BasicProof, LeafIndexAndPos, MmrProof, ConsensusStateId, ConsensusMessage, FraudProofMessage, StateMachine, StateMachineId, StateMachineHeight, Proof, PostRequest, PostResponse, GetRequest, StorageValue, GetResponse, Request3, Response2, RequestMessage, RequestResponse, ResponseMessage, TimeoutMessage, GetRequestsWithProof, Message, DEFAULT_CHILD_STORAGE_PREFIX, PharosProofNodeCodec, SiblingLeftmostLeafProofCodec, NonExistenceProofCodec, AccountProofDataCodec, PharosStateProof, DEFAULT_POLL_INTERVAL, ADDRESS_ZERO2, DEFAULT_GRAFFITI, DEFAULT_LOGGER, REQUEST_STATUS_WEIGHTS, TIMEOUT_STATUS_WEIGHTS, COMBINED_STATUS_WEIGHTS, CHAIN_ID_TO_COINGECKO_NATIVE, TESTNET_CHAINS, ORDER_STATUS, loadDriver, detectEnvironment, STORAGE_KEYS, LEGACY_STORAGE_KEYS, ABI5, uniswapV3Quoter_default, UNISWAP_V4_QUOTER_ABI, ABI6, universalRouter_default, PERMIT2_ABI, UniswapQuoteEngine, COMMON_FEE_TIERS, Swap, ABI7, erc7281_default, DEFAULT_GRAFFITI2, ERC7821_BATCH_MODE, BundlerMethod, SELECT_SOLVER_TYPEHASH, PACKED_USEROP_TYPEHASH, DOMAIN_TYPEHASH, CryptoUtils, FEE_TOKEN_CACHE_TTL_MS, OrderPlacer, TOKEN_KEYED_GATEWAY_ABI, keyingByClient, PARTIAL_FILLS_SLOT, USED_USEROPS_STORAGE_KEY, OrderExecutor, _a6, OrderCanceller, FILL_ORDER_SELECTOR, SUPPORTED_INTENTS_VERSION, CONTRACT_VERSION_ABI, CANONICAL_EVM_TOKEN, ENTRY_POINT_EVENT_ABI, BidImpl, BidManager, RELAYER_MESSAGE_GAS, NO_BUNDLER_FILL_GAS_BASE, NO_BUNDLER_FILL_GAS_PER_OUTPUT, NO_BUNDLER_PAYMASTER_VERIFICATION_GAS, NO_BUNDLER_PAYMASTER_POST_OP_GAS, BID_PVG_ESTIMATION_ACCOUNT_CODE, SELECTED_BID_SIGNATURE_BYTES, BID_PVG_HEADROOM_PERCENT, ESCROW_MAPPING_SLOT, GasEstimator, OrderStatusChecker, ORDERBOOK_URLS, ORDERBOOK_DECIMALS, ORDERBOOK_SCALE, OrderbookRequestError, RATE_FIELDS, TOP_OF_BOOK_QUERY, ROUTE_LIQUIDITY_QUERY, QUOTE_QUERY, QUOTE_PESSIMISTIC_QUERY, HyperFxOrderbook, UnsupportedLiquidityAssetError, UnsupportedLiquidityChainError, OrderbookQuoteNotConvergedError, MAX_EXACT_OUTPUT_ROUNDS, OrderbookMarket, ORDER_FEE_GAS_PRICE_BUMP_POLICY, IntentGateway, DECLARATION_V1, DECLARATION_V2, PAYMASTER_ADDRESS_BYTES, PAYMASTER_GAS_LIMIT_BYTES, PAYMASTER_DATA_OFFSET, PERMIT2_DATA_BYTES, PERMIT2_SPONSORSHIP_BYTES, MAX_DECLARED_ENTRIES, MAX_TOKEN_ID_BYTES, TeleportParams, MultiAccount;
 var init_node10 = __esm({
   "../sdk/dist/node/index.js"() {
     "use strict";
@@ -227819,6 +227825,10 @@ query OrderStatus($commitment: String!) {
     NO_BUNDLER_FILL_GAS_PER_OUTPUT = 150000n;
     NO_BUNDLER_PAYMASTER_VERIFICATION_GAS = 250000n;
     NO_BUNDLER_PAYMASTER_POST_OP_GAS = 100000n;
+    BID_PVG_ESTIMATION_ACCOUNT_CODE = "0x60003560e01c631626ba7e1460145760206000f35b631626ba7e60e01b60005260206000f3";
+    SELECTED_BID_SIGNATURE_BYTES = 32 + 65 + 65;
+    BID_PVG_HEADROOM_PERCENT = 10n;
+    ESCROW_MAPPING_SLOT = 9n;
     GasEstimator = class {
       /**
        * @param ctx - Shared IntentsV2 context providing the source and destination
@@ -227897,6 +227907,7 @@ query OrderStatus($commitment: String!) {
           assetsForOverrides.push({ token: feeTokenAsBytes32, amount: 0n });
         }
         const isSameChain = souceStateMachineId === destStateMachineId;
+        const commitment = orderCommitment(order);
         const [stateOverridesResult, crossChainFees] = await Promise.all([
           this.ctx.bundlerUrl ? this.buildStateOverride({
             accountAddress: solverAccountAddress,
@@ -227904,7 +227915,16 @@ query OrderStatus($commitment: String!) {
             outputAssets: assetsForOverrides,
             spenderAddress: intentGatewayV2Address,
             intentGatewayV2Address,
-            entryPointAddress
+            entryPointAddress,
+            // A fee quote runs before the order is placed, so nothing is escrowed under
+            // its commitment yet. Cross-chain fills release escrow on the source chain.
+            escrow: isSameChain ? {
+              commitment,
+              inputs: order.inputs.map((input) => ({
+                token: normalizeAddressForEvmBytes32(input.token),
+                amount: input.amount
+              }))
+            } : void 0
           }) : Promise.resolve({ viem: [], bundler: {} }),
           isSameChain ? Promise.resolve({ postRequestFee: 0n, relayerFeeInSourceFeeToken: 0n }) : this.estimateCrossChainFees(
             sourceFeeToken,
@@ -227933,10 +227953,8 @@ query OrderStatus($commitment: String!) {
         const maxFeeBumpPercent = params.maxFeePerGasBumpPercent ?? 10;
         let maxPriorityFeePerGas = gasPrice + gasPrice * BigInt(priorityFeeBumpPercent) / 100n;
         let maxFeePerGas = gasPrice + gasPrice * BigInt(maxFeeBumpPercent) / 100n;
-        const orderForEstimation = { ...order, session: solverAccountAddress };
-        const commitment = orderCommitment(orderForEstimation);
         await assertGatewayRelease(this.ctx.dest.client, intentGatewayV2Address);
-        const fillOrderCalldata = encodeFillOrder(transformOrderForContract(orderForEstimation), fillOptions);
+        const fillOrderCalldata = encodeFillOrder(transformOrderForContract(order), fillOptions);
         let callGasLimit = 500000n;
         let verificationGasLimit = 100000n;
         let preVerificationGas = 100000n;
@@ -227948,7 +227966,7 @@ query OrderStatus($commitment: String!) {
               ...params.prependCalls ?? [],
               { target: intentGatewayV2Address, value: totalNativeValue, data: fillOrderCalldata }
             ]);
-            const accountGasLimits = CryptoUtils.packGasLimits(100000n, callGasLimit);
+            const accountGasLimits = CryptoUtils.packGasLimits(0n, 0n);
             const gasFees = CryptoUtils.packGasFees(maxPriorityFeePerGas, maxFeePerGas);
             const nonce = 0n;
             const preliminaryUserOp = {
@@ -227957,7 +227975,7 @@ query OrderStatus($commitment: String!) {
               initCode: "0x",
               callData,
               accountGasLimits,
-              preVerificationGas: 100000n,
+              preVerificationGas: 0n,
               gasFees,
               paymasterAndData: "0x",
               signature: "0x"
@@ -228087,6 +228105,53 @@ query OrderStatus($commitment: String!) {
           inputs
         };
       }
+      /**
+       * Asks the bundler for the `preVerificationGas` of the bid UserOperation that will
+       * actually be signed, with every funding call, approval and signature byte in it.
+       *
+       * On an L2, `preVerificationGas` also pays the L1 data fee for the op's bytes, a fixed
+       * amount of wei that the bundler converts to gas at the price the op pays. A bundler
+       * admits an op priced at its `maxFeePerGas`, but bundles it at the base fee plus its
+       * priority fee, where the same wei costs more gas. An op sized only for admission is
+       * accepted and then skipped in every bundle until it expires. The estimate is taken
+       * at the bundle's price: the latest base fee plus the op's priority fee, capped at its
+       * `maxFeePerGas`.
+       *
+       * The solver account's code is overridden with {@link BID_PVG_ESTIMATION_ACCOUNT_CODE}
+       * for the call, so only the bytes are priced and the fill itself is not simulated.
+       *
+       * @param params - The bid's fields as they will be signed.
+       * @returns The `preVerificationGas` to sign, with {@link BID_PVG_HEADROOM_PERCENT} added.
+       * @throws If no bundler is configured or the bundler rejects the estimate.
+       */
+      async estimateBidPreVerificationGas(params) {
+        const { solverAccount, maxFeePerGas, maxPriorityFeePerGas } = params;
+        const latestBlock = await this.ctx.dest.client.getBlock({ blockTag: "latest" });
+        const baseFeePerGas = latestBlock.baseFeePerGas;
+        const bundlePrice = baseFeePerGas == null || baseFeePerGas + maxPriorityFeePerGas > maxFeePerGas ? maxFeePerGas : baseFeePerGas + maxPriorityFeePerGas;
+        const priorityFee = maxPriorityFeePerGas < bundlePrice ? maxPriorityFeePerGas : bundlePrice;
+        const userOp = {
+          sender: solverAccount,
+          nonce: params.nonce,
+          initCode: "0x",
+          callData: params.callData,
+          accountGasLimits: CryptoUtils.packGasLimits(params.verificationGasLimit, params.callGasLimit),
+          // Bundlers return a non-zero preVerificationGas as given rather than estimating it.
+          preVerificationGas: 0n,
+          gasFees: CryptoUtils.packGasFees(priorityFee, bundlePrice),
+          paymasterAndData: params.paymasterAndData ?? "0x",
+          signature: `0x${"ff".repeat(SELECTED_BID_SIGNATURE_BYTES)}`
+        };
+        const estimate = await this.crypto.sendBundler(
+          BundlerMethod.ETH_ESTIMATE_USER_OPERATION_GAS,
+          [
+            CryptoUtils.prepareBundlerCall(userOp),
+            params.entryPointAddress,
+            { [solverAccount]: { code: BID_PVG_ESTIMATION_ACCOUNT_CODE } }
+          ]
+        );
+        return BigInt(estimate.preVerificationGas) * (100n + BID_PVG_HEADROOM_PERCENT) / 100n;
+      }
       /**
        * Estimates the cross-chain ISMP POST request fee (the relayer fee for the
        * RedeemEscrow message), in both the source and destination fee tokens.
@@ -228139,20 +228204,38 @@ query OrderStatus($commitment: String!) {
        * @returns An object with `viem` and `bundler` state-override collections.
        */
       async buildStateOverride(params) {
-        const { accountAddress, chain: chain2, outputAssets, spenderAddress, intentGatewayV2Address, entryPointAddress } = params;
-        const testValue = toHex3(maxUint2563 / 2n, { size: 32 });
+        const {
+          accountAddress,
+          chain: chain2,
+          outputAssets,
+          spenderAddress,
+          intentGatewayV2Address,
+          entryPointAddress,
+          escrow
+        } = params;
+        const testValue = toHex3(2n ** 128n, { size: 32 });
         const viemOverrides = [];
         const bundlerOverrides = {};
         if (intentGatewayV2Address) {
           const paramsSlot5 = pad4(toHex3(5n), { size: 32 });
           const dispatcherAddress = this.ctx.dest.configService.getCalldispatcherAddress(chain2);
           const newSlot5Value = "0x" + "0".repeat(22) + "00" + dispatcherAddress.slice(2).toLowerCase();
+          const gatewayDiffs = [{ slot: paramsSlot5, value: newSlot5Value }];
+          for (const [leg, input] of (escrow?.inputs ?? []).entries()) {
+            gatewayDiffs.push({
+              slot: escrowSlot(escrow.commitment, leg),
+              value: toHex3(input.amount, { size: 32 })
+            });
+          }
+          const releasesNative = escrow?.inputs.some((input) => bytes32ToBytes20(input.token) === ADDRESS_ZERO2);
           viemOverrides.push({
             address: intentGatewayV2Address,
-            stateDiff: [{ slot: paramsSlot5, value: newSlot5Value }]
+            ...releasesNative ? { balance: 2n ** 128n } : {},
+            stateDiff: gatewayDiffs
           });
           bundlerOverrides[intentGatewayV2Address] = {
-            stateDiff: { [paramsSlot5]: newSlot5Value }
+            ...releasesNative ? { balance: testValue } : {},
+            stateDiff: Object.fromEntries(gatewayDiffs.map(({ slot, value }) => [slot, value]))
           };
         }
         if (entryPointAddress) {
@@ -228188,6 +228271,25 @@ query OrderStatus($commitment: String!) {
             bundlerOverrides[result.address] = { stateDiff: result.bundlerStateDiffs };
           }
         }
+        if (intentGatewayV2Address && escrow) {
+          const gatewayBalances = await Promise.all(
+            escrow.inputs.map((input) => this.tokenBalanceSlot(input.token, intentGatewayV2Address, chain2))
+          );
+          for (const override of gatewayBalances) {
+            if (!override) continue;
+            const existing = viemOverrides.find((entry) => entry.address === override.address && entry.stateDiff);
+            if (existing) existing.stateDiff.push({ slot: override.slot, value: testValue });
+            else
+              viemOverrides.push({
+                address: override.address,
+                stateDiff: [{ slot: override.slot, value: testValue }]
+              });
+            bundlerOverrides[override.address] = {
+              ...bundlerOverrides[override.address],
+              stateDiff: { ...bundlerOverrides[override.address]?.stateDiff, [override.slot]: testValue }
+            };
+          }
+        }
         const solverAccountContract = this.ctx.dest.configService.getSolverAccountAddress(chain2);
         if (solverAccountContract) {
           try {
@@ -228210,6 +228312,21 @@ query OrderStatus($commitment: String!) {
         }
         return { viem: viemOverrides, bundler: bundlerOverrides };
       }
+      /**
+       * The balance slot of `holder` in an ERC-20 token, for overriding. `null` for the native
+       * token or when the slot cannot be discovered.
+       */
+      async tokenBalanceSlot(tokenHex, holder, chain2) {
+        const tokenAddress = bytes32ToBytes20(tokenHex);
+        if (tokenAddress === ADDRESS_ZERO2) return null;
+        try {
+          const balanceData = "0x70a08231" + bytes20ToBytes32(holder).slice(2);
+          const slot = await getOrFetchStorageSlot(this.ctx.dest.client, chain2, tokenAddress, balanceData);
+          return slot ? { address: tokenAddress, slot } : null;
+        } catch {
+          return null;
+        }
+      }
       /**
        * Resolves the balance and allowance storage slot overrides for a single
        * ERC-20 token in parallel.  Returns `null` for native-ETH tokens or when
@@ -229201,6 +229318,16 @@ query QuotePessimistic($route: RouteInput!, $amountIn: BigInt!) {
       async estimateFillOrder(params) {
         return this.gasEstimator.estimateFillOrder(params);
       }
+      /**
+       * Asks the bundler for the `preVerificationGas` of a bid as it will be signed, priced at
+       * the gas price its bundle pays. Call it with the final calldata and `paymasterAndData`,
+       * before {@link prepareSubmitBid} signs the op.
+       *
+       * Delegates to {@link GasEstimator.estimateBidPreVerificationGas}.
+       */
+      async estimateBidPreVerificationGas(params) {
+        return this.gasEstimator.estimateBidPreVerificationGas(params);
+      }
       /**
        * Quotes the solver fee for an order using the same policy {@link execute} /
        * {@link executeBest} apply when `order.fees` is `0n`.
@@ -329107,20 +329234,32 @@ var ContractInteractionService = class {
     } else {
       this.logger.warn({ reason: pmResult.reason }, "No paymaster for bid UserOp; relying on EntryPoint deposit");
     }
-    const userOp = await sdkHelper.prepareSubmitBid({
-      order,
-      fillOptions,
+    const bidGas = {
       solverAccount: solverAccountAddress,
-      solverSigner: sdkSigningAccount(this.signer),
       nonce,
       entryPointAddress,
       callGasLimit,
       verificationGasLimit: cachedEstimate.verificationGasLimit,
-      preVerificationGas: cachedEstimate.preVerificationGas,
       maxFeePerGas: cachedEstimate.maxFeePerGas,
       maxPriorityFeePerGas: cachedEstimate.maxPriorityFeePerGas,
       callData,
       paymasterAndData
+    };
+    let preVerificationGas = cachedEstimate.preVerificationGas;
+    try {
+      preVerificationGas = await sdkHelper.estimateBidPreVerificationGas(bidGas);
+    } catch (err) {
+      this.logger.warn(
+        { orderId: order.id, err, preVerificationGas: preVerificationGas.toString() },
+        "Could not estimate the bid's preVerificationGas; using the fill estimate's"
+      );
+    }
+    const userOp = await sdkHelper.prepareSubmitBid({
+      ...bidGas,
+      order,
+      fillOptions,
+      solverSigner: sdkSigningAccount(this.signer),
+      preVerificationGas
     });
     const encodedUserOp = encodeUserOpScale(userOp);
     this.logger.info(
@@ -329129,6 +329268,7 @@ var ContractInteractionService = class {
         solverAccount: solverAccountAddress,
         nonce: nonce.toString(),
         callGasLimit: callGasLimit.toString(),
+        preVerificationGas: preVerificationGas.toString(),
         maxFeePerGas: cachedEstimate.maxFeePerGas.toString()
       },
       "Prepared bid UserOp"
@@ -362910,10 +363050,6 @@ init_asset_registry();
 function limitOrderLegs(order) {
   return order.side === "BID" ? { input: order.base, output: order.quote } : { input: order.quote, output: order.base };
 }
-function availableOn(order) {
-  const available = BigInt(order.remaining) - BigInt(order.reserved);
-  return available > 0n ? available : 0n;
-}
 function matchLimitOrders(orders, incoming, resolve11, now = /* @__PURE__ */ new Date()) {
   const qualifying = orders.filter((order) => serves(order, incoming, resolve11, now)).map((order) => {
     const offer = offerFor({
@@ -362922,7 +363058,7 @@ function matchLimitOrders(orders, incoming, resolve11, now = /* @__PURE__ */ new
       price: BigInt(order.price),
       outputDecimals: incoming.outputDecimals
     });
-    const available = availableOn(order);
+    const available = BigInt(order.remaining);
     return { order, offer, available, payout: offer < available ? offer : available };
   }).filter((candidate) => candidate.offer >= incoming.requestedOutput && candidate.payout > 0n).sort(byBestOfferFirst);
   return qualifying;
@@ -364836,48 +364972,42 @@ async function bootFiller(config5, options) {
     assertPairSymbolsResolve(config5.pairs, assetRegistry, configuredChainNames);
   }
   const adminStrategies = [];
-  const strategies = [];
-  let confirmationPolicy;
-  let tradingPairs;
-  let engine;
-  if (config5.pairs?.length) {
-    tradingPairs = config5.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 tradingPairs = (config5.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)
     });
-    confirmationPolicy = assertConfirmationCoverage(
-      config5.confirmationPolicies,
-      resolvedChains.map((c6) => c6.chainId)
-    );
-    const fundingVenues = vaultVenue ? [vaultVenue] : [];
-    engine = new FXFiller(
-      runtimeSigner,
-      configService,
-      chainClientManager,
-      contractService,
-      tradingPairs,
-      assetRegistry,
-      { confirmationPolicy, fundingVenues, limitOrders: options.data.limitOrders }
-    );
-    logger8.info("Hydrating funding venue state...");
-    await engine.initialise();
-    strategies.push(engine);
-  }
+  });
+  const confirmationPolicy = assertConfirmationCoverage(
+    config5.confirmationPolicies,
+    resolvedChains.map((c6) => c6.chainId)
+  );
+  const fundingVenues = vaultVenue ? [vaultVenue] : [];
+  const engine = new FXFiller(
+    runtimeSigner,
+    configService,
+    chainClientManager,
+    contractService,
+    tradingPairs,
+    assetRegistry,
+    { confirmationPolicy, fundingVenues, limitOrders: options.data.limitOrders }
+  );
+  logger8.info("Hydrating funding venue state...");
+  await engine.initialise();
+  const strategies = [engine];
   const haltControls = strategies.map((engine2, index3) => ({
     index: index3,
     isHalted: () => engine2.isHalted(),
     resetHalt: () => engine2.resetHalt()
   }));
-  if (vaultVenue) {
-    await vaultVenue.initialise(runtimeSigner.address);
-  }
   let rebalancingService;
   const rebalancingConfig = configService.getRebalancingConfig();
   if (rebalancingConfig?.triggerPercentage !== void 0 && rebalancingConfig?.baseBalances) {
@@ -365403,8 +365533,8 @@ var MemoryLimitOrderStore = class {
   async reserve(id2, amount) {
     const order = this.orders.get(id2);
     if (!order || order.status !== "open") return false;
+    if (BigInt(amount) > BigInt(order.remaining)) return false;
     const reserved = BigInt(order.reserved) + BigInt(amount);
-    if (reserved > BigInt(order.remaining)) return false;
     this.patch(id2, { reserved: reserved.toString() });
     return true;
   }
@@ -366163,10 +366293,7 @@ var PairController = class {
    * the pair's symbols have to resolve before the market can be hydrated.
    */
   async add(pair, options) {
-    const { engine, tradingPairs, assetRegistry, adminStrategies, balanceTokens, config: config5 } = this.runtime;
-    if (!engine || !tradingPairs) {
-      throw new Error("No trading engine is running \u2014 this filler was started without pairs");
-    }
+    const { engine, assetRegistry, adminStrategies, balanceTokens, config: config5 } = this.runtime;
     const assets = options?.assets;
     const nextAssets = { ...config5.assets ?? {}, ...assets ?? {} };
     const nextPairs = [...this.pairs, pair];
@@ -366205,7 +366332,6 @@ var PairController = class {
   /** Closes a market. Orders already in flight against it still complete. */
   async remove(index3) {
     const { engine, tradingPairs, adminStrategies, config: config5 } = this.runtime;
-    if (!engine || !tradingPairs) throw new Error("No trading engine is running");
     if (index3 < 0 || index3 >= this.pairs.length) throw new Error(`Unknown pair ${index3}`);
     engine.removePair(tradingPairs[index3]);
     config5.pairs = this.pairs.filter((_5, i6) => i6 !== index3);
@@ -366217,7 +366343,7 @@ var PairController = class {
     await this.persist();
   }
   livePair(index3) {
-    const pair = this.runtime.tradingPairs?.[index3];
+    const pair = this.runtime.tradingPairs[index3];
     if (!pair) throw new Error(`Unknown pair ${index3}`);
     return pair;
   }
@@ -366309,9 +366435,9 @@ var ChainController = class {
         throw error;
       }
       const curve = confirmationPolicies[String(chainId)];
-      if (curve) this.runtime.confirmationPolicy?.add(chainId, curve);
-      else if (!this.runtime.confirmationPolicy?.has(chainId)) {
-        this.runtime.confirmationPolicy?.adopt(chainId, resolvedPolicy);
+      if (curve) this.runtime.confirmationPolicy.add(chainId, curve);
+      else if (!this.runtime.confirmationPolicy.has(chainId)) {
+        this.runtime.confirmationPolicy.adopt(chainId, resolvedPolicy);
       }
       this.runtime.resolvedChains.push(resolved);
       config5.chains = [...config5.chains, { rpcUrls: chain2.rpcUrls, bundlerUrl: chain2.bundlerUrl }];
@@ -366339,7 +366465,7 @@ var ChainController = class {
       await intentFiller.removeChain(chainId);
       if (this.ownsScanner) await this.scanner.removeChain(chainId);
       configService.removeChain(chainId);
-      this.runtime.confirmationPolicy?.remove(chainId);
+      this.runtime.confirmationPolicy.remove(chainId);
       this.runtime.chainClientManager.invalidate(chainKey);
       this.runtime.resolvedChains.splice(index3, 1);
       config5.chains = config5.chains.filter((_5, i6) => i6 !== index3);
@@ -367375,8 +367501,8 @@ var SqliteLimitOrderStore = class {
   async reserve(id2, amount) {
     const order = this.read(id2);
     if (!order || order.status !== "open") return false;
+    if (BigInt(amount) > BigInt(order.remaining)) return false;
     const reserved = BigInt(order.reserved) + BigInt(amount);
-    if (reserved > BigInt(order.remaining)) return false;
     const result = this.db.prepare(`
 				UPDATE limit_orders SET reserved = ?, updated_at = datetime('now')
 				WHERE id = ? AND reserved = ? AND status = 'open'