address comments

across-protocol · Jan 2, 2025 · 36fd4e8 · 36fd4e8
1 parent 0142286
commit 36fd4e8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/api/_transfer-with-auth.ts b/api/_transfer-with-auth.ts
@@ -95,12 +95,6 @@ export async function getTransferWithAuthTypedData(params: {
     domainSeparator,
     eip712: {
       types: {
-        EIP712Domain: [
-          { name: "name", type: "string" },
-          { name: "version", type: "string" },
-          { name: "chainId", type: "uint256" },
-          { name: "verifyingContract", type: "address" },
-        ],
         TransferWithAuthorization: [
           { name: "from", type: "address" },
           { name: "to", type: "address" },

diff --git a/api/_utils.ts b/api/_utils.ts
@@ -34,6 +34,7 @@ import {
   Infer,
   integer,
   min,
+  size,
   string,
   Struct,
 } from "superstruct";
@@ -1509,6 +1510,10 @@ export function hexString() {
   });
 }
 
+export function bytes32() {
+  return size(hexString(), 66); // inclusive of "0x"
+}
+
 /**
  * Returns the cushion for a given token symbol and route. If no route is specified, the cushion for the token symbol
  * @param symbol The token symbol

diff --git a/api/relay/_utils.ts b/api/relay/_utils.ts
@@ -1,7 +1,7 @@
 import { assert, Infer, type } from "superstruct";
 import { utils } from "ethers";
 
-import { hexString, positiveIntStr, validAddress } from "../_utils";
+import { bytes32, hexString, positiveIntStr, validAddress } from "../_utils";
 import { getPermitTypedData } from "../_permit";
 import { InvalidParamError } from "../_errors";
 import {
@@ -72,15 +72,15 @@ export const DepositWithAuthArgsSchema = type({
   depositData: DepositDataSchema,
   validAfter: positiveIntStr(),
   validBefore: positiveIntStr(),
-  nonce: hexString(),
+  nonce: bytes32(),
 });
 
 export const SwapAndDepositWithAuthArgsSchema = type({
   signatureOwner: validAddress(),
   swapAndDepositData: SwapAndDepositDataSchema,
   validAfter: positiveIntStr(),
   validBefore: positiveIntStr(),
-  nonce: hexString(),
+  nonce: bytes32(),
 });
 
 export const allowedMethodNames = [

diff --git a/scripts/tests/swap-auth.ts b/scripts/tests/swap-auth.ts
@@ -7,7 +7,7 @@ import axios from "axios";
 
 type AuthPayload = Awaited<ReturnType<typeof buildAuthTxPayload>>;
 
-async function swapWithPermit() {
+async function swapWithAuth() {
   console.log("Swapping with auth...");
   const swapQuote = await fetchSwapQuote<AuthPayload>("auth");
 
@@ -59,7 +59,7 @@ async function swapWithPermit() {
   }
 }
 
-swapWithPermit()
+swapWithAuth()
   .then(() => console.log("Done"))
   .catch((e) => {
     console.error(e);