Don't hardcode 24h finalization

SwaprHQ · Oct 7, 2024 · 817c405 · 817c405
1 parent ccb2732
commit 817c405
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/app/filters.tsx b/app/filters.tsx
@@ -4,7 +4,7 @@ import {
   OrderDirection,
 } from '@/queries/omen';
 import { AI_AGENTS_ALLOWLIST } from '../constants';
-import { _24HoursInSeconds, nowTimestamp } from '@/utils/time';
+import { nowTimestamp } from '@/utils/time';
 import {WXDAI, SDAI} from '@/constants/index';
 
 export type OrderFilter = {
@@ -53,8 +53,6 @@ export type StateFilter = {
   when: FixedProductMarketMaker_Filter;
 };
 
-const oneDayAgoTimestamp = nowTimestamp - _24HoursInSeconds;
-
 export const stateFilters: StateFilter[] = [
   {
     name: 'Open',
@@ -76,7 +74,8 @@ export const stateFilters: StateFilter[] = [
     key: 'finalizing',
     when: {
       resolutionTimestamp: null,
-      currentAnswerTimestamp_gt: oneDayAgoTimestamp,
+      answerFinalizedTimestamp_gt: nowTimestamp,
+      answerFinalizedTimestamp_not: null,
       openingTimestamp_lt: nowTimestamp,
       isPendingArbitration: false,
       currentAnswer_not: null,

diff --git a/entities/markets/market.ts b/entities/markets/market.ts
@@ -2,7 +2,7 @@ import { FixedProductMarketMaker } from '@/queries/omen';
 import { fromHex } from 'viem';
 import { Outcome } from '@/entities';
 import { isPast } from 'date-fns';
-import { _24HoursInSeconds, nowTimestamp } from '@/utils/time';
+import { nowTimestamp } from '@/utils/time';
 
 const INVALID_ANSWER_HEX =
   '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff';
@@ -25,7 +25,7 @@ export class Market {
     this.closingDate = new Date(+fpmm.openingTimestamp * 1000);
     this.isAnswerFinal =
       !!fpmm.resolutionTimestamp ||
-      nowTimestamp - fpmm.currentAnswerTimestamp > _24HoursInSeconds;
+      fpmm.answerFinalizedTimestamp < nowTimestamp;
 
     this.currentAnswer = fpmm.question?.currentAnswer
       ? fpmm.question.currentAnswer === INVALID_ANSWER_HEX

diff --git a/queries/omen/markets.ts b/queries/omen/markets.ts
@@ -149,6 +149,7 @@ const getMarketsQuery = (
     $currentAnswer: Bytes
     $currentAnswer_not: Bytes
     $answerFinalizedTimestamp_lt: Int
+    $answerFinalizedTimestamp_gt: Int
     $openingTimestamp_lte: Int
     $scaledLiquidityParameter_gt: Int
     $resolutionTimestamp: Int
@@ -172,6 +173,7 @@ const getMarketsQuery = (
         ${params.currentAnswer !== undefined ? 'currentAnswer: $currentAnswer' : ''}
         ${params.currentAnswer_not !== undefined ? 'currentAnswer_not: $currentAnswer_not' : ''}
         ${params.answerFinalizedTimestamp_lt ? 'answerFinalizedTimestamp_lt: $answerFinalizedTimestamp_lt' : ''}
+        ${params.answerFinalizedTimestamp_gt ? 'answerFinalizedTimestamp_gt: $answerFinalizedTimestamp_gt' : ''}
         ${params.openingTimestamp_lte ? 'openingTimestamp_lte: $openingTimestamp_lte' : ''}
         ${params.scaledLiquidityParameter_gt !== undefined ? 'scaledLiquidityParameter_gt: $scaledLiquidityParameter_gt' : ''}
         ${params.resolutionTimestamp !== undefined ? 'resolutionTimestamp: $resolutionTimestamp' : ''}

diff --git a/utils/time.ts b/utils/time.ts
@@ -1,2 +1 @@
-export const _24HoursInSeconds = 24 * 60 * 60;
 export const nowTimestamp = Math.floor(Date.now() / 1000);
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export const _24HoursInSeconds = 24 * 60 * 60;
		export const nowTimestamp = Math.floor(Date.now() / 1000);