Properly filter events

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethereum-attestation-service/eas-sdk",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "description": "Ethereum Attestation Service - TypeScript/JavaScript SDK",
   "repository": "git@github.com:ethereum-attestation-service/eas-sdk.git",
   "author": "Leonid Beder <leonid@lbeder.com>",

src/utils.ts

@@ -2,6 +2,7 @@ import { EAS__factory } from '@ethereum-attestation-service/eas-contracts';
 import {
   hexlify,
   Interface,
+  keccak256,
   solidityPackedKeccak256,
   toUtf8Bytes,
   TransactionReceipt,
@@ -19,6 +20,12 @@ enum Event {
   RevokedOffchain = 'RevokedOffchain'
 }
 
+const TOPICS = {
+  [Event.Attested]: keccak256(toUtf8Bytes('Attested(address,address,bytes32,bytes32)')),
+  [Event.Timestamped]: keccak256(toUtf8Bytes('Timestamped(bytes32,uint64)')),
+  [Event.RevokedOffchain]: keccak256(toUtf8Bytes('RevokedOffchain(address,bytes32,uint64)'))
+};
+
 export const getSchemaUID = (schema: string, resolverAddress: string, revocable: boolean) =>
   solidityPackedKeccak256(['string', 'address', 'bool'], [schema, resolverAddress, revocable]);
 
@@ -81,7 +88,7 @@ const getDataFromReceipt = (receipt: TransactionReceipt, event: Event, attribute
   const eas = new Interface(EAS__factory.abi);
   const logs = [];
 
-  for (const log of receipt.logs || []) {
+  for (const log of receipt.logs.filter((l) => l.topics[0] === TOPICS[event]) || []) {
     logs.push({
       ...log,
       log: event,

test/contracts/ETHResolver.sol

@@ -14,6 +14,9 @@ contract ETHResolver is SchemaResolver {
 
     error InvalidValue();
 
+    event Paid(address indexed attester, uint256 value);
+    event Refunded(address indexed revoker, uint256 value);
+
     uint256 private immutable _incentive;
 
     constructor(IEAS eas, uint256 incentive) SchemaResolver(eas) {
@@ -27,6 +30,8 @@ contract ETHResolver is SchemaResolver {
     function onAttest(Attestation calldata attestation, uint256 /*value*/) internal virtual override returns (bool) {
         payable(attestation.attester).transfer(_incentive);
 
+        emit Paid({ attester: attestation.attester, value: _incentive });
+
         return true;
     }
 
@@ -39,6 +44,8 @@ contract ETHResolver is SchemaResolver {
             payable(address(attestation.attester)).sendValue(value - _incentive);
         }
 
+        emit Refunded({ revoker: attestation.attester, value: _incentive });
+
         return true;
     }
 }