fix: assert EIP-712 domains are valid

wevm · Nov 14, 2024 · af01579 · af01579
1 parent 4b053a9
commit af01579
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 1 deletion.
diff --git a/.changeset/dry-buses-cross.md b/.changeset/dry-buses-cross.md
@@ -0,0 +1,5 @@
+---
+"ox": patch
+---
+
+Assert that EIP-712 domains are valid.
diff --git a/src/core/TypedData.ts b/src/core/TypedData.ts
@@ -157,7 +157,10 @@ export function assert<
   }
 
   // Validate domain types.
-  if (types.EIP712Domain && domain) validateData(types.EIP712Domain, domain)
+  if (types.EIP712Domain && domain) {
+    if (typeof domain !== 'object') throw new InvalidDomainError({ domain })
+    validateData(types.EIP712Domain, domain)
+  }
 
   // Validate message types.
   if (primaryType !== 'EIP712Domain') {
@@ -749,6 +752,17 @@ export class BytesSizeMismatchError extends Errors.BaseError {
   }
 }
 
+/** Thrown when the domain is invalid. */
+export class InvalidDomainError extends Errors.BaseError {
+  override readonly name = 'TypedData.InvalidDomainError'
+
+  constructor({ domain }: { domain: unknown }) {
+    super(`Invalid domain "${Json.stringify(domain)}".`, {
+      metaMessages: ['Must be a valid EIP-712 domain.'],
+    })
+  }
+}
+
 /** Thrown when the primary type of a typed data value is invalid. */
 export class InvalidPrimaryTypeError extends Errors.BaseError {
   override readonly name = 'TypedData.InvalidPrimaryTypeError'

diff --git a/src/core/_test/TypedData.test.ts b/src/core/_test/TypedData.test.ts
@@ -200,6 +200,49 @@ describe('assert', () => {
     )
   })
 
+  test('domain: invalid', () => {
+    expect(() =>
+      TypedData.assert({
+        domain: 'foo' as never,
+        primaryType: 'Mail',
+        types: {
+          EIP712Domain: [
+            { name: 'name', type: 'string' },
+            { name: 'version', type: 'string' },
+            { name: 'chainId', type: 'uint256' },
+            { name: 'verifyingContract', type: 'address' },
+          ],
+          Mail: [
+            { name: 'from', type: 'Person' },
+            { name: 'to', type: 'Person' },
+            { name: 'contents', type: 'string' },
+          ],
+          Person: [
+            { name: 'name', type: 'string' },
+            { name: 'wallet', type: 'address' },
+          ],
+        },
+        message: {
+          from: {
+            name: 'Cow',
+            wallet: '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826',
+          },
+          to: {
+            name: 'Bob',
+            wallet: '0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB',
+          },
+          contents: 'Hello, Bob!',
+        },
+      }),
+    ).toThrowErrorMatchingInlineSnapshot(
+      `
+      [TypedData.InvalidDomainError: Invalid domain ""foo"".
+
+      Must be a valid EIP-712 domain.]
+    `,
+    )
+  })
+
   test('domain: invalid chainId', () => {
     expect(() =>
       TypedData.assert({
@@ -1412,6 +1455,7 @@ test('exports', () => {
       "serialize",
       "validate",
       "BytesSizeMismatchError",
+      "InvalidDomainError",
       "InvalidPrimaryTypeError",
       "InvalidStructTypeError",
       "encodeData",