fix: allow passing optimistic timestamp from outside

Author: doomsower

package.json

@@ -28,7 +28,7 @@
     "@gearbox-protocol/eslint-config": "2.0.0-next.2",
     "@gearbox-protocol/liquidator-v2-contracts": "^2.2.2",
     "@gearbox-protocol/prettier-config": "2.0.0",
-    "@gearbox-protocol/sdk": "3.0.0-vfour.237",
+    "@gearbox-protocol/sdk": "3.0.0-vfour.249",
     "@gearbox-protocol/types": "^1.14.3",
     "@types/node": "^22.12.0",
     "@uniswap/sdk-core": "^7.5.0",

src/attachSDK.ts

@@ -31,18 +31,18 @@ export default async function attachSDK(): Promise<CreditAccountsService> {
     // Also, when forking anvil->anvil (when running on testnets) block.timestamp can be in future because min ts for block is 1 seconds,
     // and scripts can take dozens of blocks (hundreds for faucet). So we take min value;
     const nowMs = new Date().getTime();
-    const redstoneIntervalMs = 60_000;
-    optimisticTimestamp =
-      redstoneIntervalMs *
-      Math.floor((Number(block.timestamp) * 1000) / redstoneIntervalMs);
-    const deltaS = Math.floor((nowMs - optimisticTimestamp) / 1000);
-    if (deltaS < 0) {
-      optimisticTimestamp =
-        Math.floor((nowMs - redstoneIntervalMs) / redstoneIntervalMs) *
-        redstoneIntervalMs;
-    } else if (deltaS * 1000 < redstoneIntervalMs) {
-      optimisticTimestamp -= redstoneIntervalMs;
+    if (config.optimisticTimestamp) {
+      optimisticTimestamp = config.optimisticTimestamp;
+    } else {
+      const redstoneIntervalMs = 60_000;
+      const anvilTsMs =
+        redstoneIntervalMs *
+        Math.floor((Number(block.timestamp) * 1000) / redstoneIntervalMs);
+      const fromNowTsMs =
+        redstoneIntervalMs * Math.floor(nowMs / redstoneIntervalMs - 1);
+      optimisticTimestamp = Math.min(anvilTsMs, fromNowTsMs);
     }
+    const deltaS = Math.floor((nowMs - optimisticTimestamp) / 1000);
     logger.info(
       { tag: "timing" },
       `will use optimistic timestamp: ${new Date(optimisticTimestamp)} (${optimisticTimestamp}, delta: ${deltaS}s)`,

src/config/env.ts

@@ -19,6 +19,7 @@ const envConfigMapping: Record<keyof ConfigSchema, string | string[]> = {
   minBalance: "MIN_BALANCE",
   oneInchApiKey: "ONE_INCH_API_KEY",
   optimistic: "OPTIMISTIC",
+  optimisticTimestamp: "OPTIMISTIC_TIMESTAMP",
   outDir: "OUT_DIR",
   outEndpoint: "OUT_ENDPOINT",
   outHeaders: "OUT_HEADERS",

src/config/schema.ts

@@ -78,6 +78,10 @@ export const ConfigSchema = z.object({
    * Enable optimistic liquidations
    */
   optimistic: booleanLike.pipe(z.boolean().optional()),
+  /**
+   * Optimistic timestamp to pass from external runner, in ms
+   */
+  optimisticTimestamp: z.number().int().positive().nullish(),
   /**
    * Redstone gateways override
    * Set local caching proxies to avoid rate limiting in test environment

yarn.lock

@@ -1730,7 +1730,7 @@ __metadata:
     "@gearbox-protocol/eslint-config": "npm:2.0.0-next.2"
     "@gearbox-protocol/liquidator-v2-contracts": "npm:^2.2.2"
     "@gearbox-protocol/prettier-config": "npm:2.0.0"
-    "@gearbox-protocol/sdk": "npm:3.0.0-vfour.237"
+    "@gearbox-protocol/sdk": "npm:3.0.0-vfour.249"
     "@gearbox-protocol/types": "npm:^1.14.3"
     "@types/node": "npm:^22.12.0"
     "@uniswap/sdk-core": "npm:^7.5.0"
@@ -1767,9 +1767,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gearbox-protocol/sdk@npm:3.0.0-vfour.237":
-  version: 3.0.0-vfour.237
-  resolution: "@gearbox-protocol/sdk@npm:3.0.0-vfour.237"
+"@gearbox-protocol/sdk@npm:3.0.0-vfour.249":
+  version: 3.0.0-vfour.249
+  resolution: "@gearbox-protocol/sdk@npm:3.0.0-vfour.249"
   dependencies:
     "@redstone-finance/evm-connector": "npm:^0.7.3"
     "@redstone-finance/protocol": "npm:^0.7.3"
@@ -1779,7 +1779,7 @@ __metadata:
     viem: "npm:>=2.21.0 <3.0.0"
   peerDependencies:
     axios: ^1.0.0
-  checksum: 10c0/57e6eea4641d1759952b4b9b892f9219574b7b9e8d79be9f65f6629155ed2ac23e59da1ec822a897b9dcf351e184ed77587c469c8e40d7a0c1c6f7b1e2ea0124
+  checksum: 10c0/83fef156ea311ed62abba9888a9044c173e94092e79da1bc75c2e6fcbea7f9799a8fa329d3d7d1b6562e685085d0f09dc53a0700e0904a93d62ace711027c4ca
   languageName: node
   linkType: hard