Always verify the name

ethereum-attestation-service · Nov 10, 2023 · 63c5ef0 · 63c5ef0
1 parent 3fd054c
commit 63c5ef0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/dist/offchain/typed-data-handler.js b/dist/offchain/typed-data-handler.js
diff --git a/dist/offchain/typed-data-handler.js.map b/dist/offchain/typed-data-handler.js.map
diff --git a/src/offchain/typed-data-handler.ts b/src/offchain/typed-data-handler.ts
@@ -141,7 +141,7 @@ export abstract class TypedDataHandler {
 
     let expectedDomain = this.getDomainTypedData();
     if (!strict) {
-      expectedDomain = { ...expectedDomain, name: domain.name, version: domain.version };
+      expectedDomain = { ...expectedDomain, version: domain.version };
     }
 
     if (!isEqual(domain, expectedDomain)) {

diff --git a/test/test/eas.ts b/test/test/eas.ts
@@ -712,13 +712,12 @@ describe('EAS API', () => {
             })
           ).to.throw('Invalid domain');
 
-          // Invalid domain verification won't throw, due to the check not being strict, but will fail on signature
-          await expect(
+          await expect(() =>
             offchain.verifyOffchainAttestationSignature(senderAddress, {
               ...response,
               ...{ domain: { ...domain, name: `BAD${domain.name}BAD` } }
             })
-          ).to.be.false;
+          ).to.throw('Invalid domain');
 
           // Invalid version verification won't throw, due to the check not being strict, but will fail on signature
           await expect(
@@ -758,7 +757,7 @@ describe('EAS API', () => {
 
         it('should verify offchain attestations with legacy/obsoleted domains', async () => {
           const { config } = offchain;
-          const customOffchain = new CustomOffchain(config, { name: 'XXX', version: '0.0.1' }, new EAS(ZERO_ADDRESS));
+          const customOffchain = new CustomOffchain(config, '0.0.1', new EAS(ZERO_ADDRESS));
 
           const params = {
             version: 1,

diff --git a/test/test/helpers/custom-offchain.ts b/test/test/helpers/custom-offchain.ts
@@ -1,15 +1,10 @@
 import { EAS } from '../../../src/eas';
 import { Offchain, OffChainAttestationVersion, TypedDataConfig } from '../../../src/offchain';
 
-interface CustomDomain {
-  name: string;
-  version: string;
-}
-
 export class CustomOffchain extends Offchain {
-  constructor(config: TypedDataConfig, domain: CustomDomain, eas: EAS) {
+  constructor(config: TypedDataConfig, version: string, eas: EAS) {
     super(config, OffChainAttestationVersion.Version1, eas);
 
-    this.config = { ...this.config, ...domain };
+    this.config = { ...this.config, version };
   }
 }