@hyperbridge/simplex 0.18.2 → 0.18.3

package/dist/index.d.cts

@@ -1320,16 +1320,33 @@ interface BidPlan {
 declare class CacheService {
     private cacheData;
     private readonly CACHE_EXPIRY_MS;
+    /** How long each order's source confirmations take, for the orders still waiting for them. */
+    private readonly confirmationWaits;
     /** When each order's bid loop began, for the orders whose loop is still running. */
     private readonly pins;
     private logger;
     constructor(loggers?: LoggerContext);
     /**
-     * Whether an entry is still fresh. A pinned order's entries are aged as of the pin,
-     * so what was fresh when its bid loop began stays fresh until the loop ends, and
+     * Whether an entry is still live. A pinned order's entries are judged as of the pin,
+     * so what was live when its bid loop began stays live until the loop ends, and
      * what had already expired stays expired.
      */
     private isCacheValid;
+    /**
+     * When an entry written now for the order expires: `CACHE_EXPIRY_MS` from now, plus the
+     * time the order's source confirmations take while it waits for them.
+     */
+    private expiresAt;
+    /**
+     * Lets what is cached for the order outlive `CACHE_EXPIRY_MS` by `waitMs`, the time its
+     * source confirmations take, and returns the release.
+     *
+     * An order is evaluated while it waits for its confirmations, and its bids are signed after
+     * them from what the evaluation cached, so that has to outlast the wait. Each entry takes
+     * its expiry when it is written: the release does not shorten what is already cached, it
+     * only stops later entries from getting the extra time.
+     */
+    extendForConfirmations(orderId: string, waitMs: number): () => void;
     /**
      * Keeps the order's evaluation alive while its bids go out, and returns the release.
      *
@@ -1661,7 +1678,7 @@ declare class ContractInteractionService {
      * Blocks that cannot be read fall back to the declared figure, then to
      * {@link FALLBACK_BLOCK_TIME_SECONDS}. That answer is not kept.
      */
-    private blockTimeSeconds;
+    blockTimeSeconds(chain: string): Promise<number>;
     /** The average block time over the chain's last {@link BLOCK_TIME_SAMPLE_BLOCKS} blocks, in seconds. */
     private measureBlockTimeSeconds;
     /**
@@ -2557,6 +2574,12 @@ declare class IntentFiller {
     private verifyOrderOnSource;
     private handleNewOrder;
     private evaluateOrder;
+    /**
+     * How long `confirmations` take on `chain`, at the block time measured when simplex started.
+     * Zero when there is no block time to be had: the order then keeps the cache's own lifetime,
+     * and an evaluation that expires before its bids is redone.
+     */
+    private confirmationWaitMs;
     /**
      * The destination chain's latest block number, the clock `order.deadline` is read on.
      *

package/dist/index.d.ts

@@ -1320,16 +1320,33 @@ interface BidPlan {
 declare class CacheService {
     private cacheData;
     private readonly CACHE_EXPIRY_MS;
+    /** How long each order's source confirmations take, for the orders still waiting for them. */
+    private readonly confirmationWaits;
     /** When each order's bid loop began, for the orders whose loop is still running. */
     private readonly pins;
     private logger;
     constructor(loggers?: LoggerContext);
     /**
-     * Whether an entry is still fresh. A pinned order's entries are aged as of the pin,
-     * so what was fresh when its bid loop began stays fresh until the loop ends, and
+     * Whether an entry is still live. A pinned order's entries are judged as of the pin,
+     * so what was live when its bid loop began stays live until the loop ends, and
      * what had already expired stays expired.
      */
     private isCacheValid;
+    /**
+     * When an entry written now for the order expires: `CACHE_EXPIRY_MS` from now, plus the
+     * time the order's source confirmations take while it waits for them.
+     */
+    private expiresAt;
+    /**
+     * Lets what is cached for the order outlive `CACHE_EXPIRY_MS` by `waitMs`, the time its
+     * source confirmations take, and returns the release.
+     *
+     * An order is evaluated while it waits for its confirmations, and its bids are signed after
+     * them from what the evaluation cached, so that has to outlast the wait. Each entry takes
+     * its expiry when it is written: the release does not shorten what is already cached, it
+     * only stops later entries from getting the extra time.
+     */
+    extendForConfirmations(orderId: string, waitMs: number): () => void;
     /**
      * Keeps the order's evaluation alive while its bids go out, and returns the release.
      *
@@ -1661,7 +1678,7 @@ declare class ContractInteractionService {
      * Blocks that cannot be read fall back to the declared figure, then to
      * {@link FALLBACK_BLOCK_TIME_SECONDS}. That answer is not kept.
      */
-    private blockTimeSeconds;
+    blockTimeSeconds(chain: string): Promise<number>;
     /** The average block time over the chain's last {@link BLOCK_TIME_SAMPLE_BLOCKS} blocks, in seconds. */
     private measureBlockTimeSeconds;
     /**
@@ -2557,6 +2574,12 @@ declare class IntentFiller {
     private verifyOrderOnSource;
     private handleNewOrder;
     private evaluateOrder;
+    /**
+     * How long `confirmations` take on `chain`, at the block time measured when simplex started.
+     * Zero when there is no block time to be had: the order then keeps the cache's own lifetime,
+     * and an evaluation that expires before its bids is redone.
+     */
+    private confirmationWaitMs;
     /**
      * The destination chain's latest block number, the clock `order.deadline` is read on.
      *

package/dist/index.js

@@ -17067,8 +17067,10 @@ function budgetFromCache(budget) {
 }
 var CacheService = class {
   constructor(loggers = defaultLoggerContext()) {
-    this.CACHE_EXPIRY_MS = 1 * 60 * 1e3;
-    // 1 minute
+    this.CACHE_EXPIRY_MS = 5 * 60 * 1e3;
+    // 5 minutes
+    /** How long each order's source confirmations take, for the orders still waiting for them. */
+    this.confirmationWaits = /* @__PURE__ */ new Map();
     /** When each order's bid loop began, for the orders whose loop is still running. */
     this.pins = /* @__PURE__ */ new Map();
     this.logger = loggers.get("cache-service");
@@ -17088,13 +17090,32 @@ var CacheService = class {
     };
   }
   /**
-   * Whether an entry is still fresh. A pinned order's entries are aged as of the pin,
-   * so what was fresh when its bid loop began stays fresh until the loop ends, and
+   * Whether an entry is still live. A pinned order's entries are judged as of the pin,
+   * so what was live when its bid loop began stays live until the loop ends, and
    * what had already expired stays expired.
    */
-  isCacheValid(timestamp, orderId) {
-    const now = (orderId !== void 0 ? this.pins.get(orderId) : void 0) ?? Date.now();
-    return now - timestamp < this.CACHE_EXPIRY_MS;
+  isCacheValid(expiresAt, orderId) {
+    return (this.pins.get(orderId) ?? Date.now()) < expiresAt;
+  }
+  /**
+   * When an entry written now for the order expires: `CACHE_EXPIRY_MS` from now, plus the
+   * time the order's source confirmations take while it waits for them.
+   */
+  expiresAt(orderId) {
+    return Date.now() + this.CACHE_EXPIRY_MS + (this.confirmationWaits.get(orderId) ?? 0);
+  }
+  /**
+   * Lets what is cached for the order outlive `CACHE_EXPIRY_MS` by `waitMs`, the time its
+   * source confirmations take, and returns the release.
+   *
+   * An order is evaluated while it waits for its confirmations, and its bids are signed after
+   * them from what the evaluation cached, so that has to outlast the wait. Each entry takes
+   * its expiry when it is written: the release does not shorten what is already cached, it
+   * only stops later entries from getting the extra time.
+   */
+  extendForConfirmations(orderId, waitMs) {
+    this.confirmationWaits.set(orderId, waitMs);
+    return () => this.confirmationWaits.delete(orderId);
   }
   /**
    * Keeps the order's evaluation alive while its bids go out, and returns the release.
@@ -17111,37 +17132,37 @@ var CacheService = class {
     return () => this.pins.delete(orderId);
   }
   cleanupStaleData() {
-    const staleGasEstimateIds = Object.entries(this.cacheData.gasEstimates).filter(([orderId, data]) => !this.isCacheValid(data.timestamp, orderId)).map(([orderId]) => orderId);
+    const staleGasEstimateIds = Object.entries(this.cacheData.gasEstimates).filter(([orderId, data]) => !this.isCacheValid(data.expiresAt, orderId)).map(([orderId]) => orderId);
     staleGasEstimateIds.forEach((orderId) => {
       delete this.cacheData.gasEstimates[orderId];
     });
     for (const [orderId, data] of Object.entries(this.cacheData.bidPlans)) {
-      if (!this.isCacheValid(data.timestamp, orderId)) delete this.cacheData.bidPlans[orderId];
+      if (!this.isCacheValid(data.expiresAt, orderId)) delete this.cacheData.bidPlans[orderId];
     }
     for (const [orderId, data] of Object.entries(this.cacheData.matchedLimitOrders)) {
-      if (!this.isCacheValid(data.timestamp, orderId)) delete this.cacheData.matchedLimitOrders[orderId];
+      if (!this.isCacheValid(data.expiresAt, orderId)) delete this.cacheData.matchedLimitOrders[orderId];
     }
-    const staleSwapOperationIds = Object.entries(this.cacheData.swapOperations).filter(([orderId, data]) => !this.isCacheValid(data.timestamp, orderId)).map(([orderId]) => orderId);
+    const staleSwapOperationIds = Object.entries(this.cacheData.swapOperations).filter(([orderId, data]) => !this.isCacheValid(data.expiresAt, orderId)).map(([orderId]) => orderId);
     staleSwapOperationIds.forEach((orderId) => {
       delete this.cacheData.swapOperations[orderId];
     });
-    const staleFillerOutputIds = Object.entries(this.cacheData.fillerOutputs).filter(([orderId, data]) => !this.isCacheValid(data.timestamp, orderId)).map(([orderId]) => orderId);
+    const staleFillerOutputIds = Object.entries(this.cacheData.fillerOutputs).filter(([orderId, data]) => !this.isCacheValid(data.expiresAt, orderId)).map(([orderId]) => orderId);
     staleFillerOutputIds.forEach((orderId) => {
       delete this.cacheData.fillerOutputs[orderId];
     });
-    const stalePairIds = Object.entries(this.cacheData.pairClassifications).filter(([orderId, data]) => !this.isCacheValid(data.timestamp, orderId)).map(([orderId]) => orderId);
+    const stalePairIds = Object.entries(this.cacheData.pairClassifications).filter(([orderId, data]) => !this.isCacheValid(data.expiresAt, orderId)).map(([orderId]) => orderId);
     stalePairIds.forEach((orderId) => {
       delete this.cacheData.pairClassifications[orderId];
     });
-    const staleFundingIds = Object.entries(this.cacheData.fundingPrepends).filter(([orderId, data]) => !this.isCacheValid(data.timestamp, orderId)).map(([orderId]) => orderId);
+    const staleFundingIds = Object.entries(this.cacheData.fundingPrepends).filter(([orderId, data]) => !this.isCacheValid(data.expiresAt, orderId)).map(([orderId]) => orderId);
     staleFundingIds.forEach((orderId) => {
       delete this.cacheData.fundingPrepends[orderId];
     });
-    const stalePartialIds = Object.entries(this.cacheData.partialFills).filter(([orderId, data]) => !this.isCacheValid(data.timestamp, orderId)).map(([orderId]) => orderId);
+    const stalePartialIds = Object.entries(this.cacheData.partialFills).filter(([orderId, data]) => !this.isCacheValid(data.expiresAt, orderId)).map(([orderId]) => orderId);
     stalePartialIds.forEach((orderId) => {
       delete this.cacheData.partialFills[orderId];
     });
-    const staleWaivedIds = Object.entries(this.cacheData.feeChecksWaived).filter(([orderId, data]) => !this.isCacheValid(data.timestamp, orderId)).map(([orderId]) => orderId);
+    const staleWaivedIds = Object.entries(this.cacheData.feeChecksWaived).filter(([orderId, data]) => !this.isCacheValid(data.expiresAt, orderId)).map(([orderId]) => orderId);
     staleWaivedIds.forEach((orderId) => {
       delete this.cacheData.feeChecksWaived[orderId];
     });
@@ -17149,7 +17170,7 @@ var CacheService = class {
   getGasEstimate(orderId) {
     try {
       const cache = this.cacheData.gasEstimates[orderId];
-      if (cache && this.isCacheValid(cache.timestamp, orderId)) {
+      if (cache && this.isCacheValid(cache.expiresAt, orderId)) {
         return {
           totalCostInSourceFeeToken: BigInt(cache.totalCostInSourceFeeToken),
           relayerFeeInSourceFeeToken: BigInt(cache.relayerFeeInSourceFeeToken ?? "0"),
@@ -17184,7 +17205,7 @@ var CacheService = class {
         maxFeePerGas: maxFeePerGas.toString(),
         maxPriorityFeePerGas: maxPriorityFeePerGas.toString(),
         totalGasCostWei: totalGasCostWei.toString(),
-        timestamp: Date.now()
+        expiresAt: this.expiresAt(orderId)
       };
     } catch (error) {
       this.logger.error({ err: error }, "Error setting gas estimate");
@@ -17194,7 +17215,7 @@ var CacheService = class {
   getSwapOperations(orderId) {
     try {
       const cache = this.cacheData.swapOperations[orderId];
-      if (cache && this.isCacheValid(cache.timestamp, orderId)) {
+      if (cache && this.isCacheValid(cache.expiresAt, orderId)) {
         return {
           calls: cache.calls,
           totalGasEstimate: BigInt(cache.totalGasEstimate)
@@ -17212,7 +17233,7 @@ var CacheService = class {
       this.cacheData.swapOperations[orderId] = {
         calls,
         totalGasEstimate: totalGasEstimate.toString(),
-        timestamp: Date.now()
+        expiresAt: this.expiresAt(orderId)
       };
     } catch (error) {
       this.logger.error({ err: error }, "Error setting swap operations");
@@ -17222,7 +17243,7 @@ var CacheService = class {
   getFillerOutputs(orderId) {
     try {
       const cache = this.cacheData.fillerOutputs[orderId];
-      if (cache && this.isCacheValid(cache.timestamp, orderId)) {
+      if (cache && this.isCacheValid(cache.expiresAt, orderId)) {
         return cache.outputs.map((o) => ({
           token: o.token,
           amount: BigInt(o.amount)
@@ -17238,7 +17259,7 @@ var CacheService = class {
   getFillerInputs(orderId) {
     try {
       const cache = this.cacheData.fillerOutputs[orderId];
-      if (cache?.inputs && this.isCacheValid(cache.timestamp, orderId)) {
+      if (cache?.inputs && this.isCacheValid(cache.expiresAt, orderId)) {
         return cache.inputs.map((o) => ({
           token: o.token,
           amount: BigInt(o.amount)
@@ -17260,7 +17281,7 @@ var CacheService = class {
   getBidBudget(orderId) {
     try {
       const cache = this.cacheData.fillerOutputs[orderId];
-      if (cache?.budget && this.isCacheValid(cache.timestamp, orderId)) return budgetFromCache(cache.budget);
+      if (cache?.budget && this.isCacheValid(cache.expiresAt, orderId)) return budgetFromCache(cache.budget);
       return null;
     } catch (error) {
       this.logger.error({ err: error }, "Error getting bid budget");
@@ -17280,7 +17301,7 @@ var CacheService = class {
           amount: o.amount.toString()
         })),
         ...budget ? { budget: budgetToCache(budget) } : {},
-        timestamp: Date.now()
+        expiresAt: this.expiresAt(orderId)
       };
     } catch (error) {
       this.logger.error({ err: error }, "Error setting filler outputs");
@@ -17297,7 +17318,7 @@ var CacheService = class {
   getMatchedLimitOrder(orderId) {
     try {
       const cache = this.cacheData.matchedLimitOrders[orderId];
-      if (cache && this.isCacheValid(cache.timestamp, orderId)) {
+      if (cache && this.isCacheValid(cache.expiresAt, orderId)) {
         return cache.holds.map((hold) => ({ limitOrderId: hold.limitOrderId, payout: BigInt(hold.payout) }));
       }
       return [];
@@ -17309,7 +17330,7 @@ var CacheService = class {
   getBidPlans(orderId) {
     try {
       const cache = this.cacheData.bidPlans[orderId];
-      if (!cache || !this.isCacheValid(cache.timestamp, orderId)) return [];
+      if (!cache || !this.isCacheValid(cache.expiresAt, orderId)) return [];
       return cache.plans.map((plan) => ({
         limitOrderId: plan.limitOrderId,
         leg: plan.leg ?? 0,
@@ -17360,7 +17381,7 @@ var CacheService = class {
           ...plan.inputDecimals !== void 0 ? { inputDecimals: plan.inputDecimals } : {},
           ...plan.budget ? { budget: budgetToCache(plan.budget) } : {}
         })),
-        timestamp: Date.now()
+        expiresAt: this.expiresAt(orderId)
       };
     } catch (error) {
       this.logger.error({ err: error }, "Error setting bid plans");
@@ -17375,7 +17396,7 @@ var CacheService = class {
       this.cleanupStaleData();
       this.cacheData.matchedLimitOrders[orderId] = {
         holds: holds.map((hold) => ({ limitOrderId: hold.limitOrderId, payout: hold.payout.toString() })),
-        timestamp: Date.now()
+        expiresAt: this.expiresAt(orderId)
       };
     } catch (error) {
       this.logger.error({ err: error }, "Error setting matched limit order");
@@ -17385,7 +17406,7 @@ var CacheService = class {
   getPairClassifications(orderId) {
     try {
       const cache = this.cacheData.pairClassifications[orderId];
-      if (cache && this.isCacheValid(cache.timestamp, orderId)) {
+      if (cache && this.isCacheValid(cache.expiresAt, orderId)) {
         return cache.pairs;
       }
       return null;
@@ -17398,7 +17419,7 @@ var CacheService = class {
     try {
       this.cacheData.pairClassifications[orderId] = {
         pairs,
-        timestamp: Date.now()
+        expiresAt: this.expiresAt(orderId)
       };
     } catch (error) {
       this.logger.error({ err: error }, "Error setting pair classifications");
@@ -17408,7 +17429,7 @@ var CacheService = class {
   getFundingPrepends(orderId) {
     try {
       const cache = this.cacheData.fundingPrepends[orderId];
-      if (cache && this.isCacheValid(cache.timestamp, orderId)) {
+      if (cache && this.isCacheValid(cache.expiresAt, orderId)) {
         return {
           calls: cache.calls.map((c) => ({
             target: c.target,
@@ -17432,7 +17453,7 @@ var CacheService = class {
           value: c.value.toString(),
           data: c.data
         })),
-        timestamp: Date.now()
+        expiresAt: this.expiresAt(orderId)
       };
     } catch (error) {
       this.logger.error({ err: error }, "Error setting funding prepends");
@@ -17451,10 +17472,10 @@ var CacheService = class {
    */
   isPartialFill(orderId) {
     const cache = this.cacheData.partialFills[orderId];
-    return cache !== void 0 && this.isCacheValid(cache.timestamp, orderId) && cache.partial;
+    return cache !== void 0 && this.isCacheValid(cache.expiresAt, orderId) && cache.partial;
   }
   setPartialFill(orderId, partial) {
-    this.cacheData.partialFills[orderId] = { partial, timestamp: Date.now() };
+    this.cacheData.partialFills[orderId] = { partial, expiresAt: this.expiresAt(orderId) };
   }
   clearPartialFill(orderId) {
     delete this.cacheData.partialFills[orderId];
@@ -17469,10 +17490,10 @@ var CacheService = class {
    */
   isFeeCheckWaived(orderId) {
     const cache = this.cacheData.feeChecksWaived[orderId];
-    return cache !== void 0 && this.isCacheValid(cache.timestamp, orderId) && cache.waived;
+    return cache !== void 0 && this.isCacheValid(cache.expiresAt, orderId) && cache.waived;
   }
   setFeeCheckWaived(orderId, waived) {
-    this.cacheData.feeChecksWaived[orderId] = { waived, timestamp: Date.now() };
+    this.cacheData.feeChecksWaived[orderId] = { waived, expiresAt: this.expiresAt(orderId) };
   }
   clearFeeCheckWaived(orderId) {
     delete this.cacheData.feeChecksWaived[orderId];
@@ -23953,6 +23974,10 @@ var IntentFiller = class {
           this.monitor.emit("orderSkipped", { orderId: order.id, reason: "Placement block unknown" });
           return;
         }
+        const releaseWait = order.id && requiredConfirmations > 0 ? this.contractService.cacheService.extendForConfirmations(
+          order.id,
+          await this.confirmationWaitMs(order.source, requiredConfirmations)
+        ) : void 0;
         const abortController = new AbortController();
         const confirmStartMs = Date.now();
         const confirmationPollMs = sourceQuorumClient.size > 1 ? 1e3 : 300;
@@ -24016,7 +24041,7 @@ var IntentFiller = class {
             if (!result) abortController.abort();
             return result;
           })
-        ]);
+        ]).finally(() => releaseWait?.());
         const confirmDurationSec = (Date.now() - confirmStartMs) / 1e3;
         this.monitor.emit("orderTiming", {
           orderId: order.id,
@@ -24045,7 +24070,8 @@ var IntentFiller = class {
           evaluationResult.strategy,
           solverSelectionActive,
           inputUsdValue,
-          evaluationResult.profitability
+          evaluationResult.profitability,
+          () => this.evaluateOrder(order, canFillCache)
         );
       } catch (error) {
         this.logger.error({ orderId: order.id, err: error }, "Error processing order");
@@ -24126,6 +24152,19 @@ var IntentFiller = class {
     );
     return validStrategies[0];
   }
+  /**
+   * How long `confirmations` take on `chain`, at the block time measured when simplex started.
+   * Zero when there is no block time to be had: the order then keeps the cache's own lifetime,
+   * and an evaluation that expires before its bids is redone.
+   */
+  async confirmationWaitMs(chain, confirmations) {
+    try {
+      return Math.ceil(confirmations * await this.contractService.blockTimeSeconds(chain) * 1e3);
+    } catch (err) {
+      this.logger.warn({ chain, err }, "Could not read the block time to size the order's cache lifetime");
+      return 0;
+    }
+  }
   /**
    * The destination chain's latest block number, the clock `order.deadline` is read on.
    *
@@ -24165,7 +24204,7 @@ var IntentFiller = class {
     if (!order.id) return false;
     return this.contractService.cacheService.isFeeCheckWaived(order.id);
   }
-  executeOrder(order, bestStrategy, solverSelectionActive, inputUsdValue, profitUsd) {
+  executeOrder(order, bestStrategy, solverSelectionActive, inputUsdValue, profitUsd, reevaluate) {
     const chainQueue = this.chainQueues.get(getChainId3(order.destination));
     if (!chainQueue) {
       this.logger.error({ chain: order.destination }, "No queue configured for chain");
@@ -24176,12 +24215,19 @@ var IntentFiller = class {
     chainQueue.add(async () => {
       const queueDurationSec = (Date.now() - queuedAtMs) / 1e3;
       this.monitor.emit("orderTiming", { orderId: order.id, phase: "queue_wait", durationSec: queueDurationSec });
+      const cache = this.contractService.cacheService;
+      unpin = order.id ? cache.pinOrder(order.id) : void 0;
+      if (order.id && reevaluate && !cache.getGasEstimate(order.id)) {
+        this.logger.info({ orderId: order.id }, "Order evaluation expired before bidding, evaluating it again");
+        const evaluation = await reevaluate();
+        if (!evaluation) return;
+        bestStrategy = evaluation.strategy;
+        profitUsd = evaluation.profitability;
+      }
       this.logger.info(
         { orderId: order.id, strategy: bestStrategy.name, chain: order.destination },
         "Executing order"
       );
-      const cache = this.contractService.cacheService;
-      unpin = order.id ? cache.pinOrder(order.id) : void 0;
       const plans = this.limitOrders && order.id ? cache.getBidPlans(order.id) : [];
       let lastResult;
       for (const plan of plans.length > 0 ? plans : [void 0]) {