fix timestamps for auth period

across-protocol · Jan 3, 2025 · 34053f3 · 34053f3
1 parent 61f7949
commit 34053f3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/api/_transfer-with-auth.ts b/api/_transfer-with-auth.ts
@@ -115,10 +115,8 @@ export async function getTransferWithAuthTypedData(params: {
         from: params.ownerAddress,
         to: params.spenderAddress,
         value: String(params.value),
-        validAfter: params?.validAfter
-          ? convertMaybeMillisecondsToSeconds(params.validAfter)
-          : 0,
-        validBefore: convertMaybeMillisecondsToSeconds(params.validBefore),
+        validAfter: params.validAfter ?? 0,
+        validBefore: params.validBefore,
         nonce: params.nonce, // non-sequential nonce, random 32 byte hex string
       },
     },

diff --git a/api/swap/auth/_utils.ts b/api/swap/auth/_utils.ts
@@ -3,7 +3,10 @@ import {
   DepositEntryPointContract,
   OriginSwapEntryPointContract,
 } from "../../_dexes/types";
-import { getTransferWithAuthTypedData } from "../../_transfer-with-auth";
+import {
+  convertMaybeMillisecondsToSeconds,
+  getTransferWithAuthTypedData,
+} from "../../_transfer-with-auth";
 import {
   getDepositTypedData,
   getSwapAndDepositTypedData,
@@ -65,6 +68,9 @@ export async function buildAuthTxPayload({
   // random non-sequesntial nonce
   const nonce = utils.hexlify(utils.randomBytes(32));
 
+  const validAfter = convertMaybeMillisecondsToSeconds(authStart);
+  const validBefore = convertMaybeMillisecondsToSeconds(authDeadline);
+
   if (originSwapQuote) {
     if (!originSwapEntryPoint) {
       throw new Error(
@@ -96,8 +102,8 @@ export async function buildAuthTxPayload({
       argsWithoutSignatures: {
         signatureOwner: crossSwap.depositor,
         swapAndDepositData,
-        validAfter: authStart,
-        validBefore: authDeadline,
+        validAfter,
+        validBefore,
         nonce,
       },
     };
@@ -127,8 +133,8 @@ export async function buildAuthTxPayload({
       argsWithoutSignatures: {
         signatureOwner: crossSwap.depositor,
         depositData: depositDataStruct,
-        validAfter: authStart,
-        validBefore: authDeadline,
+        validAfter,
+        validBefore,
         nonce,
       },
     };
@@ -143,8 +149,8 @@ export async function buildAuthTxPayload({
       spenderAddress: entryPointContract.address,
       value: originSwapQuote?.maximumAmountIn || bridgeQuote.inputAmount,
       nonce,
-      validAfter: authStart,
-      validBefore: authDeadline,
+      validAfter,
+      validBefore,
     }),
     getDepositTypedDataPromise,
   ]);