Update getLogs API usage (#195)

* Update client query to get logs * Update calls to get logs for contracts
cerc-io · Oct 5, 2022 · 978f0bb · 978f0bb
1 parent 18861ea
commit 978f0bb
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 68 deletions.
diff --git a/packages/codegen/src/templates/indexer-template.handlebars b/packages/codegen/src/templates/indexer-template.handlebars
@@ -760,22 +760,16 @@ export class Indexer implements IPLDIndexerInterface {
     console.time('time:indexer#_fetchAndSaveEvents-fetch-logs');
     if (this._serverConfig.filterLogs) {
       const watchedContracts = this._baseIndexer.getWatchedContracts();
+      const addresses = watchedContracts.map((watchedContract): string => {
+        return watchedContract.address;
+      });
 
-      // TODO: Query logs by multiple contracts.
-      const contractlogsPromises = watchedContracts.map((watchedContract): Promise<any> => this._ethClient.getLogs({
+      const logsResult = await this._ethClient.getLogs({
         blockHash,
-        contract: watchedContract.address
-      }));
-
-      const contractlogs = await Promise.all(contractlogsPromises);
+        addresses
+      });
 
-      // Flatten logs by contract and sort by index.
-      logs = contractlogs.map(data => {
-        return data.logs;
-      }).flat()
-        .sort((a, b) => {
-          return a.index - b.index;
-        });
+      logs = logsResult.logs;
     } else {
       ({ logs } = await this._ethClient.getLogs({ blockHash }));
     }

diff --git a/packages/eden-watcher/src/indexer.ts b/packages/eden-watcher/src/indexer.ts
@@ -1014,22 +1014,16 @@ export class Indexer implements IPLDIndexerInterface {
     console.time('time:indexer#_fetchAndSaveEvents-fetch-logs');
     if (this._serverConfig.filterLogs) {
       const watchedContracts = this._baseIndexer.getWatchedContracts();
+      const addresses = watchedContracts.map((watchedContract): string => {
+        return watchedContract.address;
+      });
 
-      // TODO: Query logs by multiple contracts.
-      const contractlogsPromises = watchedContracts.map((watchedContract): Promise<any> => this._ethClient.getLogs({
+      const logsResult = await this._ethClient.getLogs({
         blockHash,
-        contract: watchedContract.address
-      }));
-
-      const contractlogs = await Promise.all(contractlogsPromises);
+        addresses
+      });
 
-      // Flatten logs by contract and sort by index.
-      logs = contractlogs.map(data => {
-        return data.logs;
-      }).flat()
-        .sort((a, b) => {
-          return a.index - b.index;
-        });
+      logs = logsResult.logs;
     } else {
       ({ logs } = await this._ethClient.getLogs({ blockHash }));
     }

diff --git a/packages/erc721-watcher/src/indexer.ts b/packages/erc721-watcher/src/indexer.ts
@@ -992,22 +992,16 @@ export class Indexer implements IPLDIndexerInterface {
     console.time('time:indexer#_fetchAndSaveEvents-fetch-logs');
     if (this._serverConfig.filterLogs) {
       const watchedContracts = this._baseIndexer.getWatchedContracts();
+      const addresses = watchedContracts.map((watchedContract): string => {
+        return watchedContract.address;
+      });
 
-      // TODO: Query logs by multiple contracts.
-      const contractlogsPromises = watchedContracts.map((watchedContract): Promise<any> => this._ethClient.getLogs({
+      const logsResult = await this._ethClient.getLogs({
         blockHash,
-        contract: watchedContract.address
-      }));
+        addresses
+      });
 
-      const contractlogs = await Promise.all(contractlogsPromises);
-
-      // Flatten logs by contract and sort by index.
-      logs = contractlogs.map(data => {
-        return data.logs;
-      }).flat()
-        .sort((a, b) => {
-          return a.index - b.index;
-        });
+      logs = logsResult.logs;
     } else {
       ({ logs } = await this._ethClient.getLogs({ blockHash }));
     }

diff --git a/packages/graph-test-watcher/src/indexer.ts b/packages/graph-test-watcher/src/indexer.ts
@@ -714,22 +714,16 @@ export class Indexer implements IPLDIndexerInterface {
     console.time('time:indexer#_fetchAndSaveEvents-fetch-logs');
     if (this._serverConfig.filterLogs) {
       const watchedContracts = this._baseIndexer.getWatchedContracts();
+      const addresses = watchedContracts.map((watchedContract): string => {
+        return watchedContract.address;
+      });
 
-      // TODO: Query logs by multiple contracts.
-      const contractlogsPromises = watchedContracts.map((watchedContract): Promise<any> => this._ethClient.getLogs({
+      const logsResult = await this._ethClient.getLogs({
         blockHash,
-        contract: watchedContract.address
-      }));
-
-      const contractlogs = await Promise.all(contractlogsPromises);
+        addresses
+      });
 
-      // Flatten logs by contract and sort by index.
-      logs = contractlogs.map(data => {
-        return data.logs;
-      }).flat()
-        .sort((a, b) => {
-          return a.index - b.index;
-        });
+      logs = logsResult.logs;
     } else {
       ({ logs } = await this._ethClient.getLogs({ blockHash }));
     }

diff --git a/packages/ipld-eth-client/src/eth-client.ts b/packages/ipld-eth-client/src/eth-client.ts
@@ -18,6 +18,7 @@ interface Vars {
   blockHash: string;
   contract?: string;
   slot?: string;
+  addresses?: string[];
 }
 
 export class EthClient {

diff --git a/packages/ipld-eth-client/src/eth-queries.ts b/packages/ipld-eth-client/src/eth-queries.ts
@@ -15,8 +15,8 @@ query getStorageAt($blockHash: Bytes32!, $contract: Address!, $slot: Bytes32!) {
 `;
 
 export const getLogs = gql`
-query getLogs($blockHash: Bytes32!, $contract: Address) {
-  getLogs(blockHash: $blockHash, contract: $contract) {
+query getLogs($blockHash: Bytes32!, $addresses: [Address!]) {
+  getLogs(blockHash: $blockHash, addresses: $addresses) {
     account {
       address
     }

diff --git a/packages/lighthouse-watcher/src/indexer.ts b/packages/lighthouse-watcher/src/indexer.ts
@@ -85,7 +85,7 @@ export class Indexer {
     const contract = this._config.watch.lighthouse;
 
     const [{ logs }, { block }] = await Promise.all([
-      this._ethClient.getLogs({ blockHash, contract }),
+      this._ethClient.getLogs({ blockHash, addresses: [contract] }),
       this._ethClient.getBlockByHash(blockHash)
     ]);
 

diff --git a/packages/mobymask-watcher/src/indexer.ts b/packages/mobymask-watcher/src/indexer.ts
@@ -736,22 +736,16 @@ export class Indexer implements IPLDIndexerInterface {
     console.time('time:indexer#_fetchAndSaveEvents-fetch-logs');
     if (this._serverConfig.filterLogs) {
       const watchedContracts = this._baseIndexer.getWatchedContracts();
+      const addresses = watchedContracts.map((watchedContract): string => {
+        return watchedContract.address;
+      });
 
-      // TODO: Query logs by multiple contracts.
-      const contractlogsPromises = watchedContracts.map((watchedContract): Promise<any> => this._ethClient.getLogs({
+      const logsResult = await this._ethClient.getLogs({
         blockHash,
-        contract: watchedContract.address
-      }));
+        addresses
+      });
 
-      const contractlogs = await Promise.all(contractlogsPromises);
-
-      // Flatten logs by contract and sort by index.
-      logs = contractlogs.map(data => {
-        return data.logs;
-      }).flat()
-        .sort((a, b) => {
-          return a.index - b.index;
-        });
+      logs = logsResult.logs;
     } else {
       ({ logs } = await this._ethClient.getLogs({ blockHash }));
     }