Update codegen with changes implemented in mobymask watcher (#148)

* Update codegen with index-block CLI and remove graph-node

* Add filter logs by contract flag

* Skip generating GQL API for immutable variables

* Add config for maxEventsBlockRange

* Add new flags in existing watchers

packages/codegen/src/generate-code.ts

@@ -36,6 +36,7 @@ import { exportState } from './export-state';
 import { importState } from './import-state';
 import { exportInspectCID } from './inspect-cid';
 import { getSubgraphConfig } from './utils/subgraph';
+import { exportIndexBlock } from './index-block';
 
 const main = async (): Promise<void> => {
   const argv = await yargs(hideBin(process.argv))
@@ -166,7 +167,7 @@ function generateWatcher (visitor: Visitor, contracts: any[], config: any) {
   });
 
   // Register the handlebar helpers to be used in the templates.
-  registerHandlebarHelpers();
+  registerHandlebarHelpers(config);
 
   visitor.visitSubgraph(config.subgraphPath);
 
@@ -300,6 +301,11 @@ function generateWatcher (visitor: Visitor, contracts: any[], config: any) {
     ? fs.createWriteStream(path.join(outputDir, 'src/cli/inspect-cid.ts'))
     : process.stdout;
   exportInspectCID(outStream, config.subgraphPath);
+
+  outStream = outputDir
+    ? fs.createWriteStream(path.join(outputDir, 'src/cli/index-block.ts'))
+    : process.stdout;
+  exportIndexBlock(outStream);
 }
 
 function getConfig (configFile: string): any {

packages/codegen/src/index-block.ts

@@ -0,0 +1,21 @@
+//
+// Copyright 2022 Vulcanize, Inc.
+//
+
+import fs from 'fs';
+import path from 'path';
+import Handlebars from 'handlebars';
+import { Writable } from 'stream';
+
+const TEMPLATE_FILE = './templates/index-block-template.handlebars';
+
+/**
+ * Writes the index-block file generated from a template to a stream.
+ * @param outStream A writable output stream to write the index-block file to.
+ */
+export function exportIndexBlock (outStream: Writable): void {
+  const templateString = fs.readFileSync(path.resolve(__dirname, TEMPLATE_FILE)).toString();
+  const template = Handlebars.compile(templateString);
+  const indexBlock = template({});
+  outStream.write(indexBlock);
+}

packages/codegen/src/templates/checkpoint-template.handlebars

@@ -2,14 +2,18 @@
 // Copyright 2021 Vulcanize, Inc.
 //
 
+{{#if (subgraphPath)}}
 import path from 'path';
+{{/if}}
 import yargs from 'yargs';
 import 'reflect-metadata';
 import debug from 'debug';
 import assert from 'assert';
 
 import { Config, DEFAULT_CONFIG_PATH, getConfig, initClients, JobQueue } from '@vulcanize/util';
+{{#if (subgraphPath)}}
 import { GraphWatcher, Database as GraphDatabase } from '@vulcanize/graph-node';
+{{/if}}
 
 import { Database } from '../database';
 import { Indexer } from '../indexer';
@@ -45,11 +49,13 @@ const main = async (): Promise<void> => {
 
   const db = new Database(config.database);
   await db.init();
-
+  {{#if (subgraphPath)}}
+  
   const graphDb = new GraphDatabase(config.database, path.resolve(__dirname, 'entity/*'));
   await graphDb.init();
-
+  
   const graphWatcher = new GraphWatcher(graphDb, ethClient, ethProvider, config.server);
+  {{/if}}
 
   const jobQueueConfig = config.jobQueue;
   assert(jobQueueConfig, 'Missing job queue config');
@@ -60,11 +66,11 @@ const main = async (): Promise<void> => {
   const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
   await jobQueue.start();
 
-  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue, graphWatcher);
+  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue{{#if (subgraphPath)}}, graphWatcher{{/if}});
   await indexer.init();
+  {{#if (subgraphPath)}}
 
   graphWatcher.setIndexer(indexer);
-  {{#if subgraphPath}}
   await graphWatcher.init();
   {{/if}}
 

packages/codegen/src/templates/config-template.handlebars

@@ -12,10 +12,17 @@
   # IPFS API address (can be taken from the output on running the IPFS daemon).
   ipfsApiAddr = "/ip4/127.0.0.1/tcp/5001"
 
-  {{#if subgraphPath}}
+  {{#if (subgraphPath)}}
   subgraphPath = "{{subgraphPath}}"
   wasmRestartBlocksInterval = 20
+
   {{/if}}
+  # Boolean to filter logs by contract.
+  filterLogs = false
+
+  # Max block range for which to return events in eventsInRange GQL query.
+  # Use -1 for skipping check on block range.
+  maxEventsBlockRange = 1000
 
 [database]
   type = "postgres"

packages/codegen/src/templates/export-state-template.handlebars

@@ -10,7 +10,9 @@ import fs from 'fs';
 import path from 'path';
 
 import { Config, DEFAULT_CONFIG_PATH, getConfig, initClients, JobQueue, StateKind } from '@vulcanize/util';
+{{#if (subgraphPath)}}
 import { GraphWatcher, Database as GraphDatabase } from '@vulcanize/graph-node';
+{{/if}}
 import * as codec from '@ipld/dag-cbor';
 
 import { Database } from '../database';
@@ -42,11 +44,13 @@ const main = async (): Promise<void> => {
 
   const db = new Database(config.database);
   await db.init();
+  {{#if (subgraphPath)}}
 
   const graphDb = new GraphDatabase(config.database, path.resolve(__dirname, 'entity/*'));
   await graphDb.init();
 
   const graphWatcher = new GraphWatcher(graphDb, ethClient, ethProvider, config.server);
+  {{/if}}
 
   const jobQueueConfig = config.jobQueue;
   assert(jobQueueConfig, 'Missing job queue config');
@@ -57,11 +61,11 @@ const main = async (): Promise<void> => {
   const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
   await jobQueue.start();
 
-  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue, graphWatcher);
+  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue{{#if (subgraphPath)}}, graphWatcher{{/if}});
   await indexer.init();
+  {{#if (subgraphPath)}}
 
   graphWatcher.setIndexer(indexer);
-  {{#if subgraphPath}}
   await graphWatcher.init();
   {{/if}}
 

packages/codegen/src/templates/fill-template.handlebars

@@ -2,7 +2,9 @@
 // Copyright 2021 Vulcanize, Inc.
 //
 
+{{#if (subgraphPath)}}
 import path from 'path';
+{{/if}}
 import assert from 'assert';
 import 'reflect-metadata';
 import yargs from 'yargs';
@@ -11,7 +13,9 @@ import debug from 'debug';
 import { PubSub } from 'apollo-server-express';
 
 import { Config, getConfig, fillBlocks, JobQueue, DEFAULT_CONFIG_PATH, initClients } from '@vulcanize/util';
+{{#if (subgraphPath)}}
 import { GraphWatcher, Database as GraphDatabase } from '@vulcanize/graph-node';
+{{/if}}
 
 import { Database } from './database';
 import { Indexer } from './indexer';
@@ -57,11 +61,13 @@ export const main = async (): Promise<any> => {
 
   const db = new Database(config.database);
   await db.init();
-
+  {{#if (subgraphPath)}}
+  
   const graphDb = new GraphDatabase(config.database, path.resolve(__dirname, 'entity/*'));
   await graphDb.init();
-
+  
   const graphWatcher = new GraphWatcher(graphDb, ethClient, ethProvider, config.server);
+  {{/if}}
 
   const jobQueueConfig = config.jobQueue;
   assert(jobQueueConfig, 'Missing job queue config');
@@ -72,11 +78,11 @@ export const main = async (): Promise<any> => {
   const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
   await jobQueue.start();
 
-  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue, graphWatcher);
+  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue{{#if (subgraphPath)}}, graphWatcher{{/if}});
   await indexer.init();
+  {{#if (subgraphPath)}}
 
   graphWatcher.setIndexer(indexer);
-  {{#if subgraphPath}}
   await graphWatcher.init();
   {{/if}}
 

packages/codegen/src/templates/import-state-template.handlebars

@@ -12,7 +12,9 @@ import fs from 'fs';
 import path from 'path';
 
 import { getConfig, fillBlocks, JobQueue, DEFAULT_CONFIG_PATH, Config, initClients, StateKind } from '@vulcanize/util';
+{{#if (subgraphPath)}}
 import { GraphWatcher, Database as GraphDatabase } from '@vulcanize/graph-node';
+{{/if}}
 import * as codec from '@ipld/dag-cbor';
 
 import { Database } from '../database';
@@ -46,11 +48,13 @@ export const main = async (): Promise<any> => {
 
   const db = new Database(config.database);
   await db.init();
+  {{#if (subgraphPath)}}
 
   const graphDb = new GraphDatabase(config.database, path.resolve(__dirname, 'entity/*'));
   await graphDb.init();
 
   const graphWatcher = new GraphWatcher(graphDb, ethClient, ethProvider, config.server);
+  {{/if}}
 
   // Note: In-memory pubsub works fine for now, as each watcher is a single process anyway.
   // Later: https://www.apollographql.com/docs/apollo-server/data/subscriptions/#production-pubsub-libraries
@@ -65,11 +69,11 @@ export const main = async (): Promise<any> => {
   const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
   await jobQueue.start();
 
-  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue, graphWatcher);
+  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue{{#if (subgraphPath)}}, graphWatcher{{/if}});
   await indexer.init();
+  {{#if (subgraphPath)}}
 
   graphWatcher.setIndexer(indexer);
-  {{#if subgraphPath}}
   await graphWatcher.init();
   {{/if}}
 

packages/codegen/src/templates/index-block-template.handlebars

@@ -0,0 +1,81 @@
+//
+// Copyright 2022 Vulcanize, Inc.
+//
+
+{{#if (subgraphPath)}}
+import path from 'path';
+{{/if}}
+import yargs from 'yargs';
+import 'reflect-metadata';
+import debug from 'debug';
+import assert from 'assert';
+
+import { Config, DEFAULT_CONFIG_PATH, getConfig, initClients, JobQueue, indexBlock } from '@vulcanize/util';
+{{#if (subgraphPath)}}
+import { GraphWatcher, Database as GraphDatabase } from '@vulcanize/graph-node';
+{{/if}}
+
+import { Database } from '../database';
+import { Indexer } from '../indexer';
+
+const log = debug('vulcanize:index-block');
+
+const main = async (): Promise<void> => {
+  const argv = await yargs.parserConfiguration({
+    'parse-numbers': false
+  }).options({
+    configFile: {
+      alias: 'f',
+      type: 'string',
+      require: true,
+      demandOption: true,
+      describe: 'Configuration file path (toml)',
+      default: DEFAULT_CONFIG_PATH
+    },
+    block: {
+      type: 'number',
+      require: true,
+      demandOption: true,
+      describe: 'Block number to index'
+    }
+  }).argv;
+
+  const config: Config = await getConfig(argv.configFile);
+  const { ethClient, ethProvider } = await initClients(config);
+
+  const db = new Database(config.database);
+  await db.init();
+  {{#if (subgraphPath)}}
+
+  const graphDb = new GraphDatabase(config.database, path.resolve(__dirname, 'entity/*'));
+  await graphDb.init();
+
+  const graphWatcher = new GraphWatcher(graphDb, ethClient, ethProvider, config.server);
+  {{/if}}
+
+  const jobQueueConfig = config.jobQueue;
+  assert(jobQueueConfig, 'Missing job queue config');
+
+  const { dbConnectionString, maxCompletionLagInSecs } = jobQueueConfig;
+  assert(dbConnectionString, 'Missing job queue db connection string');
+
+  const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
+
+  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue{{#if (subgraphPath)}}, graphWatcher{{/if}});
+  await indexer.init();
+  {{#if (subgraphPath)}}
+
+  graphWatcher.setIndexer(indexer);
+  await graphWatcher.init();
+  {{/if}}
+
+  await indexBlock(indexer, jobQueueConfig.eventsInBatch, argv);
+
+  await db.close();
+};
+
+main().catch(err => {
+  log(err);
+}).finally(() => {
+  process.exit(0);
+});

packages/codegen/src/templates/indexer-template.handlebars

@@ -24,12 +24,16 @@ import {
   QueryOptions,
   updateStateForElementaryType,
   updateStateForMappingType,
+  {{#if (subgraphPath)}}
   BlockHeight,
+  {{/if}}
   IPFSClient,
   StateKind,
   IpldStatus as IpldStatusInterface
 } from '@vulcanize/util';
+{{#if (subgraphPath)}}
 import { GraphWatcher } from '@vulcanize/graph-node';
+{{/if}}
 
 {{#each contracts as | contract |}}
 import {{contract.contractName}}Artifacts from './artifacts/{{contract.contractName}}.json';
@@ -101,7 +105,9 @@ export class Indexer implements IPLDIndexerInterface {
   _ethProvider: BaseProvider
   _baseIndexer: BaseIndexer
   _serverConfig: ServerConfig
+  {{#if (subgraphPath)}}
   _graphWatcher: GraphWatcher;
+  {{/if}}
 
   _abiMap: Map<string, JsonFragment[]>
   _storageLayoutMap: Map<string, StorageLayout>
@@ -109,10 +115,12 @@ export class Indexer implements IPLDIndexerInterface {
 
   _ipfsClient: IPFSClient
 
+  {{#if (subgraphPath)}}
   _entityTypesMap: Map<string, { [key: string]: string }>
   _relationsMap: Map<any, { [key: string]: any }>
-
-  constructor (serverConfig: ServerConfig, db: Database, ethClient: EthClient, ethProvider: BaseProvider, jobQueue: JobQueue, graphWatcher: GraphWatcher) {
+  
+  {{/if}}
+  constructor (serverConfig: ServerConfig, db: Database, ethClient: EthClient, ethProvider: BaseProvider, jobQueue: JobQueue{{#if (subgraphPath)}}, graphWatcher: GraphWatcher{{/if}}) {
     assert(db);
     assert(ethClient);
 
@@ -122,7 +130,9 @@ export class Indexer implements IPLDIndexerInterface {
     this._serverConfig = serverConfig;
     this._ipfsClient = new IPFSClient(this._serverConfig.ipfsApiAddr);
     this._baseIndexer = new BaseIndexer(this._serverConfig, this._db, this._ethClient, this._ethProvider, jobQueue, this._ipfsClient);
+    {{#if (subgraphPath)}}
     this._graphWatcher = graphWatcher;
+    {{/if}}
 
     this._abiMap = new Map();
     this._storageLayoutMap = new Map();
@@ -147,14 +157,16 @@ export class Indexer implements IPLDIndexerInterface {
     this._contractMap.set(KIND_{{capitalize contract.contractName}}, new ethers.utils.Interface({{contract.contractName}}ABI));
 
     {{/each}}
+    {{#if (subgraphPath)}}
     this._entityTypesMap = new Map();
     this._populateEntityTypesMap();
 
     this._relationsMap = new Map();
     this._populateRelationsMap();
+    {{/if}}
   }
 
-  get serverConfig () {
+  get serverConfig (): ServerConfig {
     return this._serverConfig;
   }
 
@@ -399,6 +411,7 @@ export class Indexer implements IPLDIndexerInterface {
     await this._baseIndexer.removeIPLDBlocks(blockNumber, kind);
   }
 
+  {{#if (subgraphPath)}}
   async getSubgraphEntity<Entity> (entity: new () => Entity, id: string, block?: BlockHeight): Promise<any> {
     const relations = this._relationsMap.get(entity) || {};
 
@@ -407,12 +420,16 @@ export class Indexer implements IPLDIndexerInterface {
     return data;
   }
 
+  {{/if}}
+
   async triggerIndexingOnEvent (event: Event): Promise<void> {
     const resultEvent = this.getResultEvent(event);
 
+    {{#if (subgraphPath)}}
     // Call subgraph handler for event.
     await this._graphWatcher.handleEvent(resultEvent);
 
+    {{/if}}
     // Call custom hook function for indexing on event.
     await handleEvent(this, resultEvent);
   }
@@ -425,9 +442,11 @@ export class Indexer implements IPLDIndexerInterface {
   async processBlock (blockHash: string, blockNumber: number): Promise<void> {
     // Call a function to create initial state for contracts.
     await this._baseIndexer.createInit(this, blockHash, blockNumber);
+    {{#if (subgraphPath)}}
 
     // Call subgraph handler for block.
     await this._graphWatcher.handleBlock(blockHash);
+    {{/if}}
   }
 
   parseEventNameAndArgs (kind: string, logObj: any): any {
@@ -601,7 +620,7 @@ export class Indexer implements IPLDIndexerInterface {
   }
 
   async getEventsInRange (fromBlockNumber: number, toBlockNumber: number): Promise<Array<Event>> {
-    return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber);
+    return this._baseIndexer.getEventsInRange(fromBlockNumber, toBlockNumber, this._serverConfig.maxEventsBlockRange);
   }
 
   async getSyncStatus (): Promise<SyncStatus | undefined> {
@@ -664,10 +683,14 @@ export class Indexer implements IPLDIndexerInterface {
     return this._baseIndexer.getAncestorAtDepth(blockHash, depth);
   }
 
+  {{#if (subgraphPath)}}
   getEntityTypesMap (): Map<string, { [key: string]: string }> {
     return this._entityTypesMap;
   }
 
+  {{/if}}
+
+  {{#if (subgraphPath)}}
   _populateEntityTypesMap (): void {
   {{#each subgraphEntities as | subgraphEntity |}}
     this._entityTypesMap.set('{{subgraphEntity.className}}', {
@@ -682,7 +705,9 @@ export class Indexer implements IPLDIndexerInterface {
     });
   {{/each}}
   }
+  {{/if}}
 
+  {{#if (subgraphPath)}}
   _populateRelationsMap (): void {
   {{#each subgraphEntities as | subgraphEntity |}}
     {{#if subgraphEntity.relations}}
@@ -705,16 +730,39 @@ export class Indexer implements IPLDIndexerInterface {
     {{/if}}
   {{/each}}
   }
+  {{/if}}
 
   async _fetchAndSaveEvents ({ cid: blockCid, blockHash }: DeepPartial<BlockProgress>): Promise<BlockProgress> {
     assert(blockHash);
-
-    const logsPromise = this._ethClient.getLogs({ blockHash });
     const transactionsPromise = this._ethClient.getBlockWithTransactions({ blockHash });
+    const blockPromise = this._ethClient.getBlockByHash(blockHash);
+    let logs: any[];
+
+    if (this._serverConfig.filterLogs) {
+      const watchedContracts = this._baseIndexer.getWatchedContracts();
+
+      // TODO: Query logs by multiple contracts.
+      const contractlogsPromises = watchedContracts.map((watchedContract): Promise<any> => this._ethClient.getLogs({
+        blockHash,
+        contract: watchedContract.address
+      }));
+
+      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;
+        });
+    } else {
+      ({ logs } = await this._ethClient.getLogs({ blockHash }));
+    }
 
     let [
-      { block, logs },
-      {
+      { block },
+      { 
         allEthHeaderCids: {
           nodes: [
             {
@@ -725,7 +773,7 @@ export class Indexer implements IPLDIndexerInterface {
           ]
         }
       }
-    ] = await Promise.all([logsPromise, transactionsPromise]);
+    ] = await Promise.all([blockPromise, transactionsPromise]);
 
     const transactionMap = transactions.reduce((acc: {[key: string]: any}, transaction: {[key: string]: any}) => {
       acc[transaction.txHash] = transaction;

packages/codegen/src/templates/inspect-cid-template.handlebars

@@ -2,7 +2,9 @@
 // Copyright 2021 Vulcanize, Inc.
 //
 
+{{#if (subgraphPath)}}
 import path from 'path';
+{{/if}}
 import assert from 'assert';
 import yargs from 'yargs';
 import 'reflect-metadata';
@@ -10,7 +12,9 @@ import debug from 'debug';
 import util from 'util';
 
 import { Config, DEFAULT_CONFIG_PATH, getConfig, initClients, JobQueue } from '@vulcanize/util';
+{{#if (subgraphPath)}}
 import { GraphWatcher, Database as GraphDatabase } from '@vulcanize/graph-node';
+{{/if}}
 
 import { Database } from '../database';
 import { Indexer } from '../indexer';
@@ -42,11 +46,13 @@ const main = async (): Promise<void> => {
 
   const db = new Database(config.database);
   await db.init();
-
+  {{#if (subgraphPath)}}
+  
   const graphDb = new GraphDatabase(config.database, path.resolve(__dirname, 'entity/*'));
   await graphDb.init();
-
+  
   const graphWatcher = new GraphWatcher(graphDb, ethClient, ethProvider, config.server);
+  {{/if}}
 
   const jobQueueConfig = config.jobQueue;
   assert(jobQueueConfig, 'Missing job queue config');
@@ -57,11 +63,11 @@ const main = async (): Promise<void> => {
   const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
   await jobQueue.start();
 
-  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue, graphWatcher);
+  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue{{#if (subgraphPath)}}, graphWatcher{{/if}});
   await indexer.init();
+  {{#if (subgraphPath)}}
 
   graphWatcher.setIndexer(indexer);
-  {{#if subgraphPath}}
   await graphWatcher.init();
   {{/if}}
 

packages/codegen/src/templates/job-runner-template.handlebars

@@ -2,7 +2,9 @@
 // Copyright 2021 Vulcanize, Inc.
 //
 
+{{#if (subgraphPath)}}
 import path from 'path';
+{{/if}}
 import assert from 'assert';
 import 'reflect-metadata';
 import yargs from 'yargs';
@@ -24,7 +26,9 @@ import {
   DEFAULT_CONFIG_PATH,
   initClients
 } from '@vulcanize/util';
+{{#if (subgraphPath)}}
 import { GraphWatcher, Database as GraphDatabase } from '@vulcanize/graph-node';
+{{/if}}
 
 import { Indexer } from './indexer';
 import { Database } from './database';
@@ -252,11 +256,13 @@ export const main = async (): Promise<any> => {
 
   const db = new Database(config.database);
   await db.init();
-
+  {{#if (subgraphPath)}}
+  
   const graphDb = new GraphDatabase(config.database, path.resolve(__dirname, 'entity/*'));
   await graphDb.init();
-
+  
   const graphWatcher = new GraphWatcher(graphDb, ethClient, ethProvider, config.server);
+  {{/if}}
 
   const jobQueueConfig = config.jobQueue;
   assert(jobQueueConfig, 'Missing job queue config');
@@ -267,11 +273,11 @@ export const main = async (): Promise<any> => {
   const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
   await jobQueue.start();
 
-  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue, graphWatcher);
+  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue{{#if (subgraphPath)}}, graphWatcher{{/if}});
   await indexer.init();
+  {{#if (subgraphPath)}}
 
   graphWatcher.setIndexer(indexer);
-  {{#if subgraphPath}}
   await graphWatcher.init();
 
   // Watching all the contracts in the subgraph.

packages/codegen/src/templates/package-template.handlebars

@@ -15,7 +15,8 @@
     "checkpoint": "DEBUG=vulcanize:* ts-node src/cli/checkpoint.ts",
     "export-state": "DEBUG=vulcanize:* ts-node src/cli/export-state.ts",
     "import-state": "DEBUG=vulcanize:* ts-node src/cli/import-state.ts",
-    "inspect-cid": "DEBUG=vulcanize:* ts-node src/cli/inspect-cid.ts"
+    "inspect-cid": "DEBUG=vulcanize:* ts-node src/cli/inspect-cid.ts",
+    "index-block": "DEBUG=vulcanize:* ts-node src/cli/index-block.ts"
   },
   "repository": {
     "type": "git",
@@ -34,7 +35,9 @@
     "@vulcanize/ipld-eth-client": "^0.1.0",
     "@vulcanize/solidity-mapper": "^0.1.0",
     "@vulcanize/util": "^0.1.0",
+    {{#if (subgraphPath)}}
     "@vulcanize/graph-node": "^0.1.0",
+    {{/if}}
     "apollo-server-express": "^2.25.0",
     "apollo-type-bigint": "^0.1.3",
     "debug": "^4.3.1",

packages/codegen/src/templates/reset-state-template.handlebars

@@ -2,13 +2,17 @@
 // Copyright 2021 Vulcanize, Inc.
 //
 
+{{#if (subgraphPath)}}
 import path from 'path';
+{{/if}}
 import debug from 'debug';
 import { MoreThan } from 'typeorm';
 import assert from 'assert';
 
 import { getConfig, initClients, resetJobs, JobQueue } from '@vulcanize/util';
+{{#if (subgraphPath)}}
 import { GraphWatcher, Database as GraphDatabase } from '@vulcanize/graph-node';
+{{/if}}
 
 import { Database } from '../../database';
 import { Indexer } from '../../indexer';
@@ -38,11 +42,13 @@ export const handler = async (argv: any): Promise<void> => {
   // Initialize database.
   const db = new Database(config.database);
   await db.init();
-
+  {{#if (subgraphPath)}}
+  
   const graphDb = new GraphDatabase(config.database, path.resolve(__dirname, 'entity/*'));
   await graphDb.init();
-
+  
   const graphWatcher = new GraphWatcher(graphDb, ethClient, ethProvider, config.server);
+  {{/if}}
 
   const jobQueueConfig = config.jobQueue;
   assert(jobQueueConfig, 'Missing job queue config');
@@ -53,11 +59,11 @@ export const handler = async (argv: any): Promise<void> => {
   const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
   await jobQueue.start();
 
-  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue, graphWatcher);
+  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue{{#if (subgraphPath)}}, graphWatcher{{/if}});
   await indexer.init();
+  {{#if (subgraphPath)}}
 
   graphWatcher.setIndexer(indexer);
-  {{#if subgraphPath}}
   await graphWatcher.init();
   {{/if}}
 

packages/codegen/src/templates/server-template.handlebars

@@ -15,7 +15,9 @@ import 'graphql-import-node';
 import { createServer } from 'http';
 
 import { DEFAULT_CONFIG_PATH, getConfig, Config, JobQueue, KIND_ACTIVE, initClients } from '@vulcanize/util';
+{{#if (subgraphPath)}}
 import { GraphWatcher, Database as GraphDatabase } from '@vulcanize/graph-node';
+{{/if}}
 
 import { createResolvers } from './resolvers';
 import { Indexer } from './indexer';
@@ -42,11 +44,13 @@ export const main = async (): Promise<any> => {
 
   const db = new Database(config.database);
   await db.init();
-
+  {{#if (subgraphPath)}}
+  
   const graphDb = new GraphDatabase(config.database, path.resolve(__dirname, 'entity/*'));
   await graphDb.init();
-
+  
   const graphWatcher = new GraphWatcher(graphDb, ethClient, ethProvider, config.server);
+  {{/if}}
 
   // Note: In-memory pubsub works fine for now, as each watcher is a single process anyway.
   // Later: https://www.apollographql.com/docs/apollo-server/data/subscriptions/#production-pubsub-libraries
@@ -60,11 +64,11 @@ export const main = async (): Promise<any> => {
 
   const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
 
-  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue, graphWatcher);
+  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue{{#if (subgraphPath)}}, graphWatcher{{/if}});
   await indexer.init();
+  {{#if (subgraphPath)}}
 
   graphWatcher.setIndexer(indexer);
-  {{#if subgraphPath}}
   await graphWatcher.init();
   {{/if}}
 

packages/codegen/src/templates/tsconfig-template.handlebars

@@ -6,7 +6,7 @@
     // "incremental": true,                         /* Enable incremental compilation */
     "target": "es5",                                /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */
     "module": "commonjs",                           /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
-    // "lib": [],                                   /* Specify library files to be included in the compilation. */
+    "lib": ["es2019"],                              /* Specify library files to be included in the compilation. */
     // "allowJs": true,                             /* Allow javascript files to be compiled. */
     // "checkJs": true,                             /* Report errors in .js files. */
     // "jsx": "preserve",                           /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */

packages/codegen/src/templates/watch-contract-template.handlebars

@@ -2,14 +2,18 @@
 // Copyright 2021 Vulcanize, Inc.
 //
 
+{{#if (subgraphPath)}}
 import path from 'path';
+{{/if}}
 import yargs from 'yargs';
 import 'reflect-metadata';
 import debug from 'debug';
 import assert from 'assert';
 
 import { Config, DEFAULT_CONFIG_PATH, getConfig, initClients, JobQueue } from '@vulcanize/util';
+{{#if (subgraphPath)}}
 import { GraphWatcher, Database as GraphDatabase } from '@vulcanize/graph-node';
+{{/if}}
 
 import { Database } from '../database';
 import { Indexer } from '../indexer';
@@ -58,11 +62,13 @@ const main = async (): Promise<void> => {
 
   const db = new Database(config.database);
   await db.init();
-
+  {{#if (subgraphPath)}}
+  
   const graphDb = new GraphDatabase(config.database, path.resolve(__dirname, 'entity/*'));
   await graphDb.init();
-
+  
   const graphWatcher = new GraphWatcher(graphDb, ethClient, ethProvider, config.server);
+  {{/if}}
 
   const jobQueueConfig = config.jobQueue;
   assert(jobQueueConfig, 'Missing job queue config');
@@ -73,11 +79,11 @@ const main = async (): Promise<void> => {
   const jobQueue = new JobQueue({ dbConnectionString, maxCompletionLag: maxCompletionLagInSecs });
   await jobQueue.start();
 
-  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue, graphWatcher);
+  const indexer = new Indexer(config.server, db, ethClient, ethProvider, jobQueue{{#if (subgraphPath)}}, graphWatcher{{/if}});
   await indexer.init();
+  {{#if (subgraphPath)}}
 
   graphWatcher.setIndexer(indexer);
-  {{#if subgraphPath}}
   await graphWatcher.init();
   {{/if}}
 

packages/codegen/src/utils/handlebar-helpers.ts

@@ -7,10 +7,11 @@ import Handlebars from 'handlebars';
 
 import { reservedNames } from './types';
 
-export function registerHandlebarHelpers (): void {
+export function registerHandlebarHelpers (config: any): void {
   Handlebars.registerHelper('compare', compareHelper);
   Handlebars.registerHelper('capitalize', capitalizeHelper);
   Handlebars.registerHelper('reservedNameCheck', reservedNameCheckHelper);
+  Handlebars.registerHelper('subgraphPath', () => config.subgraphPath);
 }
 
 /**

packages/codegen/src/visitor.ts

@@ -93,9 +93,13 @@ export class Visitor {
     const variable = node.variables[0];
     const name: string = variable.name;
     const stateVariableType: string = variable.typeName.type;
-
     const params: Param[] = [];
 
+    if (variable.isImmutable) {
+      // Skip in case variable is immutable.
+      return;
+    }
+
     let typeName = variable.typeName;
     let numParams = 0;