Pass extra block data required in subgraph block handler (#486)

* Use codegen config directory name instead of file path * Get block data from extra event data * Add extra event data in processBlockAfterEvents --------- Co-authored-by: neeraj <neeraj.rtly@gmail.com>
cerc-io · Nov 22, 2023 · 29e4e9f · 29e4e9f
1 parent 10c16cd
commit 29e4e9f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/packages/codegen/src/templates/indexer-template.handlebars b/packages/codegen/src/templates/indexer-template.handlebars
@@ -499,10 +499,10 @@ export class Indexer implements IndexerInterface {
   }
 
   {{#if (subgraphPath)}}
-  async processBlockAfterEvents (blockHash: string, blockNumber: number): Promise<void> {
+  async processBlockAfterEvents (blockHash: string, blockNumber: number, extraData: ExtraEventData): Promise<void> {
     console.time('time:indexer#processBlockAfterEvents-mapping_code');
     // Call subgraph handler for block.
-    await this._graphWatcher.handleBlock(blockHash, blockNumber);
+    await this._graphWatcher.handleBlock(blockHash, blockNumber, extraData);
     console.timeEnd('time:indexer#processBlockAfterEvents-mapping_code');
 
     console.time('time:indexer#processBlockAfterEvents-dump_subgraph_state');

diff --git a/packages/codegen/src/utils/subgraph.ts b/packages/codegen/src/utils/subgraph.ts
@@ -69,7 +69,8 @@ export async function buildSubgraph (
     network?: string
   }
 ): Promise<void> {
-  const subgraphDirectory = path.resolve(codegenConfigPath, subgraphConfig.directory);
+  const codegenConfigDirName = path.dirname(codegenConfigPath);
+  const subgraphDirectory = path.resolve(codegenConfigDirName, subgraphConfig.directory);
   const codegenWorkingDir = process.cwd();
   // Change directory to subgraph repo
   shell.cd(subgraphDirectory);
@@ -102,7 +103,7 @@ export async function buildSubgraph (
   const { code: installCode } = shell.exec(`${packageManager} install --force`);
   assert(installCode === 0, 'Installing dependencies exited with error');
 
-  const subgraphConfigPath = path.resolve(codegenConfigPath, subgraphConfig.configFile);
+  const subgraphConfigPath = path.resolve(codegenConfigDirName, subgraphConfig.configFile);
 
   // Run graph-cli codegen
   const { code: codegenCode } = shell.exec(`${packageManager === 'npm' ? 'npx' : packageManager} graph codegen ${subgraphConfigPath}`);
@@ -112,7 +113,7 @@ export async function buildSubgraph (
   let buildCommand = `${packageManager === 'npm' ? 'npx' : packageManager} graph build ${subgraphConfigPath}`;
 
   if (subgraphConfig.networkFilePath) {
-    const subgraphNetworkFilePath = path.resolve(codegenConfigPath, subgraphConfig.networkFilePath);
+    const subgraphNetworkFilePath = path.resolve(codegenConfigDirName, subgraphConfig.networkFilePath);
     assert(subgraphConfig.network, 'Config subgraph.network should be set if using networkFilePath');
     const subgraphNetwork = subgraphConfig.network;
     buildCommand = `${buildCommand} --network-file ${subgraphNetworkFilePath} --network ${subgraphNetwork}`;

diff --git a/packages/codegen/subgraph-demo.md b/packages/codegen/subgraph-demo.md
@@ -112,6 +112,8 @@
   yarn && yarn build
   ```
 
+* Configure the upstream GQL and RPC endpoints
+
 * Run the job-runner:
 
   ```bash

diff --git a/packages/graph-node/src/watcher.ts b/packages/graph-node/src/watcher.ts
@@ -238,7 +238,7 @@ export class GraphWatcher {
     }
   }
 
-  async handleBlock (blockHash: string, blockNumber: number) {
+  async handleBlock (blockHash: string, blockNumber: number, extraData: ExtraEventData) {
     // Clear transactions map on handling new block.
     this._transactionsMap.clear();
 
@@ -258,11 +258,10 @@ export class GraphWatcher {
         continue;
       }
 
-      // TODO: Use extraData full block
-      // // Check if block data is already fetched in handleEvent method for the same block.
-      // if (!this._context.block || this._context.block.blockHash !== blockHash) {
-      //   this._context.block = await getFullBlock(this._ethClient, this._ethProvider, blockHash, blockNumber);
-      // }
+      // Check if block data is already fetched in handleEvent method for the same block.
+      if (!this._context.block || this._context.block.blockHash !== blockHash) {
+        this._context.block = await getFullBlock(extraData.ethFullBlock);
+      }
 
       const blockData = this._context.block;
       assert(blockData);

diff --git a/packages/util/src/common.ts b/packages/util/src/common.ts
@@ -185,7 +185,7 @@ export const processBatchEvents = async (
 
   if (indexer.processBlockAfterEvents) {
     if (!dbBlock.isComplete) {
-      await indexer.processBlockAfterEvents(dbBlock.blockHash, dbBlock.blockNumber);
+      await indexer.processBlockAfterEvents(dbBlock.blockHash, dbBlock.blockNumber, data);
     }
   }
 

diff --git a/packages/util/src/types.ts b/packages/util/src/types.ts
@@ -211,7 +211,7 @@ export interface IndexerInterface {
   processInitialState: (contractAddress: string, blockHash: string) => Promise<any>
   processStateCheckpoint: (contractAddress: string, blockHash: string) => Promise<boolean>
   processBlock: (blockProgres: BlockProgressInterface) => Promise<void>
-  processBlockAfterEvents?: (blockHash: string, blockNumber: number) => Promise<void>
+  processBlockAfterEvents?: (blockHash: string, blockNumber: number, data: ExtraEventData) => Promise<void>
   processCanonicalBlock (blockHash: string, blockNumber: number): Promise<void>
   processCheckpoint (blockHash: string): Promise<void>
   processCLICheckpoint (contractAddress: string, blockHash?: string): Promise<string | undefined>