make submission expiration time more readable

l2beat · Apr 13, 2023 · 3b84cc0 · 3b84cc0
1 parent 0ca66d7
commit 3b84cc0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/packages/backend/src/api/controllers/TransactionSubmitController.ts b/packages/backend/src/api/controllers/TransactionSubmitController.ts
@@ -197,8 +197,8 @@ function tradeMatchesOffer(
     offer.collateralAmount === trade.collateralAmount &&
     offer.syntheticAmount === trade.syntheticAmount &&
     offer.isABuyingSynthetic === trade.isABuyingSynthetic &&
-    Timestamp.toHours(offer.accepted.submissionExpirationTime) ===
-      Timestamp.toHours(trade.submissionExpirationTime) &&
+    offer.accepted.submissionExpirationTime ===
+      trade.submissionExpirationTime &&
     offer.accepted.nonce === trade.nonce &&
     offer.accepted.signature === trade.signature &&
     offer.accepted.premiumCost === trade.premiumCost

diff --git a/packages/backend/src/api/controllers/utils/offerForms.ts b/packages/backend/src/api/controllers/utils/offerForms.ts
@@ -26,8 +26,8 @@ export function getAcceptForm(
 ): AcceptForm | undefined {
   const isAcceptable = !offer.accepted && !offer.cancelledAt
   const shouldRenderForm = isAcceptable && user.positionId !== offer.positionIdA
-  const submissionExpirationTime = Timestamp(
-    BigInt(Math.floor(Date.now() + THREE_DAYS_IN_MILLIS))
+  const submissionExpirationTime = Timestamp.roundDownToHours(
+    Timestamp(Math.floor(Date.now() + THREE_DAYS_IN_MILLIS))
   )
   if (!shouldRenderForm) {
     return undefined

diff --git a/packages/types/src/Timestamp.test.ts b/packages/types/src/Timestamp.test.ts
@@ -52,4 +52,12 @@ describe(Timestamp.name, () => {
       expect(Timestamp.toSeconds(Timestamp(7_200_000n))).toEqual(7200n)
     })
   })
+
+  describe(Timestamp.roundDownToHours.name, () => {
+    it('rounds down to hours', () => {
+      const timestamp = Timestamp(new Date().setHours(12, 35))
+      const expectedTimestamp = Timestamp(new Date().setHours(12, 0, 0, 0))
+      expect(Timestamp.roundDownToHours(timestamp)).toEqual(expectedTimestamp)
+    })
+  })
 })
diff --git a/packages/types/src/Timestamp.ts b/packages/types/src/Timestamp.ts
@@ -26,3 +26,7 @@ Timestamp.toHours = function toHours(timestamp: Timestamp) {
 Timestamp.toSeconds = function toSeconds(timestamp: Timestamp) {
   return timestamp.valueOf() / 1000n
 }
+
+Timestamp.roundDownToHours = function roundUpToHours(timestamp: Timestamp) {
+  return Timestamp.fromHours(Timestamp.toHours(timestamp))
+}