Merge pull request #69 from ethereum-attestation-service/offchain

Support verification of older offchain attestations
ethereum-attestation-service · Nov 12, 2023 · 1b027b8 · 1b027b8
2 parents f569c5b + 63c5ef0
commit 1b027b8
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 21 deletions.
diff --git a/dist/offchain/offchain.js b/dist/offchain/offchain.js
diff --git a/dist/offchain/offchain.js.map b/dist/offchain/offchain.js.map
diff --git a/dist/offchain/typed-data-handler.d.ts b/dist/offchain/typed-data-handler.d.ts
@@ -52,10 +52,10 @@ export type EIP712Response<T extends EIP712MessageTypes, P extends EIP712Params>
 };
 export declare const EIP712_DOMAIN = "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)";
 export declare abstract class TypedDataHandler {
-    protected config: TypedDataConfig;
+    config: TypedDataConfig;
     constructor(config: TypedDataConfig);
     getDomainSeparator(): string;
     getDomainTypedData(): DomainTypedData;
     signTypedDataRequest<T extends EIP712MessageTypes, P extends EIP712Params>(params: P, types: EIP712TypedData<T, P>, signer: Signer): Promise<EIP712Response<T, P>>;
-    verifyTypedDataRequestSignature<T extends EIP712MessageTypes, P extends EIP712Params>(attester: string, response: EIP712Response<T, P>, types: EIP712Types<T>): boolean;
+    verifyTypedDataRequestSignature<T extends EIP712MessageTypes, P extends EIP712Params>(attester: string, response: EIP712Response<T, P>, types: EIP712Types<T>, strict?: boolean): boolean;
 }
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/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ethereum-attestation-service/eas-sdk",
-  "version": "1.3.0-beta.0",
+  "version": "1.3.0-beta.1",
   "description": "Ethereum Attestation Service - TypeScript/JavaScript SDK",
   "repository": "[email protected]:ethereum-attestation-service/eas-sdk.git",
   "author": "Leonid Beder <[email protected]>",

diff --git a/src/offchain/offchain.ts b/src/offchain/offchain.ts
@@ -163,10 +163,15 @@ export class Offchain extends TypedDataHandler {
   public verifyOffchainAttestationSignature(attester: string, request: SignedOffchainAttestation): boolean {
     return (
       request.uid === Offchain.getOffchainUID(request.message) &&
-      this.verifyTypedDataRequestSignature(attester, request, {
-        primaryType: this.type.primaryType,
-        types: this.type.types
-      })
+      this.verifyTypedDataRequestSignature(
+        attester,
+        request,
+        {
+          primaryType: this.type.primaryType,
+          types: this.type.types
+        },
+        false
+      )
     );
   }
 

diff --git a/src/offchain/typed-data-handler.ts b/src/offchain/typed-data-handler.ts
@@ -89,7 +89,7 @@ export type EIP712Response<T extends EIP712MessageTypes, P extends EIP712Params>
 export const EIP712_DOMAIN = 'EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)';
 
 export abstract class TypedDataHandler {
-  protected config: TypedDataConfig;
+  public config: TypedDataConfig;
 
   constructor(config: TypedDataConfig) {
     this.config = config;
@@ -133,9 +133,18 @@ export abstract class TypedDataHandler {
   public verifyTypedDataRequestSignature<T extends EIP712MessageTypes, P extends EIP712Params>(
     attester: string,
     response: EIP712Response<T, P>,
-    types: EIP712Types<T>
+    types: EIP712Types<T>,
+    strict = true
   ): boolean {
-    if (!isEqual(response.domain, this.getDomainTypedData())) {
+    // Normalize the chain ID
+    const domain: EIP712DomainTypedData = { ...response.domain, chainId: BigInt(response.domain.chainId) };
+
+    let expectedDomain = this.getDomainTypedData();
+    if (!strict) {
+      expectedDomain = { ...expectedDomain, version: domain.version };
+    }
+
+    if (!isEqual(domain, expectedDomain)) {
       throw new Error('Invalid domain');
     }
 
@@ -153,7 +162,7 @@ export abstract class TypedDataHandler {
 
     const { signature } = response;
     const sig = Sig.from({ v: signature.v, r: hexlify(signature.r), s: hexlify(signature.s) }).serialized;
-    const recoveredAddress = verifyTypedData(response.domain, response.types, response.message, sig);
+    const recoveredAddress = verifyTypedData(domain, response.types, response.message, sig);
 
     return getAddress(attester) === getAddress(recoveredAddress);
   }